This is an automated email from the ASF dual-hosted git repository.
brondsem pushed a commit to branch db/8386
in repository https://gitbox.apache.org/repos/asf/allura.git
The following commit(s) were added to refs/heads/db/8386 by this push:
new 14c344b fixup! fixup! [#8386] remove chardet, make requests library
still work
14c344b is described below
commit 14c344b0869814600152c26fac194f3891ce7a2b
Author: Dave Brondsema <[email protected]>
AuthorDate: Mon May 3 16:48:06 2021 -0400
fixup! fixup! [#8386] remove chardet, make requests library still work
---
Allura/allura/lib/custom_middleware.py | 2 +-
Allura/allura/lib/search.py | 2 +-
Allura/allura/lib/solr.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Allura/allura/lib/custom_middleware.py
b/Allura/allura/lib/custom_middleware.py
index 25b31bf..55f9ab6 100644
--- a/Allura/allura/lib/custom_middleware.py
+++ b/Allura/allura/lib/custom_middleware.py
@@ -29,11 +29,11 @@ from tg import tmpl_context as c
from tg.support.middlewares import _call_wsgi_application as
call_wsgi_application
from timermiddleware import Timer, TimerMiddleware
from webob import exc, Request
-import pysolr
import six
from ming.odm import session
from allura.lib import helpers as h
+import pysolr # after 'h' import to get requests/chardet patched
from allura.lib.utils import is_ajax
from allura import model as M
import allura.model.repository
diff --git a/Allura/allura/lib/search.py b/Allura/allura/lib/search.py
index 462ffc2..6d44361 100644
--- a/Allura/allura/lib/search.py
+++ b/Allura/allura/lib/search.py
@@ -30,9 +30,9 @@ import jinja2
from tg import redirect, url
from tg import tmpl_context as c, app_globals as g
from tg import request
-from pysolr import SolrError
from allura.lib import helpers as h
+from pysolr import SolrError # after 'h' import to get requests/chardet
patched
from allura.lib.solr import escape_solr_arg
from allura.lib.utils import urlencode
import six
diff --git a/Allura/allura/lib/solr.py b/Allura/allura/lib/solr.py
index d97141e..138fa6d 100644
--- a/Allura/allura/lib/solr.py
+++ b/Allura/allura/lib/solr.py
@@ -21,10 +21,10 @@ import logging
from tg import config
from paste.deploy.converters import asbool
-import pysolr
import six
from allura.lib.helpers import shlex_split
+import pysolr # after helpers import to get requests/chardet patched
log = logging.getLogger(__name__)
