diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2011-03-26 03:13:22 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2011-03-26 03:13:22 +0000 |
| commit | 8121aa60fd2dbc18dd8f4bfd42e4c1567c1199b6 (patch) | |
| tree | 425ec00738a7c7d5fb8d90e28b06868e7fae82e5 | |
| parent | 5e0f5fb0f66dca87618ef20e1f7752509bad871d (diff) | |
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
| -rw-r--r-- | django/http/__init__.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/django/http/__init__.py b/django/http/__init__.py index 2e4f371fb1..714d552938 100644 --- a/django/http/__init__.py +++ b/django/http/__init__.py @@ -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 |