Skip to content
Browse files

Fixed #543 -- Fixed broken mod_python support due to an import in the…

… wrong place

git-svn-id: bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 3d42660 commit 9562cbbc493735a1535844a7a10951f55da67bb8 @adrianholovaty adrianholovaty committed
Showing with 4 additions and 2 deletions.
  1. +4 −2 django/utils/
6 django/utils/
@@ -2,7 +2,6 @@
from pprint import pformat
from urllib import urlencode
import datastructures
-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"
@@ -135,7 +134,10 @@ def parse_cookie(cookie):
class HttpResponse:
"A basic HTTP response, with content and dictionary-accessed headers"
- def __init__(self, content='', mimetype=DEFAULT_MIME_TYPE):
+ def __init__(self, content='', mimetype=None):
+ if not mimetype:
+ from django.conf.settings import DEFAULT_MIME_TYPE
+ mimetype = DEFAULT_MIME_TYPE
self.content = content
self.headers = {'Content-Type':mimetype}
self.cookies = SimpleCookie()

0 comments on commit 9562cbb

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