Django

Code

Changeset 2640

Show
Ignore:
Timestamp:
04/09/06 19:01:59 (3 years ago)
Author:
adrian
Message:

Changed settings imports from [2639] to use 'from django.conf import settings', to make it easier to merge to magic-removal

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/utils/httpwrappers.py

    r2639 r2640  
    147147    "A basic HTTP response, with content and dictionary-accessed headers" 
    148148    def __init__(self, content='', mimetype=None): 
    149         from django.conf.settings import DEFAULT_CONTENT_TYPE, DEFAULT_CHARSET 
    150         self._charset = DEFAULT_CHARSET 
     149        from django.conf import settings 
     150        self._charset = settings.DEFAULT_CHARSET 
    151151        if not mimetype: 
    152             mimetype = "%s; charset=%s" % (DEFAULT_CONTENT_TYPE, DEFAULT_CHARSET) 
     152            mimetype = "%s; charset=%s" % (settings.DEFAULT_CONTENT_TYPE, settings.DEFAULT_CHARSET) 
    153153        if hasattr(content, '__iter__'): 
    154154            self.iterator = content