[Python-checkins] CVS: python/dist/src/Lib pickle.py,1.51,1.52 zipfile.py,1.17,1.18

[Guido van Rossum]

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv21725

Modified Files:
	pickle.py zipfile.py 
Log Message:
Make these modules work when Python is compiled without Unicode support.

Index: pickle.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/pickle.py,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** pickle.py	2001/08/28 22:21:18	1.51
--- pickle.py	2001/09/21 19:21:45	1.52
***************
*** 55,58 ****
--- 55,64 ----
      PyStringMap = None
  
+ try:
+     UnicodeType
+ except NameError:
+     UnicodeType = None
+ 
+ 
  MARK            = '('
  STOP            = '.'
***************
*** 305,310 ****
              self.write(BINUNICODE + s + encoding)
          else:
!             object = object.replace(u"\\", u"\\u005c")
!             object = object.replace(u"\n", u"\\u000a")
              self.write(UNICODE + object.encode('raw-unicode-escape') + '\n')
  
--- 311,316 ----
              self.write(BINUNICODE + s + encoding)
          else:
!             object = object.replace("\\", "\\u005c")
!             object = object.replace("\n", "\\u000a")
              self.write(UNICODE + object.encode('raw-unicode-escape') + '\n')
  
***************
*** 335,340 ****
              else:
                  if unicode:
!                     object = object.replace(u"\\", u"\\u005c")
!                     object = object.replace(u"\n", u"\\u000a")
                      object = object.encode('raw-unicode-escape')
                      self.write(UNICODE + object + '\n')
--- 341,346 ----
              else:
                  if unicode:
!                     object = object.replace("\\", "\\u005c")
!                     object = object.replace("\n", "\\u000a")
                      object = object.encode('raw-unicode-escape')
                      self.write(UNICODE + object + '\n')

Index: zipfile.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/zipfile.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** zipfile.py	2001/09/18 02:26:39	1.17
--- zipfile.py	2001/09/21 19:21:45	1.18
***************
*** 67,71 ****
  
  # Used to compare file passed to ZipFile
! _STRING_TYPES = (type('s'), type(u's'))
  
  
--- 67,74 ----
  
  # Used to compare file passed to ZipFile
! import types
! _STRING_TYPES = (types.StringType,)
! if hasattr(types, "UnicodeType"):
!     _STRING_TYPES = _STRING_TYPES + (types.UnicodeType,)