Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Changed settings imports from [2639] to use 'from django.conf import …

…settings', to make it easier to merge to magic-removal

git-svn-id: http://code.djangoproject.com/svn/django/trunk@2640 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 3bb340271ceb5ac398a2386f64f7e903571bc8ac 1 parent bc4638d
Adrian Holovaty authored

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

  1. 6  django/utils/httpwrappers.py
6  django/utils/httpwrappers.py
@@ -146,10 +146,10 @@ def parse_cookie(cookie):
146 146
 class HttpResponse(object):
147 147
     "A basic HTTP response, with content and dictionary-accessed headers"
148 148
     def __init__(self, content='', mimetype=None):
149  
-        from django.conf.settings import DEFAULT_CONTENT_TYPE, DEFAULT_CHARSET
150  
-        self._charset = DEFAULT_CHARSET
  149
+        from django.conf import settings
  150
+        self._charset = settings.DEFAULT_CHARSET
151 151
         if not mimetype:
152  
-            mimetype = "%s; charset=%s" % (DEFAULT_CONTENT_TYPE, DEFAULT_CHARSET)
  152
+            mimetype = "%s; charset=%s" % (settings.DEFAULT_CONTENT_TYPE, settings.DEFAULT_CHARSET)
153 153
         if hasattr(content, '__iter__'):
154 154
             self.iterator = content
155 155
             self._is_string = False

0 notes on commit 3bb3402

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