pywin32-checkins — CVS checkin notices

[pywin32-checkins] pywin32/com/win32comext/shell/demos IUniformResourceLocator.py, 1.1, 1.2

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

Update of /cvsroot/pywin32/pywin32/com/win32comext/shell/demos
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18082/com/win32comext/shell/demos

Modified Files:
	IUniformResourceLocator.py 
Log Message:
more moderizations merged from py3k work

Index: IUniformResourceLocator.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/demos/IUniformResourceLocator.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IUniformResourceLocator.py	6 Apr 2006 10:50:40 -0000	1.1
--- IUniformResourceLocator.py	27 Nov 2008 09:33:22 -0000	1.2
***************
*** 32,41 ****
  pss=ish.QueryInterface(pythoncom.IID_IPropertySetStorage)
  ps=pss.Open(shell.FMTID_InternetSite)
! property_ids=[(k,v) for k,v in shellcon.__dict__.items() if k.startswith('PID_INTSITE_')]
  for pname, pval in property_ids:
      print pname, ps.ReadMultiple((pval,))[0]
  
  ps=pss.Open(shell.FMTID_Intshcut)
! property_ids=[(k,v) for k,v in shellcon.__dict__.items() if k.startswith('PID_IS_')]
  for pname, pval in property_ids:
      print pname, ps.ReadMultiple((pval,))[0]
--- 32,41 ----
  pss=ish.QueryInterface(pythoncom.IID_IPropertySetStorage)
  ps=pss.Open(shell.FMTID_InternetSite)
! property_ids=[(k,v) for k,v in shellcon.__dict__.iteritems() if k.startswith('PID_INTSITE_')]
  for pname, pval in property_ids:
      print pname, ps.ReadMultiple((pval,))[0]
  
  ps=pss.Open(shell.FMTID_Intshcut)
! property_ids=[(k,v) for k,v in shellcon.__dict__.iteritems() if k.startswith('PID_IS_')]
  for pname, pval in property_ids:
      print pname, ps.ReadMultiple((pval,))[0]

[pywin32-checkins] pywin32/win32/test test_odbc.py,1.11,1.12

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

Update of /cvsroot/pywin32/pywin32/win32/test
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18035/win32/test

Modified Files:
	test_odbc.py 
Log Message:
revert errors that crept in during py3k work

Index: test_odbc.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/test/test_odbc.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** test_odbc.py	20 Oct 2008 03:27:48 -0000	1.11
--- test_odbc.py	27 Nov 2008 09:32:34 -0000	1.12
***************
*** 43,47 ****
              conn_str = "Driver={Microsoft Access Driver (*.mdb)};dbq=%s;Uid=;Pwd=;" \
                         % (self.db_filename,)
!         ## print ('Connection string:', conn_str)
          self.conn = odbc.odbc(conn_str)
          # And we expect a 'users' table for these tests.
--- 43,47 ----
              conn_str = "Driver={Microsoft Access Driver (*.mdb)};dbq=%s;Uid=;Pwd=;" \
                         % (self.db_filename,)
!         ## print 'Connection string:', conn_str
          self.conn = odbc.odbc(conn_str)
          # And we expect a 'users' table for these tests.
***************
*** 74,78 ****
                  self.cur.execute("""drop table %s""" %self.tablename)
              except (odbc.error, odbc.progError), why:
!                 print ("Failed to delete test table %s" %self.tablename, why)
  
              self.cur.close()
--- 74,78 ----
                  self.cur.execute("""drop table %s""" %self.tablename)
              except (odbc.error, odbc.progError), why:
!                 print "Failed to delete test table %s" %self.tablename, why
  
              self.cur.close()

[pywin32-checkins] pywin32/win32/Demos getfilever.py,1.2,1.3

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

Update of /cvsroot/pywin32/pywin32/win32/Demos
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17968/win32/Demos

Modified Files:
	getfilever.py 
Log Message:
fix eol at eof

Index: getfilever.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Demos/getfilever.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** getfilever.py	27 Nov 2008 09:30:28 -0000	1.2
--- getfilever.py	27 Nov 2008 09:31:01 -0000	1.3
***************
*** 20,24 ****
          ## print str_info
          print ver_string, repr(win32api.GetFileVersionInfo(fname, str_info))
- 
-         
-     
\ No newline at end of file
--- 20,21 ----

[pywin32-checkins] pywin32/win32/Demos getfilever.py,1.1,1.2

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

Update of /cvsroot/pywin32/pywin32/win32/Demos
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17949/win32/Demos

Modified Files:
	getfilever.py 
Log Message:
avoid printing extended chars to the console

Index: getfilever.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Demos/getfilever.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** getfilever.py	18 Oct 2003 06:15:48 -0000	1.1
--- getfilever.py	27 Nov 2008 09:30:28 -0000	1.2
***************
*** 8,12 ****
  d=win32api.GetFileVersionInfo(fname, '\\')
  ## backslash as parm returns dictionary of numeric info corresponding to VS_FIXEDFILEINFO struc
! for n, v in d.items():
      print n, v
  
--- 8,12 ----
  d=win32api.GetFileVersionInfo(fname, '\\')
  ## backslash as parm returns dictionary of numeric info corresponding to VS_FIXEDFILEINFO struc
! for n, v in d.iteritems():
      print n, v
  
***************
*** 19,23 ****
          str_info=u'\\StringFileInfo\\%04X%04X\\%s' %(lang,codepage,ver_string)
          ## print str_info
!         print ver_string, win32api.GetFileVersionInfo(fname, str_info)
  
          
--- 19,23 ----
          str_info=u'\\StringFileInfo\\%04X%04X\\%s' %(lang,codepage,ver_string)
          ## print str_info
!         print ver_string, repr(win32api.GetFileVersionInfo(fname, str_info))
  
          

[pywin32-checkins] pywin32/Pythonwin/pywin/framework sgrepmdi.py, 1.9, 1.10

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

Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17419/Pythonwin/pywin/framework

Modified Files:
	sgrepmdi.py 
Log Message:
bugfix to sgrepmdi's handling of subdirs picked up in py3k branch.


Index: sgrepmdi.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/sgrepmdi.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** sgrepmdi.py	27 Nov 2008 03:53:25 -0000	1.9
--- sgrepmdi.py	27 Nov 2008 09:17:48 -0000	1.10
***************
*** 53,57 ****
  						for sd in subdirs:
  							sd = sd.lower()
! 							if d not in dirs:
  								dirs[sd] = None
  			elif os.path.isfile(d):
--- 53,57 ----
  						for sd in subdirs:
  							sd = sd.lower()
! 							if sd not in dirs:
  								dirs[sd] = None
  			elif os.path.isfile(d):

[pywin32-checkins] pywin32/win32/Lib netbios.py,1.5,1.6

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

Update of /cvsroot/pywin32/pywin32/win32/Lib
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6691/win32/lib

Modified Files:
	netbios.py 
Log Message:
Ensure file ends with newline

Index: netbios.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/netbios.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** netbios.py	14 Nov 2008 00:22:25 -0000	1.5
--- netbios.py	27 Nov 2008 06:40:00 -0000	1.6
***************
*** 283,285 ****
              print "%02x" % (ord(ch),) ,
          print
-     
\ No newline at end of file
--- 283,284 ----

[pywin32-checkins] pywin32/com/win32comext/axscript/client framework.py, 1.25, 1.26 pyscript.py, 1.13, 1.14

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

Update of /cvsroot/pywin32/pywin32/com/win32comext/axscript/client
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3958/com/win32comext/axscript/client

Modified Files:
	framework.py pyscript.py 
Log Message:
modernize syntax: remove use of apply() from most of the tree

Index: pyscript.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axscript/client/pyscript.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** pyscript.py	26 Nov 2008 08:39:33 -0000	1.13
--- pyscript.py	27 Nov 2008 05:58:17 -0000	1.14
***************
*** 30,34 ****
  def debug_attr_print(*args):
  	if debugging_attr:
! 		apply(trace, args)
  
  def ExpandTabs(text):
--- 30,34 ----
  def debug_attr_print(*args):
  	if debugging_attr:
! 		trace(*args)
  
  def ExpandTabs(text):

Index: framework.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axscript/client/framework.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** framework.py	7 May 2007 02:27:44 -0000	1.25
--- framework.py	27 Nov 2008 05:58:17 -0000	1.26
***************
*** 46,50 ****
  # roll on 1.6 :-)		
  #		return prof.runcall(fn, *args)
! 		return apply(prof.runcall, (fn,) + args)
  	finally:
  		import pstats
--- 46,50 ----
  # roll on 1.6 :-)		
  #		return prof.runcall(fn, *args)
! 		return prof.runcall(*(fn,) + args)
  	finally:
  		import pstats
***************
*** 841,847 ****
  				return self.debugManager.adb.runcall(fn, *args)
  			else:
! 				return apply(fn, args)
  		else:
! 			return apply(fn, args)
  	
  	def ApplyInScriptedSection(self, codeBlock, fn, args):
--- 841,847 ----
  				return self.debugManager.adb.runcall(fn, *args)
  			else:
! 				return fn(*args)
  		else:
! 			return fn(*args)
  	
  	def ApplyInScriptedSection(self, codeBlock, fn, args):

[pywin32-checkins] pywin32/win32/Lib win32evtlogutil.py, 1.10, 1.11 win32pdhquery.py, 1.3, 1.4 win32serviceutil.py, 1.29, 1.30

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

Update of /cvsroot/pywin32/pywin32/win32/Lib
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3958/win32/Lib

Modified Files:
	win32evtlogutil.py win32pdhquery.py win32serviceutil.py 
Log Message:
modernize syntax: remove use of apply() from most of the tree

Index: win32pdhquery.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32pdhquery.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** win32pdhquery.py	25 Apr 2004 07:44:41 -0000	1.3
--- win32pdhquery.py	27 Nov 2008 05:58:17 -0000	1.4
***************
*** 345,349 ****
  		'''
  		self.volatilecounters = []
! 		apply(BaseQuery.__init__, (self,)+args, namedargs)
  	def addperfcounter(self, object, counter, machine=None):
  		'''
--- 345,349 ----
  		'''
  		self.volatilecounters = []
! 		BaseQuery.__init__(*(self,)+args, **namedargs)
  	def addperfcounter(self, object, counter, machine=None):
  		'''
***************
*** 420,428 ****
  		'''
  		# do all the normal opening stuff, self._base is now the query object
! 		apply(BaseQuery.open,(self,)+args, namedargs)
  		# should rewrite getinstpaths to take a single tuple
  		paths = []
  		for tup in self.volatilecounters:
! 			paths[len(paths):] = apply(self.getinstpaths, tup)
  		for path in paths:
  			try:
--- 420,428 ----
  		'''
  		# do all the normal opening stuff, self._base is now the query object
! 		BaseQuery.open(*(self,)+args, **namedargs)
  		# should rewrite getinstpaths to take a single tuple
  		paths = []
  		for tup in self.volatilecounters:
! 			paths[len(paths):] = self.getinstpaths(*tup)
  		for path in paths:
  			try:

Index: win32serviceutil.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32serviceutil.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** win32serviceutil.py	27 Nov 2008 04:15:21 -0000	1.29
--- win32serviceutil.py	27 Nov 2008 05:58:17 -0000	1.30
***************
*** 637,641 ****
              InstallService(serviceClassString, serviceName, serviceDisplayName, serviceDeps = serviceDeps, startType=startup, bRunInteractive=interactive, userName=userName,password=password, exeName=exeName, perfMonIni=perfMonIni,perfMonDll=perfMonDll,exeArgs=exeArgs,description=description)
              if customOptionHandler:
!                 apply( customOptionHandler, (opts,) )
              print "Service installed"
          except win32service.error, (hr, fn, msg):
--- 637,641 ----
              InstallService(serviceClassString, serviceName, serviceDisplayName, serviceDeps = serviceDeps, startType=startup, bRunInteractive=interactive, userName=userName,password=password, exeName=exeName, perfMonIni=perfMonIni,perfMonDll=perfMonDll,exeArgs=exeArgs,description=description)
              if customOptionHandler:
!                 customOptionHandler(*(opts,))
              print "Service installed"
          except win32service.error, (hr, fn, msg):
***************
*** 680,684 ****
              ChangeServiceConfig(serviceClassString, serviceName, serviceDeps = serviceDeps, startType=startup, bRunInteractive=interactive, userName=userName,password=password, exeName=exeName, displayName = serviceDisplayName, perfMonIni=perfMonIni,perfMonDll=perfMonDll,exeArgs=exeArgs,description=description)
              if customOptionHandler:
!                 apply( customOptionHandler, (opts,) )
              print "Service updated"
          except win32service.error, (hr, fn, msg):
--- 680,684 ----
              ChangeServiceConfig(serviceClassString, serviceName, serviceDeps = serviceDeps, startType=startup, bRunInteractive=interactive, userName=userName,password=password, exeName=exeName, displayName = serviceDisplayName, perfMonIni=perfMonIni,perfMonDll=perfMonDll,exeArgs=exeArgs,description=description)
              if customOptionHandler:
!                 customOptionHandler(*(opts,))
              print "Service updated"
          except win32service.error, (hr, fn, msg):

Index: win32evtlogutil.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32evtlogutil.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** win32evtlogutil.py	25 Apr 2004 10:34:10 -0000	1.10
--- win32evtlogutil.py	27 Nov 2008 05:58:17 -0000	1.11
***************
*** 148,152 ****
              if not objects:
                  break
!             map(lambda item, feeder = feeder: apply(feeder, (item,)), objects)
      finally:
          win32evtlog.CloseEventLog(h)
--- 148,152 ----
              if not objects:
                  break
!             map(lambda item, feeder = feeder: feeder(*(item,)), objects)
      finally:
          win32evtlog.CloseEventLog(h)

[pywin32-checkins] pywin32/com/win32com/demos ietoolbar.py, 1.3, 1.4

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

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

Modified Files:
	ietoolbar.py 
Log Message:
modernize syntax: remove use of apply() from most of the tree

Index: ietoolbar.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/demos/ietoolbar.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ietoolbar.py	26 Nov 2008 08:52:32 -0000	1.3
--- ietoolbar.py	27 Nov 2008 05:58:17 -0000	1.4
***************
*** 100,104 ****
                  vals.append(val)
              full_fmt += fmt		
!         return apply(struct.pack, (full_fmt,) + tuple(vals) )
  
  class TBBUTTON(WIN32STRUCT):
--- 100,104 ----
                  vals.append(val)
              full_fmt += fmt		
!         return struct.pack(*(full_fmt,) + tuple(vals))
  
  class TBBUTTON(WIN32STRUCT):

[pywin32-checkins] pywin32/win32/Demos win32gui_dialog.py, 1.9, 1.10

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

Update of /cvsroot/pywin32/pywin32/win32/Demos
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3958/win32/Demos

Modified Files:
	win32gui_dialog.py 
Log Message:
modernize syntax: remove use of apply() from most of the tree

Index: win32gui_dialog.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Demos/win32gui_dialog.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** win32gui_dialog.py	26 Nov 2008 08:56:33 -0000	1.9
--- win32gui_dialog.py	27 Nov 2008 05:58:17 -0000	1.10
***************
*** 81,85 ****
                  vals.append(val)
              full_fmt += fmt
!         return apply(struct.pack, (full_fmt,) + tuple(vals) )
  
  
--- 81,85 ----
                  vals.append(val)
              full_fmt += fmt
!         return struct.pack(*(full_fmt,) + tuple(vals))
  
  
***************
*** 286,290 ****
              while 1:
                  params = self.result_queue.get(0)
!                 apply(self.AddListItem, params)
          except Queue.Empty:
              pass
--- 286,290 ----
              while 1:
                  params = self.result_queue.get(0)
!                 self.AddListItem(*params)
          except Queue.Empty:
              pass

[pywin32-checkins] pywin32/win32/Demos/service pipeTestService.py, 1.6, 1.7

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

Update of /cvsroot/pywin32/pywin32/win32/Demos/service
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3958/win32/Demos/service

Modified Files:
	pipeTestService.py 
Log Message:
modernize syntax: remove use of apply() from most of the tree

Index: pipeTestService.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Demos/service/pipeTestService.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** pipeTestService.py	31 Jan 2005 04:11:59 -0000	1.6
--- pipeTestService.py	27 Nov 2008 05:58:17 -0000	1.7
***************
*** 29,33 ****
  def ApplyIgnoreError(fn, args):
      try:
!         return apply(fn, args)
      except error: # Ignore win32api errors.
          return None
--- 29,33 ----
  def ApplyIgnoreError(fn, args):
      try:
!         return fn(*args)
      except error: # Ignore win32api errors.
          return None

[pywin32-checkins] pywin32/win32/scripts/VersionStamp bulkstamp.py, 1.6, 1.7

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

Update of /cvsroot/pywin32/pywin32/win32/scripts/VersionStamp
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3958/win32/scripts/VersionStamp

Modified Files:
	bulkstamp.py 
Log Message:
modernize syntax: remove use of apply() from most of the tree

Index: bulkstamp.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/scripts/VersionStamp/bulkstamp.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** bulkstamp.py	24 Oct 2003 07:06:24 -0000	1.6
--- bulkstamp.py	27 Nov 2008 05:58:17 -0000	1.7
***************
*** 135,137 ****
      sys.exit(1)
  
!   apply(scan, tuple(sys.argv[1:]))
--- 135,137 ----
      sys.exit(1)
  
!   scan(*tuple(sys.argv[1:]))

[pywin32-checkins] pywin32/Pythonwin/pywin/tools TraceCollector.py, 1.3, 1.4

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

Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/tools
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3958/Pythonwin/pywin/tools

Modified Files:
	TraceCollector.py 
Log Message:
modernize syntax: remove use of apply() from most of the tree

Index: TraceCollector.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/tools/TraceCollector.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TraceCollector.py	9 Apr 2004 11:30:25 -0000	1.3
--- TraceCollector.py	27 Nov 2008 05:58:16 -0000	1.4
***************
*** 29,33 ****
  class WindowOutput(winout.WindowOutput):
  	def __init__(self, *args):
! 		apply(winout.WindowOutput.__init__, (self,)+args)
  		self.hStopThread = win32event.CreateEvent(None, 0, 0, None)
  		thread.start_new(CollectorThread, (self.hStopThread, self))
--- 29,33 ----
  class WindowOutput(winout.WindowOutput):
  	def __init__(self, *args):
! 		winout.WindowOutput.__init__(*(self,)+args)
  		self.hStopThread = win32event.CreateEvent(None, 0, 0, None)
  		thread.start_new(CollectorThread, (self.hStopThread, self))

[pywin32-checkins] pywin32/com/win32com/server connect.py,1.3,1.4

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

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

Modified Files:
	connect.py 
Log Message:
modernize syntax: remove use of apply() from most of the tree

Index: connect.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/server/connect.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** connect.py	27 Nov 2008 03:53:25 -0000	1.3
--- connect.py	27 Nov 2008 05:58:17 -0000	1.4
***************
*** 56,60 ****
  		for interface in self.connections.values():
  			try:
! 				apply(broadcaster, (interface,)+extraArgs)
  			except pythoncom.com_error, details:
  				self._OnNotifyFail(interface, details)
--- 56,60 ----
  		for interface in self.connections.values():
  			try:
! 				broadcaster(*(interface,)+extraArgs)
  			except pythoncom.com_error, details:
  				self._OnNotifyFail(interface, details)

[pywin32-checkins] pywin32/com/win32com/test GenTestScripts.py, 1.3, 1.4 testDynamic.py, 1.4, 1.5 testPyComTest.py, 1.37, 1.38

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

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

Modified Files:
	GenTestScripts.py testDynamic.py testPyComTest.py 
Log Message:
modernize syntax: remove use of apply() from most of the tree

Index: GenTestScripts.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/GenTestScripts.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** GenTestScripts.py	18 Nov 2002 11:20:06 -0000	1.3
--- GenTestScripts.py	27 Nov 2008 05:58:17 -0000	1.4
***************
*** 40,44 ****
      for args in genList:
          try:
!             apply(GenerateFromRegistered, args)
          except KeyboardInterrupt:
              print "** Interrupted ***"
--- 40,44 ----
      for args in genList:
          try:
!             GenerateFromRegistered(*args)
          except KeyboardInterrupt:
              print "** Interrupted ***"

Index: testDynamic.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testDynamic.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** testDynamic.py	26 Nov 2008 08:52:32 -0000	1.4
--- testDynamic.py	27 Nov 2008 05:58:17 -0000	1.5
***************
*** 13,17 ****
      def _dynamic_(self, name, lcid, wFlags, args):
          if wFlags & pythoncom.DISPATCH_METHOD:
!             return apply(getattr(self,name),args)
  
          if wFlags & pythoncom.DISPATCH_PROPERTYGET:
--- 13,17 ----
      def _dynamic_(self, name, lcid, wFlags, args):
          if wFlags & pythoncom.DISPATCH_METHOD:
!             return getattr(self,name)(*args)
  
          if wFlags & pythoncom.DISPATCH_PROPERTYGET:

Index: testPyComTest.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testPyComTest.py,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** testPyComTest.py	27 Nov 2008 04:15:21 -0000	1.37
--- testPyComTest.py	27 Nov 2008 05:58:17 -0000	1.38
***************
*** 47,51 ****
      progress("Testing ", fnName)
      pref = "function " + fnName
!     rc  = apply(fn, args)
      if rc != result:
          raise error("%s failed - result not %r but %r" % (pref, result, rc))
--- 47,51 ----
      progress("Testing ", fnName)
      pref = "function " + fnName
!     rc  = fn(*args)
      if rc != result:
          raise error("%s failed - result not %r but %r" % (pref, result, rc))

[pywin32-checkins] pywin32/com/win32comext/axdebug debugger.py, 1.3, 1.4

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

Update of /cvsroot/pywin32/pywin32/com/win32comext/axdebug
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3958/com/win32comext/axdebug

Modified Files:
	debugger.py 
Log Message:
modernize syntax: remove use of apply() from most of the tree

Index: debugger.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axdebug/debugger.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** debugger.py	21 Jun 2006 12:14:42 -0000	1.3
--- debugger.py	27 Nov 2008 05:58:17 -0000	1.4
***************
*** 41,45 ****
          node = ModuleTreeNode(module)
          built_nodes[module] = node
!         realNode = apply(create_node_fn, (node,)+create_node_args)
          node.realNode = realNode
  
--- 41,45 ----
          node = ModuleTreeNode(module)
          built_nodes[module] = node
!         realNode = create_node_fn(*(node,)+create_node_args)
          node.realNode = realNode
  

[pywin32-checkins] pywin32/com/win32com/demos connect.py,1.4,1.5

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

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

Modified Files:
	connect.py 
Log Message:
Include null char by way of \x00 literal rather than chr/unichr(0)

Index: connect.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/demos/connect.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** connect.py	26 Nov 2008 08:52:32 -0000	1.4
--- connect.py	27 Nov 2008 05:40:39 -0000	1.5
***************
*** 71,76 ****
  	connection.Connect(server, client, IID_IConnectDemoEvents)
  	CheckEvent(server, client, "Hello", verbose)
! 	CheckEvent(server, client, "Here is a null>"+chr(0)+"<", verbose)
! 	CheckEvent(server, client, u"Here is a null>"+unichr(0)+"<", verbose)
  	val = u"test-\xe0\xf2" # 2 extended characters.
  	CheckEvent(server, client, val, verbose)
--- 71,76 ----
  	connection.Connect(server, client, IID_IConnectDemoEvents)
  	CheckEvent(server, client, "Hello", verbose)
! 	CheckEvent(server, client, "Here is a null>\x00<", verbose)
! 	CheckEvent(server, client, u"Here is a null>\x00<", verbose)
  	val = u"test-\xe0\xf2" # 2 extended characters.
  	CheckEvent(server, client, val, verbose)

[pywin32-checkins] pywin32/com/win32com/client build.py,1.33,1.34

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

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

Modified Files:
	build.py 
Log Message:
Check for None before we check for keyword as None is a kw in py3k

Index: build.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/build.py,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** build.py	14 Nov 2008 00:22:25 -0000	1.33
--- build.py	27 Nov 2008 05:39:30 -0000	1.34
***************
*** 526,535 ****
  	if className[:2]=='__':
  		return demunge_leading_underscores(className)
- 	elif iskeyword(className): # all keywords are lower case
- 		return className.capitalize()
  	elif className == 'None':
  		# assign to None is evil (and SyntaxError in 2.4) - note
  		# that if it was a global it would get picked up below
  		className = 'NONE'
  	elif is_global and hasattr(__builtins__, className):
  		# builtins may be mixed case.  If capitalizing it doesn't change it,
--- 526,535 ----
  	if className[:2]=='__':
  		return demunge_leading_underscores(className)
  	elif className == 'None':
  		# assign to None is evil (and SyntaxError in 2.4) - note
  		# that if it was a global it would get picked up below
  		className = 'NONE'
+ 	elif iskeyword(className): # all keywords are lower case
+ 		return className.capitalize()
  	elif is_global and hasattr(__builtins__, className):
  		# builtins may be mixed case.  If capitalizing it doesn't change it,

[pywin32-checkins] pywin32/com/win32com/test GenTestScripts.py, 1.3.4.2, 1.3.4.3 testArrays.py, 1.2.4.2, 1.2.4.3 testDynamic.py, 1.3.4.2, 1.3.4.3 testIterators.py, 1.3, 1.3.4.1 testMSOffice.py, 1.7.4.3, 1.7.4.4 testPyComTest.py, 1.32.2.3, 1.32.2.4 util.py, 1.9.2.4, 1.9.2.5

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

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

Modified Files:
      Tag: py3k
	GenTestScripts.py testArrays.py testDynamic.py 
	testIterators.py testMSOffice.py testPyComTest.py util.py 
Log Message:
py3k branch now mostly passes the com test suite

Index: GenTestScripts.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/GenTestScripts.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
*** GenTestScripts.py	27 Nov 2008 04:58:41 -0000	1.3.4.2
--- GenTestScripts.py	27 Nov 2008 05:36:19 -0000	1.3.4.3
***************
*** 40,44 ****
      for args in genList:
          try:
!             apply(GenerateFromRegistered, args)
          except KeyboardInterrupt:
              print("** Interrupted ***")
--- 40,44 ----
      for args in genList:
          try:
!             GenerateFromRegistered(*args)
          except KeyboardInterrupt:
              print("** Interrupted ***")

Index: testArrays.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testArrays.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
*** testArrays.py	26 Nov 2008 09:03:29 -0000	1.2.4.2
--- testArrays.py	27 Nov 2008 05:36:19 -0000	1.2.4.3
***************
*** 77,81 ****
  
  LargeD = [
!     [ [range(10)] * 10],
  ] * 512
  
--- 77,81 ----
  
  LargeD = [
!     [ [list(range(10))] * 10],
  ] * 512
  

Index: testPyComTest.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testPyComTest.py,v
retrieving revision 1.32.2.3
retrieving revision 1.32.2.4
diff -C2 -d -r1.32.2.3 -r1.32.2.4
*** testPyComTest.py	27 Nov 2008 04:58:41 -0000	1.32.2.3
--- testPyComTest.py	27 Nov 2008 05:36:19 -0000	1.32.2.4
***************
*** 47,51 ****
      progress("Testing ", fnName)
      pref = "function " + fnName
!     rc  = apply(fn, args)
      if rc != result:
          raise error("%s failed - result not %r but %r" % (pref, result, rc))
--- 47,51 ----
      progress("Testing ", fnName)
      pref = "function " + fnName
!     rc  = fn(*args)
      if rc != result:
          raise error("%s failed - result not %r but %r" % (pref, result, rc))
***************
*** 353,357 ****
      progress("Testing counter", repr(counter))
      import random
!     for i in xrange(50):
          num = int(random.random() * len(counter))
          try:
--- 353,357 ----
      progress("Testing counter", repr(counter))
      import random
!     for i in range(50):
          num = int(random.random() * len(counter))
          try:

Index: util.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/util.py,v
retrieving revision 1.9.2.4
retrieving revision 1.9.2.5
diff -C2 -d -r1.9.2.4 -r1.9.2.5
*** util.py	27 Nov 2008 04:58:41 -0000	1.9.2.4
--- util.py	27 Nov 2008 05:36:19 -0000	1.9.2.5
***************
*** 33,37 ****
  def RegisterPythonServer(filename, progids=None, verbose=0):
      if progids:
!         if isinstance(progids, basestring):
              progids = [progids]
          # we know the CLSIDs we need, but we might not be an admin user
--- 33,37 ----
  def RegisterPythonServer(filename, progids=None, verbose=0):
      if progids:
!         if isinstance(progids, str):
              progids = [progids]
          # we know the CLSIDs we need, but we might not be an admin user

Index: testMSOffice.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testMSOffice.py,v
retrieving revision 1.7.4.3
retrieving revision 1.7.4.4
diff -C2 -d -r1.7.4.3 -r1.7.4.4
*** testMSOffice.py	27 Nov 2008 04:58:41 -0000	1.7.4.3
--- testMSOffice.py	27 Nov 2008 05:36:19 -0000	1.7.4.4
***************
*** 51,55 ****
      if not word.AppShow(): word._proc_("AppShow")
  
!     for i in xrange(12):
          word.FormatFont(Color=i+1, Points=i+12)
          word.Insert("Hello from Python %d\n" % i)
--- 51,55 ----
      if not word.AppShow(): word._proc_("AppShow")
  
!     for i in range(12):
          word.FormatFont(Color=i+1, Points=i+12)
          word.Insert("Hello from Python %d\n" % i)
***************
*** 101,105 ****
      xl.Range("A3:C3").Value = ('3','2','1')
  
!     for i in xrange(20):
          xl.Cells(i+1,i+1).Value = "Hi %d" % i
  
--- 101,105 ----
      xl.Range("A3:C3").Value = ('3','2','1')
  
!     for i in range(20):
          xl.Cells(i+1,i+1).Value = "Hi %d" % i
  

Index: testDynamic.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testDynamic.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
*** testDynamic.py	27 Nov 2008 04:58:41 -0000	1.3.4.2
--- testDynamic.py	27 Nov 2008 05:36:19 -0000	1.3.4.3
***************
*** 13,17 ****
      def _dynamic_(self, name, lcid, wFlags, args):
          if wFlags & pythoncom.DISPATCH_METHOD:
!             return apply(getattr(self,name),args)
  
          if wFlags & pythoncom.DISPATCH_PROPERTYGET:
--- 13,17 ----
      def _dynamic_(self, name, lcid, wFlags, args):
          if wFlags & pythoncom.DISPATCH_METHOD:
!             return getattr(self,name)(*args)
  
          if wFlags & pythoncom.DISPATCH_PROPERTYGET:

Index: testIterators.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testIterators.py,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -C2 -d -r1.3 -r1.3.4.1
*** testIterators.py	10 Nov 2003 00:49:29 -0000	1.3
--- testIterators.py	27 Nov 2008 05:36:19 -0000	1.3.4.1
***************
*** 14,18 ****
  def yield_iter(iter):
      while 1:
!         yield iter.next()
  
  class _BaseTestCase(win32com.test.util.TestCase):
--- 14,18 ----
  def yield_iter(iter):
      while 1:
!         yield next(iter)
  
  class _BaseTestCase(win32com.test.util.TestCase):
***************
*** 66,70 ****
          # fetch it
          try:
!             iter(ob).next()
              self.fail("Expected a TypeError fetching this iterator")
          except TypeError:
--- 66,70 ----
          # fetch it
          try:
!             next(iter(ob))
              self.fail("Expected a TypeError fetching this iterator")
          except TypeError:

[pywin32-checkins] pywin32/com/win32com/client gencache.py, 1.32.2.2, 1.32.2.3 genpy.py, 1.55.2.4, 1.55.2.5

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

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

Modified Files:
      Tag: py3k
	gencache.py genpy.py 
Log Message:
py3k branch now mostly passes the com test suite

Index: genpy.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/genpy.py,v
retrieving revision 1.55.2.4
retrieving revision 1.55.2.5
diff -C2 -d -r1.55.2.4 -r1.55.2.5
*** genpy.py	27 Nov 2008 04:58:41 -0000	1.55.2.4
--- genpy.py	27 Nov 2008 05:36:19 -0000	1.55.2.5
***************
*** 134,138 ****
  # (no longer necessary for new style code, but still used for old code.
  def WriteAliasesForItem(item, aliasItems, stream):
!   for alias in aliasItems.itervalues():
      if item.doc and alias.aliasDoc and (alias.aliasDoc[0]==item.doc[0]):
        alias.WriteAliasItem(aliasItems, stream)
--- 134,138 ----
  # (no longer necessary for new style code, but still used for old code.
  def WriteAliasesForItem(item, aliasItems, stream):
!   for alias in aliasItems.values():
      if item.doc and alias.aliasDoc and (alias.aliasDoc[0]==item.doc[0]):
        alias.WriteAliasItem(aliasItems, stream)
***************
*** 656,660 ****
    def CollectOleItemInfosFromType(self):
      ret = []
!     for i in xrange(self.typelib.GetTypeInfoCount()):
        info = self.typelib.GetTypeInfo(i)
        infotype = self.typelib.GetTypeInfoType(i)
--- 656,660 ----
    def CollectOleItemInfosFromType(self):
      ret = []
!     for i in range(self.typelib.GetTypeInfoCount()):
        info = self.typelib.GetTypeInfo(i)
        infotype = self.typelib.GetTypeInfoType(i)
***************
*** 881,885 ****
  
      if self.generate_type == GEN_FULL:
!       values = [v for v in oleItems.itervalues() if v is not None]
        values.sort()
        for oleitem in values:
--- 881,885 ----
  
      if self.generate_type == GEN_FULL:
!       values = [v for v in oleItems.values() if v is not None]
        values.sort()
        for oleitem in values:
***************
*** 896,900 ****
  
      print('RecordMap = {', file=stream)
!     for record in recordItems.itervalues():
          if str(record.clsid) == pythoncom.IID_NULL:
              print("\t###%s: %s, # Typedef disabled because it doesn't have a non-null GUID" % (repr(record.doc[0]), repr(str(record.clsid))), file=stream)
--- 896,900 ----
  
      print('RecordMap = {', file=stream)
!     for record in recordItems.values():
          if str(record.clsid) == pythoncom.IID_NULL:
              print("\t###%s: %s, # Typedef disabled because it doesn't have a non-null GUID" % (repr(record.doc[0]), repr(str(record.clsid))), file=stream)
***************
*** 907,911 ****
      if self.generate_type == GEN_FULL:
        print('CLSIDToClassMap = {', file=stream)
!       for item in oleItems.itervalues():
            if item is not None and item.bWritten:
                print("\t'%s' : %s," % (str(item.clsid), item.python_name), file=stream)
--- 907,911 ----
      if self.generate_type == GEN_FULL:
        print('CLSIDToClassMap = {', file=stream)
!       for item in oleItems.values():
            if item is not None and item.bWritten:
                print("\t'%s' : %s," % (str(item.clsid), item.python_name), file=stream)
***************
*** 915,919 ****
        print("VTablesToPackageMap = {}", file=stream)
        print("VTablesToClassMap = {", file=stream)
!       for item in vtableItems.itervalues():
          print("\t'%s' : '%s'," % (item.clsid,item.python_name), file=stream)
        print('}', file=stream)
--- 915,919 ----
        print("VTablesToPackageMap = {}", file=stream)
        print("VTablesToClassMap = {", file=stream)
!       for item in vtableItems.values():
          print("\t'%s' : '%s'," % (item.clsid,item.python_name), file=stream)
        print('}', file=stream)
***************
*** 923,927 ****
        print('CLSIDToClassMap = {}', file=stream)
        print('CLSIDToPackageMap = {', file=stream)
!       for item in oleItems.itervalues():
          if item is not None:
            print("\t'%s' : %s," % (str(item.clsid), repr(item.python_name)), file=stream)
--- 923,927 ----
        print('CLSIDToClassMap = {}', file=stream)
        print('CLSIDToPackageMap = {', file=stream)
!       for item in oleItems.values():
          if item is not None:
            print("\t'%s' : %s," % (str(item.clsid), repr(item.python_name)), file=stream)
***************
*** 929,933 ****
        print("VTablesToClassMap = {}", file=stream)
        print("VTablesToPackageMap = {", file=stream)
!       for item in vtableItems.itervalues():
          print("\t'%s' : '%s'," % (item.clsid,item.python_name), file=stream)
        print('}', file=stream)
--- 929,933 ----
        print("VTablesToClassMap = {}", file=stream)
        print("VTablesToPackageMap = {", file=stream)
!       for item in vtableItems.values():
          print("\t'%s' : '%s'," % (item.clsid,item.python_name), file=stream)
        print('}', file=stream)
***************
*** 937,948 ****
      # Bit of a hack - build a temp map of iteItems + vtableItems - coClasses
      map = {}
!     for item in oleItems.itervalues():
          if item is not None and not isinstance(item, CoClassItem):
              map[item.python_name] = item.clsid
!     for item in vtableItems.itervalues(): # No nones or CoClasses in this map
          map[item.python_name] = item.clsid
              
      print("NamesToIIDMap = {", file=stream)
!     for name, iid in map.iteritems():
          print("\t'%s' : '%s'," % (name, iid), file=stream)
      print('}', file=stream)
--- 937,948 ----
      # Bit of a hack - build a temp map of iteItems + vtableItems - coClasses
      map = {}
!     for item in oleItems.values():
          if item is not None and not isinstance(item, CoClassItem):
              map[item.python_name] = item.clsid
!     for item in vtableItems.values(): # No nones or CoClasses in this map
          map[item.python_name] = item.clsid
              
      print("NamesToIIDMap = {", file=stream)
!     for name, iid in map.items():
          print("\t'%s' : '%s'," % (name, iid), file=stream)
      print('}', file=stream)
***************
*** 1002,1008 ****
        # Make a map of iid: dispitem, vtableitem)
        items = {}
!       for key, value in oleItems.iteritems():
            items[key] = (value,None)
!       for key, value in vtableItems.iteritems():
            existing = items.get(key, None)
            if existing is not None:
--- 1002,1008 ----
        # Make a map of iid: dispitem, vtableitem)
        items = {}
!       for key, value in oleItems.items():
            items[key] = (value,None)
!       for key, value in vtableItems.items():
            existing = items.get(key, None)
            if existing is not None:
***************
*** 1013,1017 ****
  
        self.progress.SetDescription("Generating...", len(items))
!       for oleitem, vtableitem in items.itervalues():
          an_item = oleitem or vtableitem
          assert not self.file, "already have a file?"
--- 1013,1017 ----
  
        self.progress.SetDescription("Generating...", len(items))
!       for oleitem, vtableitem in items.values():
          an_item = oleitem or vtableitem
          assert not self.file, "already have a file?"

Index: gencache.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/gencache.py,v
retrieving revision 1.32.2.2
retrieving revision 1.32.2.3
diff -C2 -d -r1.32.2.2 -r1.32.2.3
*** gencache.py	26 Nov 2008 07:17:39 -0000	1.32.2.2
--- gencache.py	27 Nov 2008 05:36:19 -0000	1.32.2.3
***************
*** 560,576 ****
  	dict = mod.CLSIDToClassMap
  	info = str(typelibclsid), lcid, major, minor
! 	for clsid, cls in dict.iteritems():
  		clsidToTypelib[clsid] = info
  
  	dict = mod.CLSIDToPackageMap
! 	for clsid, name in dict.iteritems():
  		clsidToTypelib[clsid] = info
  
  	dict = mod.VTablesToClassMap
! 	for clsid, cls in dict.iteritems():
  		clsidToTypelib[clsid] = info
  
  	dict = mod.VTablesToPackageMap
! 	for clsid, cls in dict.iteritems():
  		clsidToTypelib[clsid] = info
  
--- 560,576 ----
  	dict = mod.CLSIDToClassMap
  	info = str(typelibclsid), lcid, major, minor
! 	for clsid, cls in dict.items():
  		clsidToTypelib[clsid] = info
  
  	dict = mod.CLSIDToPackageMap
! 	for clsid, name in dict.items():
  		clsidToTypelib[clsid] = info
  
  	dict = mod.VTablesToClassMap
! 	for clsid, cls in dict.items():
  		clsidToTypelib[clsid] = info
  
  	dict = mod.VTablesToPackageMap
! 	for clsid, cls in dict.items():
  		clsidToTypelib[clsid] = info
  
***************
*** 659,665 ****
  	# Build a unique dir
  	d = {}
! 	for clsid, (typelibCLSID, lcid, major, minor) in clsidToTypelib.iteritems():
  		d[typelibCLSID, lcid, major, minor] = None
! 	for typelibCLSID, lcid, major, minor in d.iterkeys():
  		mod = GetModuleForTypelib(typelibCLSID, lcid, major, minor)
  		print("%s - %s" % (mod.__doc__, typelibCLSID))
--- 659,665 ----
  	# Build a unique dir
  	d = {}
! 	for clsid, (typelibCLSID, lcid, major, minor) in clsidToTypelib.items():
  		d[typelibCLSID, lcid, major, minor] = None
! 	for typelibCLSID, lcid, major, minor in d.keys():
  		mod = GetModuleForTypelib(typelibCLSID, lcid, major, minor)
  		print("%s - %s" % (mod.__doc__, typelibCLSID))

[pywin32-checkins] pywin32/com/win32com/server connect.py, 1.2.4.2, 1.2.4.3 policy.py, 1.23.2.3, 1.23.2.4

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

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

Modified Files:
      Tag: py3k
	connect.py policy.py 
Log Message:
py3k branch now mostly passes the com test suite

Index: connect.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/server/connect.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
*** connect.py	27 Nov 2008 04:58:41 -0000	1.2.4.2
--- connect.py	27 Nov 2008 05:36:19 -0000	1.2.4.3
***************
*** 56,60 ****
  		for interface in self.connections.values():
  			try:
! 				apply(broadcaster, (interface,)+extraArgs)
  			except pythoncom.com_error as details:
  				self._OnNotifyFail(interface, details)
--- 56,60 ----
  		for interface in self.connections.values():
  			try:
! 				broadcaster(*(interface,)+extraArgs)
  			except pythoncom.com_error as details:
  				self._OnNotifyFail(interface, details)

Index: policy.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/server/policy.py,v
retrieving revision 1.23.2.3
retrieving revision 1.23.2.4
diff -C2 -d -r1.23.2.3 -r1.23.2.4
*** policy.py	27 Nov 2008 04:58:41 -0000	1.23.2.3
--- policy.py	27 Nov 2008 05:36:19 -0000	1.23.2.4
***************
*** 356,360 ****
      return self._getnextdispid_(fdex, dispid)
    def _getnextdispid_(self, fdex, dispid):
!     ids = self._name_to_dispid_.values()
      ids.sort()
      if DISPID_STARTENUM in ids: ids.remove(DISPID_STARTENUM)
--- 356,360 ----
      return self._getnextdispid_(fdex, dispid)
    def _getnextdispid_(self, fdex, dispid):
!     ids = list(self._name_to_dispid_.values())
      ids.sort()
      if DISPID_STARTENUM in ids: ids.remove(DISPID_STARTENUM)

[pywin32-checkins] pywin32/com/win32com/demos ietoolbar.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-serv3016/com/win32com/demos

Modified Files:
      Tag: py3k
	ietoolbar.py 
Log Message:
py3k branch now mostly passes the com test suite

Index: ietoolbar.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/demos/ietoolbar.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
*** ietoolbar.py	26 Nov 2008 09:03:29 -0000	1.1.4.2
--- ietoolbar.py	27 Nov 2008 05:36:19 -0000	1.1.4.3
***************
*** 100,104 ****
                  vals.append(val)
              full_fmt += fmt		
!         return apply(struct.pack, (full_fmt,) + tuple(vals) )
  
  class TBBUTTON(WIN32STRUCT):
--- 100,104 ----
                  vals.append(val)
              full_fmt += fmt		
!         return struct.pack(*(full_fmt,) + tuple(vals))
  
  class TBBUTTON(WIN32STRUCT):

[pywin32-checkins] pywin32/com/win32com/client build.py, 1.31.2.4, 1.31.2.5

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

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

Modified Files:
      Tag: py3k
	build.py 
Log Message:
None is a keyword in py3k, so we need to move when we check for it.


Index: build.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/build.py,v
retrieving revision 1.31.2.4
retrieving revision 1.31.2.5
diff -C2 -d -r1.31.2.4 -r1.31.2.5
*** build.py	26 Nov 2008 07:17:39 -0000	1.31.2.4
--- build.py	27 Nov 2008 05:33:25 -0000	1.31.2.5
***************
*** 527,536 ****
  	if className[:2]=='__':
  		return demunge_leading_underscores(className)
- 	elif iskeyword(className): # all keywords are lower case
- 		return className.capitalize()
  	elif className == 'None':
  		# assign to None is evil (and SyntaxError in 2.4) - note
  		# that if it was a global it would get picked up below
  		className = 'NONE'
  	elif is_global and hasattr(builtins, className):
  		# builtins may be mixed case.  If capitalizing it doesn't change it,
--- 527,536 ----
  	if className[:2]=='__':
  		return demunge_leading_underscores(className)
  	elif className == 'None':
  		# assign to None is evil (and SyntaxError in 2.4) - note
  		# that if it was a global it would get picked up below
  		className = 'NONE'
+ 	elif iskeyword(className): # all keywords are lower case
+ 		return className.capitalize()
  	elif is_global and hasattr(builtins, className):
  		# builtins may be mixed case.  If capitalizing it doesn't change it,
***************
*** 578,582 ****
    else:
      firstOptArg = numArgs - numOptArgs
!   for arg in xrange(numArgs):
      try:
        argName = names[arg+1] 
--- 578,582 ----
    else:
      firstOptArg = numArgs - numOptArgs
!   for arg in range(numArgs):
      try:
        argName = names[arg+1] 

[pywin32-checkins] pywin32/com/win32com/server connect.py, 1.2.4.1, 1.2.4.2 dispatcher.py, 1.6.4.1, 1.6.4.2 policy.py, 1.23.2.2, 1.23.2.3 register.py, 1.21.2.1, 1.21.2.2 util.py, 1.6.2.1, 1.6.2.2

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

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

Modified Files:
      Tag: py3k
	connect.py dispatcher.py policy.py register.py util.py 
Log Message:
Almost all files in py3k branch are now in py3k syntax - but work remains

Index: policy.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/server/policy.py,v
retrieving revision 1.23.2.2
retrieving revision 1.23.2.3
diff -C2 -d -r1.23.2.2 -r1.23.2.3
*** policy.py	26 Nov 2008 09:03:29 -0000	1.23.2.2
--- policy.py	27 Nov 2008 04:58:41 -0000	1.23.2.3
***************
*** 88,92 ****
  IUnknownType = pythoncom.TypeIIDs[pythoncom.IID_IUnknown]
  
! from exception import COMException
  error = __name__ + " error"
  
--- 88,92 ----
  IUnknownType = pythoncom.TypeIIDs[pythoncom.IID_IUnknown]
  
! from .exception import COMException
  error = __name__ + " error"
  
***************
*** 410,418 ****
  
    def _getmembername_(self, dispid):
!     if self._dispid_to_func_.has_key(dispid):
        return self._dispid_to_func_[dispid]
!     elif self._dispid_to_get_.has_key(dispid):
        return self._dispid_to_get_[dispid]
!     elif self._dispid_to_put_.has_key(dispid):
        return self._dispid_to_put_[dispid]
      else:
--- 410,418 ----
  
    def _getmembername_(self, dispid):
!     if dispid in self._dispid_to_func_:
        return self._dispid_to_func_[dispid]
!     elif dispid in self._dispid_to_get_:
        return self._dispid_to_get_[dispid]
!     elif dispid in self._dispid_to_put_:
        return self._dispid_to_put_[dispid]
      else:
***************
*** 562,568 ****
        while 1:
          last_dispid = last_dispid + 1
!         if not self._dispid_to_func_.has_key(last_dispid) and \
!            not self._dispid_to_get_.has_key(last_dispid) and \
!            not self._dispid_to_put_.has_key(last_dispid):
                return last_dispid
  
--- 562,568 ----
        while 1:
          last_dispid = last_dispid + 1
!         if last_dispid not in self._dispid_to_func_ and \
!            last_dispid not in self._dispid_to_get_ and \
!            last_dispid not in self._dispid_to_put_:
                return last_dispid
  
***************
*** 746,750 ****
  # still reference them here.  These will end up being removed.
  try:
!   from dispatcher import DispatcherTrace, DispatcherWin32trace
  except ImportError: # Quite likely a frozen executable that doesnt need dispatchers
    pass
--- 746,750 ----
  # still reference them here.  These will end up being removed.
  try:
!   from .dispatcher import DispatcherTrace, DispatcherWin32trace
  except ImportError: # Quite likely a frozen executable that doesnt need dispatchers
    pass

Index: connect.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/server/connect.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
*** connect.py	26 Nov 2008 09:03:29 -0000	1.2.4.1
--- connect.py	27 Nov 2008 04:58:41 -0000	1.2.4.2
***************
*** 4,8 ****
  """
  import pythoncom
! from exception import Exception
  import winerror
  from win32com import olectl
--- 4,8 ----
  """
  import pythoncom
! from .exception import Exception
  import winerror
  from win32com import olectl
***************
*** 61,65 ****
  
  	def _OnNotifyFail(self, interface, details):
! 		print("Ignoring COM error to connection - %s" % (`details`))
  		
  
--- 61,65 ----
  
  	def _OnNotifyFail(self, interface, details):
! 		print("Ignoring COM error to connection - %s" % (repr(details)))
  		
  

Index: util.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/server/util.py,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -d -r1.6.2.1 -r1.6.2.2
*** util.py	26 Nov 2008 09:03:29 -0000	1.6.2.1
--- util.py	27 Nov 2008 04:58:41 -0000	1.6.2.2
***************
*** 2,8 ****
  """
  import pythoncom
! import policy
  import winerror
! from exception import COMException
  
  def wrap(ob, iid=None, usePolicy=None, useDispatcher=None):
--- 2,8 ----
  """
  import pythoncom
! from . import policy
  import winerror
! from .exception import COMException
  
  def wrap(ob, iid=None, usePolicy=None, useDispatcher=None):

Index: register.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/server/register.py,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -C2 -d -r1.21.2.1 -r1.21.2.2
*** register.py	26 Nov 2008 09:03:29 -0000	1.21.2.1
--- register.py	27 Nov 2008 04:58:41 -0000	1.21.2.2
***************
*** 364,369 ****
  
  def RegisterClasses(*classes, **flags):
!   quiet = flags.has_key('quiet') and flags['quiet']
!   debugging = flags.has_key('debug') and flags['debug']
    for cls in classes:
      clsid = cls._reg_clsid_
--- 364,369 ----
  
  def RegisterClasses(*classes, **flags):
!   quiet = 'quiet' in flags and flags['quiet']
!   debugging = 'debug' in flags and flags['debug']
    for cls in classes:
      clsid = cls._reg_clsid_
***************
*** 431,435 ****
  
  def UnregisterClasses(*classes, **flags):
!   quiet = flags.has_key('quiet') and flags['quiet']
    for cls in classes:
      clsid = cls._reg_clsid_
--- 431,435 ----
  
  def UnregisterClasses(*classes, **flags):
!   quiet = 'quiet' in flags and flags['quiet']
    for cls in classes:
      clsid = cls._reg_clsid_

Index: dispatcher.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/server/dispatcher.py,v
retrieving revision 1.6.4.1
retrieving revision 1.6.4.2
diff -C2 -d -r1.6.4.1 -r1.6.4.2
*** dispatcher.py	26 Nov 2008 09:03:29 -0000	1.6.4.1
--- dispatcher.py	27 Nov 2008 04:58:41 -0000	1.6.4.2
***************
*** 127,131 ****
          traceback.print_exc()
      # But still raise it for the framework.
!     reraise()
  
    def _trace_(self, *args):
--- 127,131 ----
          traceback.print_exc()
      # But still raise it for the framework.
!     raise
  
    def _trace_(self, *args):
***************
*** 144,148 ****
      rc = DispatcherBase._QueryInterface_(self, iid)
      if not rc:
!       self._trace_("in %s._QueryInterface_ with unsupported IID %s (%s)" % (`self.policy._obj_`, IIDToInterfaceName(iid),iid))
      return rc
  
--- 144,148 ----
      rc = DispatcherBase._QueryInterface_(self, iid)
      if not rc:
!       self._trace_("in %s._QueryInterface_ with unsupported IID %s (%s)" % (repr(self.policy._obj_), IIDToInterfaceName(iid),iid))
      return rc
  
***************
*** 205,209 ****
        # If we have no logger, setup our output.
        import win32traceutil # Sets up everything.
!     self._trace_("Object with win32trace dispatcher created (object=%s)" % `object`)
  
  
--- 205,209 ----
        # If we have no logger, setup our output.
        import win32traceutil # Sets up everything.
!     self._trace_("Object with win32trace dispatcher created (object=%s)" % repr(object))
  
  
***************
*** 247,251 ****
      debug = 0
      try:
!       raise typ, val
      except Exception: # AARG - What is this Exception???
        # Use some inside knowledge to borrow a Debugger option which dictates if we
--- 247,251 ----
      debug = 0
      try:
!       raise typ(val)
      except Exception: # AARG - What is this Exception???
        # Use some inside knowledge to borrow a Debugger option which dictates if we
***************
*** 262,279 ****
      # But still raise it.
      del tb
!     reraise()
! 
! def reraise():
!   """Handy function for re-raising errors.
! 
!   Note: storing a traceback in a local variable can introduce reference
!   loops if you aren't careful.  Specifically, that local variable should
!   not be within an execution context contained with the traceback.
! 
!   By using a utility function, we ensure that our local variable holding
!   the traceback is not referenced by the traceback itself.
!   """
!   t, v, tb = exc_info()
!   raise t, v, tb
  
  try:
--- 262,266 ----
      # But still raise it.
      del tb
!     raise
  
  try:

[pywin32-checkins] pywin32/com/win32comext/axscript/client error.py, 1.9.2.2, 1.9.2.3 framework.py, 1.25.2.1, 1.25.2.2

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

Update of /cvsroot/pywin32/pywin32/com/win32comext/axscript/client
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1302/com/win32comext/axscript/client

Modified Files:
      Tag: py3k
	error.py framework.py 
Log Message:
Almost all files in py3k branch are now in py3k syntax - but work remains

Index: error.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axscript/client/error.py,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -C2 -d -r1.9.2.2 -r1.9.2.3
*** error.py	26 Nov 2008 09:03:29 -0000	1.9.2.2
--- error.py	27 Nov 2008 04:58:41 -0000	1.9.2.3
***************
*** 231,236 ****
  	except pythoncom.com_error as details:
  		print("**OnScriptError failed:", details)
! 		print("Exception description:'%s'" % (`exceptionInstance.description`))
! 		print("Exception text:'%s'" % (`exceptionInstance.linetext`))
  		result = winerror.S_FALSE
  
--- 231,236 ----
  	except pythoncom.com_error as details:
  		print("**OnScriptError failed:", details)
! 		print("Exception description:'%s'" % (repr(exceptionInstance.description)))
! 		print("Exception text:'%s'" % (repr(exceptionInstance.linetext)))
  		result = winerror.S_FALSE
  

Index: framework.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axscript/client/framework.py,v
retrieving revision 1.25.2.1
retrieving revision 1.25.2.2
diff -C2 -d -r1.25.2.1 -r1.25.2.2
*** framework.py	26 Nov 2008 09:03:29 -0000	1.25.2.1
--- framework.py	27 Nov 2008 04:58:41 -0000	1.25.2.2
***************
*** 890,896 ****
  				return self.debugManager.adb.run(codeObject, globals, locals)
  			else:
! 				exec codeObject in globals, locals
  		else:
! 			exec codeObject in globals, locals
  
  	def ExecInScriptedSection(self, codeBlock, globals, locals = None):
--- 890,896 ----
  				return self.debugManager.adb.run(codeObject, globals, locals)
  			else:
! 				exec(codeObject, globals, locals)
  		else:
! 			exec(codeObject, globals, locals)
  
  	def ExecInScriptedSection(self, codeBlock, globals, locals = None):