Commit f1ac41fb authored by Mark Hammond's avatar Mark Hammond

Fix a type in the docstrings, and make the module Unicode aware.

parent 8d5d93c3
...@@ -15,7 +15,7 @@ deleteKey( keyname ) ...@@ -15,7 +15,7 @@ deleteKey( keyname )
delete a key if it exists delete a key if it exists
Note: deleteKey may not be recursive on all platforms. Note: deleteKey may not be recursive on all platforms.
>>> key=createKey( r"HKLM\SOFTWARE\Python\Test" ) >>> key=deleteKey( r"HKLM\SOFTWARE\Python\Test" )
RemoteKey( machine, top_level_key ): RemoteKey( machine, top_level_key ):
open a key on another machine. open a key on another machine.
...@@ -139,7 +139,7 @@ def _getName( item, nameFromNum ): ...@@ -139,7 +139,7 @@ def _getName( item, nameFromNum ):
except (WindowsError, EnvironmentError): except (WindowsError, EnvironmentError):
raise IndexError, item raise IndexError, item
elif type( item )==StringType: elif type( item ) in [StringType, UnicodeType]:
keyname=item keyname=item
else: else:
raise exceptions.TypeError, \ raise exceptions.TypeError, \
...@@ -300,13 +300,17 @@ class RegKey: ...@@ -300,13 +300,17 @@ class RegKey:
if regtype: if regtype:
typeint=regtype.intval typeint=regtype.intval
else: else:
if type( data )==StringType: if type( data ) in [StringType, UnicodeType]:
typeint=_winreg.REG_SZ 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: elif type( data )==IntType:
typeint=_winreg.REG_DWORD typeint=_winreg.REG_DWORD
elif type( data )==array.ArrayType: elif type( data )==array.ArrayType:
typeint=_winreg.REG_BINARY typeint=_winreg.REG_BINARY
data=data.tostring()
_winreg.SetValueEx( self.handle, valname, 0, typeint, data ) _winreg.SetValueEx( self.handle, valname, 0, typeint, data )
def flush(self ): def flush(self ):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment