Changeset 4522

Timestamp:

02/14/07 22:13:02 (2 years ago)

Author:

adrian

Message:

Fixed #3314 -- Fixed a bug in newforms smart_unicode. Thanks for the patch, nesh

Files:

• django/trunk/django/newforms/util.py (modified) (1 diff)
• django/trunk/tests/regressiontests/forms/tests.py (modified) (1 diff)

django/trunk/django/newforms/util.py

@@ -8 +8 @@
-def smart_unicode(s):
-    if not isinstance(s, basestring):
-
+
+
+
+
-    elif not isinstance(s, unicode):
-        s = unicode(s, settings.DEFAULT_CHARSET)

django/trunk/tests/regressiontests/forms/tests.py

@@ -3266 +3266 @@
->>> f.clean('')
-u''
+
+#################################
+# Tests of underlying functions #
+#################################
+
+# smart_unicode tests
+>>> from django.newforms.util import smart_unicode
+>>> class Test:
+...     def __str__(self):
+...        return 'ŠĐĆŽćžšđ'
+>>> class TestU:
+...     def __str__(self):
+...        return 'Foo'
+...     def __unicode__(self):
+...        return u'\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111'
+>>> smart_unicode(Test())
+u'\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111'
+>>> smart_unicode(TestU())
+u'\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111'
+>>> smart_unicode(1)
+u'1'
+>>> smart_unicode('foo')
+u'foo'
-"""
-