Changeset 5388

Timestamp:

05/31/07 04:03:29 (1 year ago)

Author:

mtredinnick

Message:

unicode: Changed handling of None in smart_unicode/force_unicode. There is no
case when converting it to a unicode string seems useful, so keep it as None.
Fixed #4435.

Files:

• django/branches/unicode/django/utils/encoding.py (modified) (2 diffs)

django/branches/unicode/django/utils/encoding.py

@@ -28 +28 @@
-    strings, rather than kept as lazy objects.
-    """
+    if s is None:
+        return s
-    if not isinstance(s, basestring,):
-        if hasattr(s, '__unicode__'):
@@ -73 +75 @@
-    # characters that are not explicitly excluded by the list at the end of
-    # section 3.1 of RFC 3987.
+    if iri is None:
+        return iri
-    return urllib.quote(smart_str(iri), safe='/#%[]=:;$&()+,!?')
-