[Python-checkins] CVS: python/dist/src/Lib/plat-win winreg.py,1.4,1.5

[Mark Hammond]

Update of /cvsroot/python/python/dist/src/Lib/plat-win
In directory slayer.i.sourceforge.net:/tmp/cvs-serv12231

Modified Files:
	winreg.py 
Log Message:
Fix a type in the docstrings, and make the module Unicode aware.

Index: winreg.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-win/winreg.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** winreg.py	2000/07/21 21:43:09	1.4
--- winreg.py	2000/07/28 03:42:40	1.5
***************
*** 16,20 ****
      Note: deleteKey may not be recursive on all platforms.
  
! >>> key=createKey( r"HKLM\SOFTWARE\Python\Test" )
  
  RemoteKey( machine, top_level_key ): 
--- 16,20 ----
      Note: deleteKey may not be recursive on all platforms.
  
! >>> key=deleteKey( r"HKLM\SOFTWARE\Python\Test" )
  
  RemoteKey( machine, top_level_key ): 
***************
*** 140,144 ****
              raise IndexError, item
  
!     elif type( item )==StringType: 
          keyname=item
      else:
--- 140,144 ----
              raise IndexError, item
  
!     elif type( item ) in [StringType, UnicodeType]: 
          keyname=item
      else:
***************
*** 301,311 ****
              typeint=regtype.intval
          else:
!             if type( data )==StringType:
                  typeint=_winreg.REG_SZ
              elif type( data )==IntType:
                  typeint=_winreg.REG_DWORD
              elif type( data )==array.ArrayType:
                  typeint=_winreg.REG_BINARY
-                 data=data.tostring()
          _winreg.SetValueEx( self.handle, valname, 0, typeint, data )
  
--- 301,315 ----
              typeint=regtype.intval
          else:
!             if type( data ) in [StringType, UnicodeType]:
                  typeint=_winreg.REG_SZ
+             elif type( data )==ListType:
+                  # XXX - _winreg currently only supports lists
+                  # Also, probably should check each element is
+                  # string/unicode.
+                  typeint = _winreg.REG_MULTI_SZ
              elif type( data )==IntType:
                  typeint=_winreg.REG_DWORD
              elif type( data )==array.ArrayType:
                  typeint=_winreg.REG_BINARY
          _winreg.SetValueEx( self.handle, valname, 0, typeint, data )