_is_unicode(): Use UnicodeType instead of the unicode builtin for

Python 2.1 compatibility.

diff --git a/Lib/email/Charset.py b/Lib/email/Charset.py
index 4a7ef695766aafd54ab09bbbf51fb3f3086d5816..9a54dab9ef864e8b55593465c4b83f36c1abdac7 100644 (file)
--- a/Lib/email/Charset.py
+++ b/Lib/email/Charset.py
@@ -7,8 +7,10 @@ except NameError:
     def _is_unicode(x):
         return 1==0
 else:
+    # Use UnicodeType instead of built-in unicode for Py2.1 compatibility
+    from types import UnicodeType
     def _is_unicode(x):
-        return isinstance(x, unicode)
+        return isinstance(x, UnicodeType)
     
 from email.Encoders import encode_7or8bit
 import email.base64MIME