summaryrefslogtreecommitdiff
path: root/django/newforms/fields.py
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-04-04 06:34:19 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-04-04 06:34:19 +0000
commit1bddac37b69152d919a3af29f2844ae3e34c7237 (patch)
tree1d6663957982521930b1ff5d85e12d5b7d7e9917 /django/newforms/fields.py
parentf791a598a8e207a6f362ea75b9474f7739b518c7 (diff)
Moved smart_unicode and StrAndUnicode to django.utils.encoding. They are useful
outside of newforms. This is backwards compatible as far as smart_unicode goes (since newforms.util still imports it). All imports of smart_unicode and StrAndUnicode have also been updated. git-svn-id: http://code.djangoproject.com/svn/django/trunk@4918 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/newforms/fields.py')
-rw-r--r--django/newforms/fields.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/newforms/fields.py b/django/newforms/fields.py
index 72c5047030..c3b74e93f7 100644
--- a/django/newforms/fields.py
+++ b/django/newforms/fields.py
@@ -3,7 +3,8 @@ Field classes
"""
from django.utils.translation import gettext
-from util import ErrorList, ValidationError, smart_unicode
+from django.utils.encoding import smart_unicode
+from util import ErrorList, ValidationError
from widgets import TextInput, PasswordInput, HiddenInput, MultipleHiddenInput, CheckboxInput, Select, NullBooleanSelect, SelectMultiple
import datetime
import re