commit dbb718fa8775731666bb9cbc73662fadee41ea8f
author Guido van Rossum <guido@python.org> Fri Sep 21 19:22:34 2001 +0000
committer Guido van Rossum <guido@python.org> Fri Sep 21 19:22:34 2001 +0000
tree 9081dce67bff0bca69fe2eed9e6e832126edd77e
parent 11310bf867ae1c26d2ad9dc696bf2331709b9843

Make these modules work when Python is compiled without Unicode support.

Lib/pickle.py

diff --git a/Lib/pickle.py b/Lib/pickle.py
index d5773e2..9b59de8 100644
--- a/Lib/pickle.py
+++ b/Lib/pickle.py
@@ -54,6 +54,12 @@
 except ImportError:
     PyStringMap = None
 
+try:
+    UnicodeType
+except NameError:
+    UnicodeType = None
+
+
 MARK            = '('
 STOP            = '.'
 POP             = '0'
@@ -304,8 +310,8 @@
             s = mdumps(l)[1:]
             self.write(BINUNICODE + s + encoding)
         else:
-            object = object.replace(u"\\", u"\\u005c")
-            object = object.replace(u"\n", u"\\u000a")
+            object = object.replace("\\", "\\u005c")
+            object = object.replace("\n", "\\u000a")
             self.write(UNICODE + object.encode('raw-unicode-escape') + '\n')
 
         memo_len = len(memo)
@@ -334,8 +340,8 @@
                         self.write(BINSTRING + s + object)
             else:
                 if unicode:
-                    object = object.replace(u"\\", u"\\u005c")
-                    object = object.replace(u"\n", u"\\u000a")
+                    object = object.replace("\\", "\\u005c")
+                    object = object.replace("\n", "\\u000a")
                     object = object.encode('raw-unicode-escape')
                     self.write(UNICODE + object + '\n')
                 else: