Commit 8121aa60 authored by Adrian Holovaty's avatar Adrian Holovaty
Browse files

Fixed #15642 -- Removed redundant imports in http/__init__.py. Thanks, jammon

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15916 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 5e0f5fb0
Loading
Loading
Loading
Loading
+0 −6
Original line number Diff line number Diff line
@@ -326,9 +326,6 @@ class QueryDict(MultiValueDict):
    def __init__(self, query_string, mutable=False, encoding=None):
        MultiValueDict.__init__(self)
        if not encoding:
            # *Important*: do not import settings any earlier because of note
            # in core.handlers.modpython.
            from django.conf import settings
            encoding = settings.DEFAULT_CHARSET
        self.encoding = encoding
        for key, value in parse_qsl((query_string or ''), True): # keep_blank_values=True
@@ -338,9 +335,6 @@ class QueryDict(MultiValueDict):

    def _get_encoding(self):
        if self._encoding is None:
            # *Important*: do not import settings at the module level because
            # of the note in core.handlers.modpython.
            from django.conf import settings
            self._encoding = settings.DEFAULT_CHARSET
        return self._encoding