Browse files

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

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

git-svn-id: bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
adrianholovaty committed Apr 10, 2006
1 parent bc4638d commit 3bb340271ceb5ac398a2386f64f7e903571bc8ac
Showing with 3 additions and 3 deletions.
  1. +3 −3 django/utils/
@@ -146,10 +146,10 @@ def parse_cookie(cookie):
class HttpResponse(object):
"A basic HTTP response, with content and dictionary-accessed headers"
def __init__(self, content='', mimetype=None):
from django.conf.settings import DEFAULT_CONTENT_TYPE, DEFAULT_CHARSET
self._charset = DEFAULT_CHARSET
from django.conf import settings
self._charset = settings.DEFAULT_CHARSET
if not mimetype:
mimetype = "%s; charset=%s" % (DEFAULT_CONTENT_TYPE, DEFAULT_CHARSET)
mimetype = "%s; charset=%s" % (settings.DEFAULT_CONTENT_TYPE, settings.DEFAULT_CHARSET)
if hasattr(content, '__iter__'):
self.iterator = content
self._is_string = False

0 comments on commit 3bb3402

Please sign in to comment.