Fixed #5077 -- django/utils/encoding.py no longer imports settings, as it doesn't use that module. Thanks, Collin Grady
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5810 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
e301d8992c
commit
56a75a2a4e
|
@ -1,6 +1,5 @@
|
||||||
import types
|
import types
|
||||||
import urllib
|
import urllib
|
||||||
from django.conf import settings
|
|
||||||
from django.utils.functional import Promise
|
from django.utils.functional import Promise
|
||||||
|
|
||||||
class StrAndUnicode(object):
|
class StrAndUnicode(object):
|
||||||
|
|
Loading…
Reference in New Issue