From e12eaa7e41d2445ba9816f9d3bf8b568c2039a88 Mon Sep 17 00:00:00 2001 From: Georg Bauer Date: Mon, 16 Jan 2006 14:49:36 +0000 Subject: [PATCH] magic-removal: changed explicit settings import to qualified settings import in django.http git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@1987 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/http/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/django/http/__init__.py b/django/http/__init__.py index 3178a438ea..414157c9fc 100644 --- a/django/http/__init__.py +++ b/django/http/__init__.py @@ -143,8 +143,8 @@ class HttpResponse: "A basic HTTP response, with content and dictionary-accessed headers" def __init__(self, content='', mimetype=None): if not mimetype: - from django.conf.settings import DEFAULT_CONTENT_TYPE, DEFAULT_CHARSET - mimetype = "%s; charset=%s" % (DEFAULT_CONTENT_TYPE, DEFAULT_CHARSET) + from django.conf import settings + mimetype = "%s; charset=%s" % (settings.DEFAULT_CONTENT_TYPE, settings.DEFAULT_CHARSET) self.content = content self.headers = {'Content-Type':mimetype} self.cookies = SimpleCookie()