|
From: Mark H. <mha...@us...> - 2008-12-09 13:08:49
|
Update of /cvsroot/pywin32/pywin32/com/win32comext/shell/demos/servers In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv27217/com/win32comext/shell/demos/servers Modified Files: Tag: py3k column_provider.py context_menu.py copy_hook.py empty_volume_cache.py folder_view.py icon_handler.py shell_view.py Log Message: corrections for 2to3 bug - _winreg->winreg Index: column_provider.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/demos/servers/column_provider.py,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.3 diff -C2 -d -r1.1.4.2 -r1.1.4.3 *** column_provider.py 4 Dec 2008 07:32:06 -0000 1.1.4.2 --- column_provider.py 9 Dec 2008 13:08:36 -0000 1.1.4.3 *************** *** 81,88 **** import winreg # Special ColumnProvider key ! key = winreg.CreateKey(_winreg.HKEY_CLASSES_ROOT, "Folder\\ShellEx\\ColumnHandlers\\" + \ str(ColumnProvider._reg_clsid_ )) ! winreg.SetValueEx(key, None, 0, _winreg.REG_SZ, ColumnProvider._reg_desc_) print(ColumnProvider._reg_desc_, "registration complete.") --- 81,88 ---- import winreg # Special ColumnProvider key ! key = winreg.CreateKey(winreg.HKEY_CLASSES_ROOT, "Folder\\ShellEx\\ColumnHandlers\\" + \ str(ColumnProvider._reg_clsid_ )) ! winreg.SetValueEx(key, None, 0, winreg.REG_SZ, ColumnProvider._reg_desc_) print(ColumnProvider._reg_desc_, "registration complete.") *************** *** 90,94 **** import winreg try: ! key = winreg.DeleteKey(_winreg.HKEY_CLASSES_ROOT, "Folder\\ShellEx\\ColumnHandlers\\" + \ str(ColumnProvider._reg_clsid_) ) --- 90,94 ---- import winreg try: ! key = winreg.DeleteKey(winreg.HKEY_CLASSES_ROOT, "Folder\\ShellEx\\ColumnHandlers\\" + \ str(ColumnProvider._reg_clsid_) ) Index: copy_hook.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/demos/servers/copy_hook.py,v retrieving revision 1.2.4.2 retrieving revision 1.2.4.3 diff -C2 -d -r1.2.4.2 -r1.2.4.3 *** copy_hook.py 4 Dec 2008 07:32:06 -0000 1.2.4.2 --- copy_hook.py 9 Dec 2008 13:08:36 -0000 1.2.4.3 *************** *** 33,44 **** def DllRegisterServer(): import winreg ! key = winreg.CreateKey(_winreg.HKEY_CLASSES_ROOT, "directory\\shellex\\CopyHookHandlers\\" + ShellExtension._reg_desc_) ! winreg.SetValueEx(key, None, 0, _winreg.REG_SZ, ShellExtension._reg_clsid_) ! key = winreg.CreateKey(_winreg.HKEY_CLASSES_ROOT, "*\\shellex\\CopyHookHandlers\\" + ShellExtension._reg_desc_) ! winreg.SetValueEx(key, None, 0, _winreg.REG_SZ, ShellExtension._reg_clsid_) print(ShellExtension._reg_desc_, "registration complete.") --- 33,44 ---- def DllRegisterServer(): import winreg ! key = winreg.CreateKey(winreg.HKEY_CLASSES_ROOT, "directory\\shellex\\CopyHookHandlers\\" + ShellExtension._reg_desc_) ! winreg.SetValueEx(key, None, 0, winreg.REG_SZ, ShellExtension._reg_clsid_) ! key = winreg.CreateKey(winreg.HKEY_CLASSES_ROOT, "*\\shellex\\CopyHookHandlers\\" + ShellExtension._reg_desc_) ! winreg.SetValueEx(key, None, 0, winreg.REG_SZ, ShellExtension._reg_clsid_) print(ShellExtension._reg_desc_, "registration complete.") *************** *** 46,50 **** import winreg try: ! key = winreg.DeleteKey(_winreg.HKEY_CLASSES_ROOT, "directory\\shellex\\CopyHookHandlers\\" + ShellExtension._reg_desc_) --- 46,50 ---- import winreg try: ! key = winreg.DeleteKey(winreg.HKEY_CLASSES_ROOT, "directory\\shellex\\CopyHookHandlers\\" + ShellExtension._reg_desc_) *************** *** 54,58 **** raise try: ! key = winreg.DeleteKey(_winreg.HKEY_CLASSES_ROOT, "*\\shellex\\CopyHookHandlers\\" + ShellExtension._reg_desc_) --- 54,58 ---- raise try: ! key = winreg.DeleteKey(winreg.HKEY_CLASSES_ROOT, "*\\shellex\\CopyHookHandlers\\" + ShellExtension._reg_desc_) Index: empty_volume_cache.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/demos/servers/empty_volume_cache.py,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** empty_volume_cache.py 4 Dec 2008 07:32:06 -0000 1.1.2.2 --- empty_volume_cache.py 9 Dec 2008 13:08:36 -0000 1.1.2.3 *************** *** 151,156 **** kn = r"Software\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\%s" \ % (EmptyVolumeCache._reg_desc_,) ! key = winreg.CreateKey(_winreg.HKEY_LOCAL_MACHINE, kn) ! winreg.SetValueEx(key, None, 0, _winreg.REG_SZ, EmptyVolumeCache._reg_clsid_) def DllUnregisterServer(): --- 151,156 ---- kn = r"Software\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\%s" \ % (EmptyVolumeCache._reg_desc_,) ! key = winreg.CreateKey(winreg.HKEY_LOCAL_MACHINE, kn) ! winreg.SetValueEx(key, None, 0, winreg.REG_SZ, EmptyVolumeCache._reg_clsid_) def DllUnregisterServer(): *************** *** 159,163 **** % (EmptyVolumeCache._reg_desc_,) try: ! key = winreg.DeleteKey(_winreg.HKEY_LOCAL_MACHINE, kn) except WindowsError as details: import errno --- 159,163 ---- % (EmptyVolumeCache._reg_desc_,) try: ! key = winreg.DeleteKey(winreg.HKEY_LOCAL_MACHINE, kn) except WindowsError as details: import errno Index: folder_view.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/demos/servers/folder_view.py,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** folder_view.py 4 Dec 2008 07:32:06 -0000 1.1.2.2 --- folder_view.py 9 Dec 2008 13:08:36 -0000 1.1.2.3 *************** *** 682,692 **** sys.exit(1) ! key = winreg.CreateKey(_winreg.HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\" \ "Explorer\\Desktop\\Namespace\\" + \ ShellFolder._reg_clsid_) ! winreg.SetValueEx(key, None, 0, _winreg.REG_SZ, ShellFolder._reg_desc_) # And special shell keys under our CLSID ! key = winreg.CreateKey(_winreg.HKEY_CLASSES_ROOT, "CLSID\\" + ShellFolder._reg_clsid_ + "\\ShellFolder") # 'Attributes' is an int stored as a binary! use struct --- 682,692 ---- sys.exit(1) ! key = winreg.CreateKey(winreg.HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\" \ "Explorer\\Desktop\\Namespace\\" + \ ShellFolder._reg_clsid_) ! winreg.SetValueEx(key, None, 0, winreg.REG_SZ, ShellFolder._reg_desc_) # And special shell keys under our CLSID ! key = winreg.CreateKey(winreg.HKEY_CLASSES_ROOT, "CLSID\\" + ShellFolder._reg_clsid_ + "\\ShellFolder") # 'Attributes' is an int stored as a binary! use struct *************** *** 695,703 **** import struct s = struct.pack("i", attr) ! winreg.SetValueEx(key, "Attributes", 0, _winreg.REG_BINARY, s) # register the context menu handler under the FolderViewSampleType type. keypath = "%s\\shellex\\ContextMenuHandlers\\%s" % (ContextMenu._context_menu_type_, ContextMenu._reg_desc_) ! key = winreg.CreateKey(_winreg.HKEY_CLASSES_ROOT, keypath) ! winreg.SetValueEx(key, None, 0, _winreg.REG_SZ, ContextMenu._reg_clsid_) propsys.PSRegisterPropertySchema(get_schema_fname()) print(ShellFolder._reg_desc_, "registration complete.") --- 695,703 ---- import struct s = struct.pack("i", attr) ! winreg.SetValueEx(key, "Attributes", 0, winreg.REG_BINARY, s) # register the context menu handler under the FolderViewSampleType type. keypath = "%s\\shellex\\ContextMenuHandlers\\%s" % (ContextMenu._context_menu_type_, ContextMenu._reg_desc_) ! key = winreg.CreateKey(winreg.HKEY_CLASSES_ROOT, keypath) ! winreg.SetValueEx(key, None, 0, winreg.REG_SZ, ContextMenu._reg_clsid_) propsys.PSRegisterPropertySchema(get_schema_fname()) print(ShellFolder._reg_desc_, "registration complete.") *************** *** 711,715 **** for path in paths: try: ! winreg.DeleteKey(_winreg.HKEY_LOCAL_MACHINE, path) except WindowsError as details: import errno --- 711,715 ---- for path in paths: try: ! winreg.DeleteKey(winreg.HKEY_LOCAL_MACHINE, path) except WindowsError as details: import errno Index: shell_view.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/demos/servers/shell_view.py,v retrieving revision 1.12.2.2 retrieving revision 1.12.2.3 diff -C2 -d -r1.12.2.2 -r1.12.2.3 *** shell_view.py 4 Dec 2008 07:32:06 -0000 1.12.2.2 --- shell_view.py 9 Dec 2008 13:08:36 -0000 1.12.2.3 *************** *** 813,823 **** def DllRegisterServer(): import winreg ! key = winreg.CreateKey(_winreg.HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\" \ "Explorer\\Desktop\\Namespace\\" + \ ShellFolderRoot._reg_clsid_) ! winreg.SetValueEx(key, None, 0, _winreg.REG_SZ, ShellFolderRoot._reg_desc_) # And special shell keys under our CLSID ! key = winreg.CreateKey(_winreg.HKEY_CLASSES_ROOT, "CLSID\\" + ShellFolderRoot._reg_clsid_ + "\\ShellFolder") # 'Attributes' is an int stored as a binary! use struct --- 813,823 ---- def DllRegisterServer(): import winreg ! key = winreg.CreateKey(winreg.HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\" \ "Explorer\\Desktop\\Namespace\\" + \ ShellFolderRoot._reg_clsid_) ! winreg.SetValueEx(key, None, 0, winreg.REG_SZ, ShellFolderRoot._reg_desc_) # And special shell keys under our CLSID ! key = winreg.CreateKey(winreg.HKEY_CLASSES_ROOT, "CLSID\\" + ShellFolderRoot._reg_clsid_ + "\\ShellFolder") # 'Attributes' is an int stored as a binary! use struct *************** *** 826,830 **** import struct s = struct.pack("i", attr) ! winreg.SetValueEx(key, "Attributes", 0, _winreg.REG_BINARY, s) print(ShellFolderRoot._reg_desc_, "registration complete.") --- 826,830 ---- import struct s = struct.pack("i", attr) ! winreg.SetValueEx(key, "Attributes", 0, winreg.REG_BINARY, s) print(ShellFolderRoot._reg_desc_, "registration complete.") *************** *** 832,836 **** import winreg try: ! key = winreg.DeleteKey(_winreg.HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\" \ "Explorer\\Desktop\\Namespace\\" + \ --- 832,836 ---- import winreg try: ! key = winreg.DeleteKey(winreg.HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\" \ "Explorer\\Desktop\\Namespace\\" + \ Index: icon_handler.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/demos/servers/icon_handler.py,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.3 diff -C2 -d -r1.1.4.2 -r1.1.4.3 *** icon_handler.py 4 Dec 2008 07:32:06 -0000 1.1.4.2 --- icon_handler.py 9 Dec 2008 13:08:36 -0000 1.1.4.3 *************** *** 47,54 **** def DllRegisterServer(): import winreg ! key = winreg.CreateKey(_winreg.HKEY_CLASSES_ROOT, "Python.File\\shellex") subkey = winreg.CreateKey(key, "IconHandler") ! winreg.SetValueEx(subkey, None, 0, _winreg.REG_SZ, ShellExtension._reg_clsid_) print(ShellExtension._reg_desc_, "registration complete.") --- 47,54 ---- def DllRegisterServer(): import winreg ! key = winreg.CreateKey(winreg.HKEY_CLASSES_ROOT, "Python.File\\shellex") subkey = winreg.CreateKey(key, "IconHandler") ! winreg.SetValueEx(subkey, None, 0, winreg.REG_SZ, ShellExtension._reg_clsid_) print(ShellExtension._reg_desc_, "registration complete.") *************** *** 56,60 **** import winreg try: ! key = winreg.DeleteKey(_winreg.HKEY_CLASSES_ROOT, "Python.File\\shellex\\IconHandler") except WindowsError as details: --- 56,60 ---- import winreg try: ! key = winreg.DeleteKey(winreg.HKEY_CLASSES_ROOT, "Python.File\\shellex\\IconHandler") except WindowsError as details: Index: context_menu.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/demos/servers/context_menu.py,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -C2 -d -r1.4.2.2 -r1.4.2.3 *** context_menu.py 4 Dec 2008 07:32:06 -0000 1.4.2.2 --- context_menu.py 9 Dec 2008 13:08:36 -0000 1.4.2.3 *************** *** 77,85 **** def DllRegisterServer(): import winreg ! key = winreg.CreateKey(_winreg.HKEY_CLASSES_ROOT, "Python.File\\shellex") subkey = winreg.CreateKey(key, "ContextMenuHandlers") subkey2 = winreg.CreateKey(subkey, "PythonSample") ! winreg.SetValueEx(subkey2, None, 0, _winreg.REG_SZ, ShellExtension._reg_clsid_) print(ShellExtension._reg_desc_, "registration complete.") --- 77,85 ---- def DllRegisterServer(): import winreg ! key = winreg.CreateKey(winreg.HKEY_CLASSES_ROOT, "Python.File\\shellex") subkey = winreg.CreateKey(key, "ContextMenuHandlers") subkey2 = winreg.CreateKey(subkey, "PythonSample") ! winreg.SetValueEx(subkey2, None, 0, winreg.REG_SZ, ShellExtension._reg_clsid_) print(ShellExtension._reg_desc_, "registration complete.") *************** *** 87,91 **** import winreg try: ! key = winreg.DeleteKey(_winreg.HKEY_CLASSES_ROOT, "Python.File\\shellex\\ContextMenuHandlers\\PythonSample") except WindowsError as details: --- 87,91 ---- import winreg try: ! key = winreg.DeleteKey(winreg.HKEY_CLASSES_ROOT, "Python.File\\shellex\\ContextMenuHandlers\\PythonSample") except WindowsError as details: |
