Author: adrian
Date: 2011-03-25 20:13:22 -0700 (Fri, 25 Mar 2011)
New Revision: 15916
Modified:
django/trunk/django/http/__init__.py
Log:
Fixed #15642 -- Removed redundant imports in http/__init__.py. Thanks, jammon
Modified: django/trunk/django/http/__init__.py
===================================================================
--- django/trunk/django/http/__init__.py 2011-03-25 15:08:09 UTC (rev
15915)
+++ django/trunk/django/http/__init__.py 2011-03-26 03:13:22 UTC (rev
15916)
@@ -326,9 +326,6 @@
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 @@
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
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
