|
From: Mark H. <mha...@us...> - 2008-12-04 07:32:11
|
Update of /cvsroot/pywin32/pywin32/com/win32com/demos In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4678/com/win32com/demos Modified Files: Tag: py3k excelAddin.py iebutton.py ietoolbar.py outlookAddin.py Log Message: many more py3k syntax improvements thanks to 2to3 Index: ietoolbar.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/demos/ietoolbar.py,v retrieving revision 1.1.4.4 retrieving revision 1.1.4.5 diff -C2 -d -r1.1.4.4 -r1.1.4.5 *** ietoolbar.py 27 Nov 2008 11:31:04 -0000 1.1.4.4 --- ietoolbar.py 4 Dec 2008 07:32:05 -0000 1.1.4.5 *************** *** 23,27 **** import win32com import pythoncom ! import _winreg from win32com.shell import shell --- 23,27 ---- import win32com import pythoncom ! import winreg from win32com.shell import shell *************** *** 284,289 **** try: print("Trying to register Toolbar.\n") ! hkey = _winreg.CreateKey( _winreg.HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Internet Explorer\\Toolbar" ) ! subKey = _winreg.SetValueEx( hkey, comclass._reg_clsid_, 0, _winreg.REG_BINARY, "\0" ) except WindowsError: print("Couldn't set registry value.\nhkey: %d\tCLSID: %s\n" % ( hkey, comclass._reg_clsid_ )) --- 284,289 ---- try: print("Trying to register Toolbar.\n") ! hkey = winreg.CreateKey( _winreg.HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Internet Explorer\\Toolbar" ) ! subKey = winreg.SetValueEx( hkey, comclass._reg_clsid_, 0, _winreg.REG_BINARY, "\0" ) except WindowsError: print("Couldn't set registry value.\nhkey: %d\tCLSID: %s\n" % ( hkey, comclass._reg_clsid_ )) *************** *** 299,304 **** try: print("Trying to unregister Toolbar.\n") ! hkey = _winreg.CreateKey( _winreg.HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Internet Explorer\\Toolbar" ) ! _winreg.DeleteValue( hkey, comclass._reg_clsid_ ) except WindowsError: print("Couldn't delete registry value.\nhkey: %d\tCLSID: %s\n" % ( hkey, comclass._reg_clsid_ )) --- 299,304 ---- try: print("Trying to unregister Toolbar.\n") ! hkey = winreg.CreateKey( _winreg.HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Internet Explorer\\Toolbar" ) ! winreg.DeleteValue( hkey, comclass._reg_clsid_ ) except WindowsError: print("Couldn't delete registry value.\nhkey: %d\tCLSID: %s\n" % ( hkey, comclass._reg_clsid_ )) Index: excelAddin.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/demos/excelAddin.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 *** excelAddin.py 26 Nov 2008 09:03:29 -0000 1.1.4.1 --- excelAddin.py 4 Dec 2008 07:32:05 -0000 1.1.4.2 *************** *** 116,131 **** def RegisterAddin(klass): ! import _winreg ! key = _winreg.CreateKey(_winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Office\\Excel\\Addins") ! subkey = _winreg.CreateKey(key, klass._reg_progid_) ! _winreg.SetValueEx(subkey, "CommandLineSafe", 0, _winreg.REG_DWORD, 0) ! _winreg.SetValueEx(subkey, "LoadBehavior", 0, _winreg.REG_DWORD, 3) ! _winreg.SetValueEx(subkey, "Description", 0, _winreg.REG_SZ, "Excel Addin") ! _winreg.SetValueEx(subkey, "FriendlyName", 0, _winreg.REG_SZ, "A Simple Excel Addin") def UnregisterAddin(klass): ! import _winreg try: ! _winreg.DeleteKey(_winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Office\\Excel\\Addins\\" + klass._reg_progid_) except WindowsError: pass --- 116,131 ---- def RegisterAddin(klass): ! import winreg ! key = winreg.CreateKey(_winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Office\\Excel\\Addins") ! subkey = winreg.CreateKey(key, klass._reg_progid_) ! winreg.SetValueEx(subkey, "CommandLineSafe", 0, _winreg.REG_DWORD, 0) ! winreg.SetValueEx(subkey, "LoadBehavior", 0, _winreg.REG_DWORD, 3) ! winreg.SetValueEx(subkey, "Description", 0, _winreg.REG_SZ, "Excel Addin") ! winreg.SetValueEx(subkey, "FriendlyName", 0, _winreg.REG_SZ, "A Simple Excel Addin") def UnregisterAddin(klass): ! import winreg try: ! winreg.DeleteKey(_winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Office\\Excel\\Addins\\" + klass._reg_progid_) except WindowsError: pass Index: outlookAddin.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/demos/outlookAddin.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 *** outlookAddin.py 26 Nov 2008 09:03:29 -0000 1.2.4.1 --- outlookAddin.py 4 Dec 2008 07:32:05 -0000 1.2.4.2 *************** *** 91,106 **** def RegisterAddin(klass): ! import _winreg ! key = _winreg.CreateKey(_winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Office\\Outlook\\Addins") ! subkey = _winreg.CreateKey(key, klass._reg_progid_) ! _winreg.SetValueEx(subkey, "CommandLineSafe", 0, _winreg.REG_DWORD, 0) ! _winreg.SetValueEx(subkey, "LoadBehavior", 0, _winreg.REG_DWORD, 3) ! _winreg.SetValueEx(subkey, "Description", 0, _winreg.REG_SZ, klass._reg_progid_) ! _winreg.SetValueEx(subkey, "FriendlyName", 0, _winreg.REG_SZ, klass._reg_progid_) def UnregisterAddin(klass): ! import _winreg try: ! _winreg.DeleteKey(_winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Office\\Outlook\\Addins\\" + klass._reg_progid_) except WindowsError: pass --- 91,106 ---- def RegisterAddin(klass): ! import winreg ! key = winreg.CreateKey(_winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Office\\Outlook\\Addins") ! subkey = winreg.CreateKey(key, klass._reg_progid_) ! winreg.SetValueEx(subkey, "CommandLineSafe", 0, _winreg.REG_DWORD, 0) ! winreg.SetValueEx(subkey, "LoadBehavior", 0, _winreg.REG_DWORD, 3) ! winreg.SetValueEx(subkey, "Description", 0, _winreg.REG_SZ, klass._reg_progid_) ! winreg.SetValueEx(subkey, "FriendlyName", 0, _winreg.REG_SZ, klass._reg_progid_) def UnregisterAddin(klass): ! import winreg try: ! winreg.DeleteKey(_winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Office\\Outlook\\Addins\\" + klass._reg_progid_) except WindowsError: pass Index: iebutton.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/demos/iebutton.py,v retrieving revision 1.3.4.2 retrieving revision 1.3.4.3 diff -C2 -d -r1.3.4.2 -r1.3.4.3 *** iebutton.py 26 Nov 2008 09:03:29 -0000 1.3.4.2 --- iebutton.py 4 Dec 2008 07:32:05 -0000 1.3.4.3 *************** *** 130,144 **** def register(classobj): ! import _winreg subKeyCLSID = "SOFTWARE\\Microsoft\\Internet Explorer\\Extensions\\%38s" % classobj._reg_clsid_ try: ! hKey = _winreg.CreateKey( _winreg.HKEY_LOCAL_MACHINE, subKeyCLSID ) ! subKey = _winreg.SetValueEx( hKey, "ButtonText", 0, _winreg.REG_SZ, classobj._button_text_ ) ! _winreg.SetValueEx( hKey, "ClsidExtension", 0, _winreg.REG_SZ, classobj._reg_clsid_ ) # reg value for calling COM object ! _winreg.SetValueEx( hKey, "CLSID", 0, _winreg.REG_SZ, "{1FBA04EE-3024-11D2-8F1F-0000F87ABD16}" ) # CLSID for button that sends command to COM object ! _winreg.SetValueEx( hKey, "Default Visible", 0, _winreg.REG_SZ, "Yes" ) ! _winreg.SetValueEx( hKey, "ToolTip", 0, _winreg.REG_SZ, classobj._tool_tip_ ) ! _winreg.SetValueEx( hKey, "Icon", 0, _winreg.REG_SZ, classobj._icon_) ! _winreg.SetValueEx( hKey, "HotIcon", 0, _winreg.REG_SZ, classobj._hot_icon_) except WindowsError: print("Couldn't set standard toolbar reg keys.") --- 130,144 ---- def register(classobj): ! import winreg subKeyCLSID = "SOFTWARE\\Microsoft\\Internet Explorer\\Extensions\\%38s" % classobj._reg_clsid_ try: ! hKey = winreg.CreateKey( _winreg.HKEY_LOCAL_MACHINE, subKeyCLSID ) ! subKey = winreg.SetValueEx( hKey, "ButtonText", 0, _winreg.REG_SZ, classobj._button_text_ ) ! winreg.SetValueEx( hKey, "ClsidExtension", 0, _winreg.REG_SZ, classobj._reg_clsid_ ) # reg value for calling COM object ! winreg.SetValueEx( hKey, "CLSID", 0, _winreg.REG_SZ, "{1FBA04EE-3024-11D2-8F1F-0000F87ABD16}" ) # CLSID for button that sends command to COM object ! winreg.SetValueEx( hKey, "Default Visible", 0, _winreg.REG_SZ, "Yes" ) ! winreg.SetValueEx( hKey, "ToolTip", 0, _winreg.REG_SZ, classobj._tool_tip_ ) ! winreg.SetValueEx( hKey, "Icon", 0, _winreg.REG_SZ, classobj._icon_) ! winreg.SetValueEx( hKey, "HotIcon", 0, _winreg.REG_SZ, classobj._hot_icon_) except WindowsError: print("Couldn't set standard toolbar reg keys.") *************** *** 147,162 **** def unregister(classobj): ! import _winreg subKeyCLSID = "SOFTWARE\\Microsoft\\Internet Explorer\\Extensions\\%38s" % classobj._reg_clsid_ try: ! hKey = _winreg.CreateKey( _winreg.HKEY_LOCAL_MACHINE, subKeyCLSID ) ! subKey = _winreg.DeleteValue( hKey, "ButtonText" ) ! _winreg.DeleteValue( hKey, "ClsidExtension" ) # for calling COM object ! _winreg.DeleteValue( hKey, "CLSID" ) ! _winreg.DeleteValue( hKey, "Default Visible" ) ! _winreg.DeleteValue( hKey, "ToolTip" ) ! _winreg.DeleteValue( hKey, "Icon" ) ! _winreg.DeleteValue( hKey, "HotIcon" ) ! _winreg.DeleteKey( _winreg.HKEY_LOCAL_MACHINE, subKeyCLSID ) except WindowsError: print("Couldn't delete Standard toolbar regkey.") --- 147,162 ---- def unregister(classobj): ! import winreg subKeyCLSID = "SOFTWARE\\Microsoft\\Internet Explorer\\Extensions\\%38s" % classobj._reg_clsid_ try: ! hKey = winreg.CreateKey( _winreg.HKEY_LOCAL_MACHINE, subKeyCLSID ) ! subKey = winreg.DeleteValue( hKey, "ButtonText" ) ! winreg.DeleteValue( hKey, "ClsidExtension" ) # for calling COM object ! winreg.DeleteValue( hKey, "CLSID" ) ! winreg.DeleteValue( hKey, "Default Visible" ) ! winreg.DeleteValue( hKey, "ToolTip" ) ! winreg.DeleteValue( hKey, "Icon" ) ! winreg.DeleteValue( hKey, "HotIcon" ) ! winreg.DeleteKey( _winreg.HKEY_LOCAL_MACHINE, subKeyCLSID ) except WindowsError: print("Couldn't delete Standard toolbar regkey.") |
