summaryrefslogtreecommitdiff
path: root/django/utils/httpwrappers.py
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2005-09-23 01:50:01 +0000
committerAdrian Holovaty <adrian@holovaty.com>2005-09-23 01:50:01 +0000
commit36fc73a45bc857f0ed1c1a5c6f8e61017709e73e (patch)
tree5e28176392acbd35916a73c81b6ac0e2f487e682 /django/utils/httpwrappers.py
parent39a907a051617d97a9724512791a4d9a53ee2f10 (diff)
Fixed #333 -- Added DEFAULT_MIME_TYPE setting, and set it to 'text/html; charset=utf-8' by default
git-svn-id: http://code.djangoproject.com/svn/django/trunk@670 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/utils/httpwrappers.py')
-rw-r--r--django/utils/httpwrappers.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/django/utils/httpwrappers.py b/django/utils/httpwrappers.py
index 8b50688f66..f4a7c54f0c 100644
--- a/django/utils/httpwrappers.py
+++ b/django/utils/httpwrappers.py
@@ -2,8 +2,7 @@ from Cookie import SimpleCookie
from pprint import pformat
from urllib import urlencode
import datastructures
-
-DEFAULT_MIME_TYPE = 'text/html'
+from django.conf.settings import DEFAULT_MIME_TYPE
class HttpRequest(object): # needs to be new-style class because subclasses define "property"s
"A basic HTTP request"