From 3bb340271ceb5ac398a2386f64f7e903571bc8ac Mon Sep 17 00:00:00 2001
From: Adrian Holovaty <adrian@holovaty.com>
Date: Mon, 10 Apr 2006 00:01:59 +0000
Subject: [PATCH] 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
---
django/utils/httpwrappers.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/django/utils/httpwrappers.py b/django/utils/httpwrappers.py
index 9d731d23c9..15deb7eaea 100644
--- a/django/utils/httpwrappers.py
+++ b/django/utils/httpwrappers.py
@@ -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