[pywin32-checkins] pywin32/com/win32com/demos outlookAddin.py, 1.2.4.2, 1.2.4.3 ietoolbar.py, 1.1.4.5, 1.1.4.6 iebutton.py, 1.3.4.3, 1.3.4.4 excelAddin.py, 1.1.4.2, 1.1.4.3

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/com/win32com/demos
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv27312/com/win32com/demos

Modified Files:
      Tag: py3k
	outlookAddin.py ietoolbar.py iebutton.py excelAddin.py 
Log Message:
corrections for 2to3 bug - _winreg->winreg

Index: ietoolbar.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/demos/ietoolbar.py,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -C2 -d -r1.1.4.5 -r1.1.4.6
*** ietoolbar.py	4 Dec 2008 07:32:05 -0000	1.1.4.5
--- ietoolbar.py	9 Dec 2008 13:09:33 -0000	1.1.4.6
***************
*** 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,303 ****
      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:
--- 299,303 ----
      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:

Index: excelAddin.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/demos/excelAddin.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
*** excelAddin.py	4 Dec 2008 07:32:05 -0000	1.1.4.2
--- excelAddin.py	9 Dec 2008 13:09:33 -0000	1.1.4.3
***************
*** 117,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
--- 117,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.2
retrieving revision 1.2.4.3
diff -C2 -d -r1.2.4.2 -r1.2.4.3
*** outlookAddin.py	4 Dec 2008 07:32:05 -0000	1.2.4.2
--- outlookAddin.py	9 Dec 2008 13:09:33 -0000	1.2.4.3
***************
*** 92,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
--- 92,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.3
retrieving revision 1.3.4.4
diff -C2 -d -r1.3.4.3 -r1.3.4.4
*** iebutton.py	4 Dec 2008 07:32:05 -0000	1.3.4.3
--- iebutton.py	9 Dec 2008 13:09:33 -0000	1.3.4.4
***************
*** 133,144 ****
      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.")
--- 133,144 ----
      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.")
***************
*** 150,154 ****
      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
--- 150,154 ----
      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
***************
*** 158,162 ****
          winreg.DeleteValue( hKey, "Icon" )
          winreg.DeleteValue( hKey, "HotIcon" )
!         winreg.DeleteKey( _winreg.HKEY_LOCAL_MACHINE, subKeyCLSID )
      except WindowsError:
          print("Couldn't delete Standard toolbar regkey.")
--- 158,162 ----
          winreg.DeleteValue( hKey, "Icon" )
          winreg.DeleteValue( hKey, "HotIcon" )
!         winreg.DeleteKey( winreg.HKEY_LOCAL_MACHINE, subKeyCLSID )
      except WindowsError:
          print("Couldn't delete Standard toolbar regkey.")