[pywin32-checkins] pywin32/isapi install.py,1.15,1.16

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

Update of /cvsroot/pywin32/pywin32/isapi
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25393

Modified Files:
	install.py 
Log Message:
a couple of trivial pychecker issues, plus restore b/w compat

Index: install.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/isapi/install.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** install.py	17 Dec 2008 00:00:04 -0000	1.15
--- install.py	17 Dec 2008 03:53:10 -0000	1.16
***************
*** 90,94 ****
      def __init__(self, **kw):
          self.__dict__.update(kw)
!     
      def __str__(self):
          "Format this parameter suitable for IIS"
--- 90,94 ----
      def __init__(self, **kw):
          self.__dict__.update(kw)
! 
      def __str__(self):
          "Format this parameter suitable for IIS"
***************
*** 180,184 ****
          raise ItemNotFound(msg)
      return server
!     
  def FindWebServer(options, server_desc):
      """
--- 180,184 ----
          raise ItemNotFound(msg)
      return server
! 
  def FindWebServer(options, server_desc):
      """
***************
*** 241,245 ****
          # Also seen the Class change to a generic IISObject - so nuke
          # *any* existing object, regardless of Class
!         existing = iis_dir.Delete('', name)
          log(2, "Deleted old directory '%s'" % (name,))
      except pythoncom.com_error:
--- 241,245 ----
          # Also seen the Class change to a generic IISObject - so nuke
          # *any* existing object, regardless of Class
!         iis_dir.Delete('', name)
          log(2, "Deleted old directory '%s'" % (name,))
      except pythoncom.com_error:
***************
*** 568,572 ****
      return dll_name
  
! def InstallModule(conf_module_name, params, options, log):
      "Install the extension"
      if not hasattr(sys, "frozen"):
--- 568,578 ----
      return dll_name
  
! # Note the 'log' params to these 'builtin' args - old versions of pywin32
! # didn't log at all in this function (by intent; anyone calling this was
! # responsible). So existing code that calls this function with the old
! # signature (ie, without a 'log' param) still gets the same behaviour as
! # before...
! 
! def InstallModule(conf_module_name, params, options, log=lambda *args:None):
      "Install the extension"
      if not hasattr(sys, "frozen"):
***************
*** 580,584 ****
      log(1, "Installation complete.")
  
! def UninstallModule(conf_module_name, params, options, log):
      "Remove the extension"
      loader_dll = GetLoaderModuleName(conf_module_name, False)
--- 586,590 ----
      log(1, "Installation complete.")
  
! def UninstallModule(conf_module_name, params, options, log=lambda *args:None):
      "Remove the extension"
      loader_dll = GetLoaderModuleName(conf_module_name, False)
***************
*** 587,591 ****
      log(1, "Uninstallation complete.")
  
! standard_arg_handlers = {
      "install" : InstallModule,
      "remove"  : UninstallModule,
--- 593,597 ----
      log(1, "Uninstallation complete.")
  
! standard_arguments = {
      "install" : InstallModule,
      "remove"  : UninstallModule,
***************
*** 649,653 ****
      # build a usage string if we don't have one.
      if not parser.get_usage():
!         all_handlers = standard_arg_handlers.copy()
          all_handlers.update(custom_arg_handlers)
          parser.set_usage(build_usage(all_handlers))
--- 655,659 ----
      # build a usage string if we don't have one.
      if not parser.get_usage():
!         all_handlers = standard_arguments.copy()
          all_handlers.update(custom_arg_handlers)
          parser.set_usage(build_usage(all_handlers))
***************
*** 680,683 ****
              traceback.print_exc()
          print "%s: %s" % (details.__class__.__name__, details)
!     except KeyError, e:
!         parser.error("Invalid arg '%s'" % arg)
\ No newline at end of file
--- 686,689 ----
              traceback.print_exc()
          print "%s: %s" % (details.__class__.__name__, details)
!     except KeyError:
!         parser.error("Invalid arg '%s'" % arg)