mirror of
https://github.com/django/django.git
synced 2024-11-30 07:06:18 +01:00
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
This commit is contained in:
parent
5e0f5fb0f6
commit
8121aa60fd
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user