summaryrefslogtreecommitdiff
path: root/django/utils/encoding.py
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2007-08-06 05:06:15 +0000
committerAdrian Holovaty <adrian@holovaty.com>2007-08-06 05:06:15 +0000
commit56a75a2a4e5b473a68536d2b669b428c4f90f662 (patch)
tree16925327f5d10cd08b73b6604e8aac09ae3fa21e /django/utils/encoding.py
parente301d8992cb1897cc93d84fc5d78a4c0769f5a8c (diff)
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
Diffstat (limited to 'django/utils/encoding.py')
-rw-r--r--django/utils/encoding.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/django/utils/encoding.py b/django/utils/encoding.py
index 7515d0c41b..2319496538 100644
--- a/django/utils/encoding.py
+++ b/django/utils/encoding.py
@@ -1,6 +1,5 @@
import types
import urllib
-from django.conf import settings
from django.utils.functional import Promise
class StrAndUnicode(object):