|
From: Mark H. <mha...@us...> - 2008-12-04 07:32:11
|
Update of /cvsroot/pywin32/pywin32/com/win32comext/shell/demos/servers In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4678/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: many more py3k syntax improvements thanks to 2to3 Index: column_provider.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/demos/servers/column_provider.py,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.2 diff -C2 -d -r1.1.4.1 -r1.1.4.2 *** column_provider.py 26 Nov 2008 09:03:30 -0000 1.1.4.1 --- column_provider.py 4 Dec 2008 07:32:06 -0000 1.1.4.2 *************** *** 79,94 **** def DllRegisterServer(): ! 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.") def DllUnregisterServer(): ! import _winreg try: ! key = _winreg.DeleteKey(_winreg.HKEY_CLASSES_ROOT, "Folder\\ShellEx\\ColumnHandlers\\" + \ str(ColumnProvider._reg_clsid_) ) --- 79,94 ---- def DllRegisterServer(): ! 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.") def DllUnregisterServer(): ! 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.1 retrieving revision 1.2.4.2 diff -C2 -d -r1.2.4.1 -r1.2.4.2 *** copy_hook.py 26 Nov 2008 09:03:30 -0000 1.2.4.1 --- copy_hook.py 4 Dec 2008 07:32:06 -0000 1.2.4.2 *************** *** 32,50 **** 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.") def DllUnregisterServer(): ! import _winreg try: ! key = _winreg.DeleteKey(_winreg.HKEY_CLASSES_ROOT, "directory\\shellex\\CopyHookHandlers\\" + ShellExtension._reg_desc_) --- 32,50 ---- 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.") def DllUnregisterServer(): ! 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.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** empty_volume_cache.py 26 Nov 2008 09:03:30 -0000 1.1.2.1 --- empty_volume_cache.py 4 Dec 2008 07:32:06 -0000 1.1.2.2 *************** *** 148,163 **** # HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches # See link at top of file. ! import _winreg 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(): ! import _winreg kn = r"Software\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\%s" \ % (EmptyVolumeCache._reg_desc_,) try: ! key = _winreg.DeleteKey(_winreg.HKEY_LOCAL_MACHINE, kn) except WindowsError as details: import errno --- 148,163 ---- # HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches # See link at top of file. ! import winreg 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(): ! import winreg kn = r"Software\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\%s" \ % (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.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** folder_view.py 26 Nov 2008 09:03:30 -0000 1.1.2.1 --- folder_view.py 4 Dec 2008 07:32:06 -0000 1.1.2.2 *************** *** 677,692 **** def DllRegisterServer(): ! import _winreg if sys.getwindowsversion()[0] < 6: print("This sample only works on Vista") 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 --- 677,692 ---- def DllRegisterServer(): ! import winreg if sys.getwindowsversion()[0] < 6: print("This sample only works on Vista") 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,708 **** 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.") def DllUnregisterServer(): ! import _winreg paths = [ "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Desktop\\Namespace\\" + ShellFolder._reg_clsid_, --- 695,708 ---- 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.") def DllUnregisterServer(): ! import winreg paths = [ "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Desktop\\Namespace\\" + ShellFolder._reg_clsid_, *************** *** 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.1 retrieving revision 1.12.2.2 diff -C2 -d -r1.12.2.1 -r1.12.2.2 *** shell_view.py 26 Nov 2008 09:03:30 -0000 1.12.2.1 --- shell_view.py 4 Dec 2008 07:32:06 -0000 1.12.2.2 *************** *** 48,52 **** import sys, os ! import thread import pyclbr import pythoncom --- 48,52 ---- import sys, os ! import _thread import pyclbr import pythoncom *************** *** 812,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 --- 812,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,836 **** import struct s = struct.pack("i", attr) ! _winreg.SetValueEx(key, "Attributes", 0, _winreg.REG_BINARY, s) print(ShellFolderRoot._reg_desc_, "registration complete.") def DllUnregisterServer(): ! import _winreg try: ! key = _winreg.DeleteKey(_winreg.HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\" \ "Explorer\\Desktop\\Namespace\\" + \ --- 826,836 ---- import struct s = struct.pack("i", attr) ! winreg.SetValueEx(key, "Attributes", 0, _winreg.REG_BINARY, s) print(ShellFolderRoot._reg_desc_, "registration complete.") def DllUnregisterServer(): ! 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.1 retrieving revision 1.1.4.2 diff -C2 -d -r1.1.4.1 -r1.1.4.2 *** icon_handler.py 26 Nov 2008 09:03:30 -0000 1.1.4.1 --- icon_handler.py 4 Dec 2008 07:32:06 -0000 1.1.4.2 *************** *** 46,60 **** 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.") def DllUnregisterServer(): ! import _winreg try: ! key = _winreg.DeleteKey(_winreg.HKEY_CLASSES_ROOT, "Python.File\\shellex\\IconHandler") except WindowsError as details: --- 46,60 ---- 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.") def DllUnregisterServer(): ! 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.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** context_menu.py 26 Nov 2008 09:03:30 -0000 1.4.2.1 --- context_menu.py 4 Dec 2008 07:32:06 -0000 1.4.2.2 *************** *** 76,91 **** 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.") def DllUnregisterServer(): ! import _winreg try: ! key = _winreg.DeleteKey(_winreg.HKEY_CLASSES_ROOT, "Python.File\\shellex\\ContextMenuHandlers\\PythonSample") except WindowsError as details: --- 76,91 ---- 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.") def DllUnregisterServer(): ! import winreg try: ! key = winreg.DeleteKey(_winreg.HKEY_CLASSES_ROOT, "Python.File\\shellex\\ContextMenuHandlers\\PythonSample") except WindowsError as details: |
