Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
  • Loading branch information...
commit 8121aa60fd2dbc18dd8f4bfd42e4c1567c1199b6 1 parent 5e0f5fb
Adrian Holovaty authored March 26, 2011

Showing 1 changed file with 0 additions and 6 deletions. Show diff stats Hide diff stats

  1. 6  django/http/__init__.py
6  django/http/__init__.py
@@ -326,9 +326,6 @@ class QueryDict(MultiValueDict):
326 326
     def __init__(self, query_string, mutable=False, encoding=None):
327 327
         MultiValueDict.__init__(self)
328 328
         if not encoding:
329  
-            # *Important*: do not import settings any earlier because of note
330  
-            # in core.handlers.modpython.
331  
-            from django.conf import settings
332 329
             encoding = settings.DEFAULT_CHARSET
333 330
         self.encoding = encoding
334 331
         for key, value in parse_qsl((query_string or ''), True): # keep_blank_values=True
@@ -338,9 +335,6 @@ def __init__(self, query_string, mutable=False, encoding=None):
338 335
 
339 336
     def _get_encoding(self):
340 337
         if self._encoding is None:
341  
-            # *Important*: do not import settings at the module level because
342  
-            # of the note in core.handlers.modpython.
343  
-            from django.conf import settings
344 338
             self._encoding = settings.DEFAULT_CHARSET
345 339
         return self._encoding
346 340
 

0 notes on commit 8121aa6

Please sign in to comment.
Something went wrong with that request. Please try again.