pywin32-checkins — CVS checkin notices

[pywin32-checkins] pywin32/Pythonwin/pywin/framework intpyapp.py, 1.12, 1.13 startup.py, 1.5, 1.6

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

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

Modified Files:
	intpyapp.py startup.py 
Log Message:
use py3k-friendly fully-qualified module names and __import__ over exec to boot pythonwin

Index: intpyapp.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/intpyapp.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** intpyapp.py	26 Nov 2008 08:39:32 -0000	1.12
--- intpyapp.py	4 Dec 2008 05:21:13 -0000	1.13
***************
*** 278,287 ****
  
  	def LoadSystemModules(self):
! 		self.DoLoadModules("editor,stdin")
  
  	def LoadUserModules(self, moduleNames = None):
  		# Load the users modules.
  		if moduleNames is None:
! 			default = "sgrepmdi,mdi_pychecker"
  			moduleNames=win32ui.GetProfileVal('Python','Startup Modules',default)
  		self.DoLoadModules(moduleNames)
--- 278,287 ----
  
  	def LoadSystemModules(self):
! 		self.DoLoadModules("pywin.framework.editor,pywin.framework.stdin")
  
  	def LoadUserModules(self, moduleNames = None):
  		# Load the users modules.
  		if moduleNames is None:
! 			default = "pywin.framework.sgrepmdi,pywin.framework.mdi_pychecker"
  			moduleNames=win32ui.GetProfileVal('Python','Startup Modules',default)
  		self.DoLoadModules(moduleNames)
***************
*** 292,296 ****
  		for module in modules:
  			try:
! 				exec "import "+module
  			except: # Catch em all, else the app itself dies! 'ImportError:
  				traceback.print_exc()
--- 292,296 ----
  		for module in modules:
  			try:
! 				__import__(module)
  			except: # Catch em all, else the app itself dies! 'ImportError:
  				traceback.print_exc()

Index: startup.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/startup.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** startup.py	14 Nov 2008 00:22:25 -0000	1.5
--- startup.py	4 Dec 2008 05:21:13 -0000	1.6
***************
*** 34,38 ****
  # scripts when running under a GUI environment.
  
! moduleName = "intpyapp"
  sys.appargvoffset = 0
  sys.appargv = sys.argv[:]
--- 34,38 ----
  # scripts when running under a GUI environment.
  
! moduleName = "pywin.framework.intpyapp"
  sys.appargvoffset = 0
  sys.appargv = sys.argv[:]
***************
*** 45,50 ****
  #	newargv.insert(0, sys.argv[0])
  	sys.argv = newargv
! 	
! exec "import %s\n" % moduleName
  
  try:
--- 45,51 ----
  #	newargv.insert(0, sys.argv[0])
  	sys.argv = newargv
! 
! # Import the application module.
! __import__(moduleName)
  
  try:

[pywin32-checkins] pywin32/win32/Demos/dde ddeserver.py, 1.1.4.1, 1.1.4.2

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

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

Modified Files:
      Tag: py3k
	ddeserver.py 
Log Message:
merge recent UnicodeType, string module and NeedUnicodeConversions changes from trunk

Index: ddeserver.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Demos/dde/ddeserver.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
*** ddeserver.py	29 Aug 2008 04:59:24 -0000	1.1.4.1
--- ddeserver.py	4 Dec 2008 05:08:41 -0000	1.1.4.2
***************
*** 1,6 ****
  # 'Request' example added jjk  11/20/98
  
- import site ## still not fixed in 3.0b3
- 
  import win32ui
  from pywin.mfc import object
--- 1,4 ----

[pywin32-checkins] pywin32/com/win32comext/axscript/server axsite.py, 1.2, 1.2.4.1

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

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

Modified Files:
      Tag: py3k
	axsite.py 
Log Message:
merge recent UnicodeType, string module and NeedUnicodeConversions changes from trunk

Index: axsite.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axscript/server/axsite.py,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -d -r1.2 -r1.2.4.1
*** axsite.py	1 Jun 2002 02:37:43 -0000	1.2
--- axsite.py	4 Dec 2008 05:08:41 -0000	1.2.4.1
***************
*** 1,3 ****
- import string
  import win32com.axscript.axscript
  import winerror
--- 1,2 ----
***************
*** 44,48 ****
    def SetScriptState(self, state):
      self.eScript.SetScriptState(state)
! 		
  IActiveScriptSite_methods = [
    'GetLCID',
--- 43,47 ----
    def SetScriptState(self, state):
      self.eScript.SetScriptState(state)
! 
  IActiveScriptSite_methods = [
    'GetLCID',
***************
*** 64,68 ****
    def __init__(self, objModel={}, engine = None, lcid=0):
      self.lcid = lcid
- 
      self.objModel = { }
      for name, object in objModel.items():
--- 63,66 ----
***************
*** 73,77 ****
      if engine:
        self._AddEngine(engine)
!     
    def AddEngine(self, engine):
      """Adds a new engine to the site.
--- 71,75 ----
      if engine:
        self._AddEngine(engine)
! 
    def AddEngine(self, engine):
      """Adds a new engine to the site.
***************
*** 100,105 ****
  
    def GetItemInfo(self, name, returnMask):
! #    name = string.lower(name)
!     if not self.objModel.has_key(name):
        raise exception.Exception(scode=winerror.TYPE_E_ELEMENTNOTFOUND, desc='item not found')
  
--- 98,102 ----
  
    def GetItemInfo(self, name, returnMask):
!     if name not in self.objModel:
        raise exception.Exception(scode=winerror.TYPE_E_ELEMENTNOTFOUND, desc='item not found')
  

[pywin32-checkins] pywin32/com/win32comext/adsi __init__.py, 1.2.4.1, 1.2.4.2

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

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

Modified Files:
      Tag: py3k
	__init__.py 
Log Message:
merge recent UnicodeType, string module and NeedUnicodeConversions changes from trunk

Index: __init__.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/adsi/__init__.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
*** __init__.py	26 Nov 2008 09:03:29 -0000	1.2.4.1
--- __init__.py	4 Dec 2008 05:08:41 -0000	1.2.4.2
***************
*** 67,75 ****
  
  class ADSIDispatch(win32com.client.CDispatch):
! 	def _wrap_dispatch_(self, ob, userName = None, returnCLSID = None, UnicodeToString = win32com.client.NeedUnicodeConversions):
  		if not userName:
  			userName = "ADSI-object"
  		olerepr = win32com.client.dynamic.MakeOleRepr(ob, None, None)
! 		return ADSIDispatch(ob, olerepr, userName, UnicodeToString = UnicodeToString)
  
  	def _NewEnum(self):
--- 67,76 ----
  
  class ADSIDispatch(win32com.client.CDispatch):
! 	def _wrap_dispatch_(self, ob, userName = None, returnCLSID = None, UnicodeToString=None):
! 		assert UnicodeToString is None, "this is deprectated and will be removed"
  		if not userName:
  			userName = "ADSI-object"
  		olerepr = win32com.client.dynamic.MakeOleRepr(ob, None, None)
! 		return ADSIDispatch(ob, olerepr, userName)
  
  	def _NewEnum(self):

[pywin32-checkins] pywin32/win32/scripts rasutil.py, 1.2.4.2, 1.2.4.3 regsetup.py, 1.15.2.2, 1.15.2.3

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

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

Modified Files:
      Tag: py3k
	rasutil.py regsetup.py 
Log Message:
merge recent UnicodeType, string module and NeedUnicodeConversions changes from trunk

Index: regsetup.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/scripts/regsetup.py,v
retrieving revision 1.15.2.2
retrieving revision 1.15.2.3
diff -C2 -d -r1.15.2.2 -r1.15.2.3
*** regsetup.py	27 Nov 2008 04:58:42 -0000	1.15.2.2
--- regsetup.py	4 Dec 2008 05:08:41 -0000	1.15.2.3
***************
*** 90,94 ****
      regPath = regutil.GetRegisteredNamedPath(appName)
      if regPath:
!         pathLook = string.split(regPath,";")[0]
      if regPath and FileExists(os.path.join(pathLook, knownFileName)):
          return None # The currently registered one is good.
--- 90,94 ----
      regPath = regutil.GetRegisteredNamedPath(appName)
      if regPath:
!         pathLook = regPath.split(";")[0]
      if regPath and FileExists(os.path.join(pathLook, knownFileName)):
          return None # The currently registered one is good.
***************
*** 130,134 ****
      import regutil, string
      try:
!         string.index(fname, " ") # Other chars forcing quote?
          return '"%s"' % fname
      except ValueError:
--- 130,134 ----
      import regutil, string
      try:
!         fname.index(" ") # Other chars forcing quote?
          return '"%s"' % fname
      except ValueError:
***************
*** 145,149 ****
      """
      import regutil, string, os
!     fileNames = string.split(fileNamesString,";")
      for path in searchPaths:
          for fileName in fileNames:
--- 145,149 ----
      """
      import regutil, string, os
!     fileNames = fileNamesString.split(";")
      for path in searchPaths:
          for fileName in fileNames:
***************
*** 201,208 ****
       the Python path.
      """
!     import string, os, regutil
      currentPath = regutil.GetRegisteredNamedPath(None)
      if currentPath:
!         presearchPaths = string.split(currentPath, ";")
      else:
          presearchPaths = [os.path.abspath(".")]
--- 201,208 ----
       the Python path.
      """
!     import os, regutil
      currentPath = regutil.GetRegisteredNamedPath(None)
      if currentPath:
!         presearchPaths = currentPath.split(";")
      else:
          presearchPaths = [os.path.abspath(".")]
***************
*** 243,247 ****
      import regutil, string
      if not packageName: raise error("A package name must be supplied")
!     corePaths = string.split(regutil.GetRegisteredNamedPath(None),";")
      if not searchPaths: searchPaths = corePaths
      registryAppName = registryAppName or packageName
--- 243,247 ----
      import regutil, string
      if not packageName: raise error("A package name must be supplied")
!     corePaths = regutil.GetRegisteredNamedPath(None).split(";")
      if not searchPaths: searchPaths = corePaths
      registryAppName = registryAppName or packageName
***************
*** 279,283 ****
          return
  
!     regutil.RegisterNamedPath(appName, string.join(paths,";"))
  
  def FindRegisterPythonExe(exeAlias, searchPaths, actualFileNames = None):
--- 279,283 ----
          return
  
!     regutil.RegisterNamedPath(appName, ";".join(paths))
  
  def FindRegisterPythonExe(exeAlias, searchPaths, actualFileNames = None):
***************
*** 317,321 ****
          sys.path.append(path)
  
!     import string, os
      import regutil, win32api,win32con
  
--- 317,321 ----
          sys.path.append(path)
  
!     import os
      import regutil, win32api,win32con
  
***************
*** 323,327 ****
      # Register the core Pythonpath.
      print(corePaths)
!     regutil.RegisterNamedPath(None, string.join(corePaths,";"))
  
      # Register the install path.
--- 323,327 ----
      # Register the core Pythonpath.
      print(corePaths)
!     regutil.RegisterNamedPath(None, ';'.join(corePaths))
  
      # Register the install path.
***************
*** 493,497 ****
              if o=='-a':
                  import regutil
!                 path = string.join(searchPaths,";")
                  print("Registering application", a,"to path",path)
                  regutil.RegisterNamedPath(a,path)
--- 493,497 ----
              if o=='-a':
                  import regutil
!                 path = ";".join(searchPaths)
                  print("Registering application", a,"to path",path)
                  regutil.RegisterNamedPath(a,path)
***************
*** 500,504 ****
                      raise error("-c option must provide at least one additional path")
                  import win32api, regutil
!                 currentPaths = string.split(regutil.GetRegisteredNamedPath(None),";")
                  oldLen = len(currentPaths)
                  for newPath in searchPaths:
--- 500,504 ----
                      raise error("-c option must provide at least one additional path")
                  import win32api, regutil
!                 currentPaths = regutil.GetRegisteredNamedPath(None).split(";")
                  oldLen = len(currentPaths)
                  for newPath in searchPaths:
***************
*** 507,511 ****
                  if len(currentPaths)!=oldLen:
                      print("Registering %d new core paths" % (len(currentPaths)-oldLen))
!                     regutil.RegisterNamedPath(None,string.join(currentPaths,";"))
                  else:
                      print("All specified paths are already registered.")
--- 507,511 ----
                  if len(currentPaths)!=oldLen:
                      print("Registering %d new core paths" % (len(currentPaths)-oldLen))
!                     regutil.RegisterNamedPath(None,";".join(currentPaths))
                  else:
                      print("All specified paths are already registered.")

Index: rasutil.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/scripts/rasutil.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
*** rasutil.py	27 Nov 2008 04:58:42 -0000	1.2.4.2
--- rasutil.py	4 Dec 2008 05:08:41 -0000	1.2.4.3
***************
*** 1,5 ****
  # A demo of using the RAS API from Python
  import sys
- import string
  import win32ras
  
--- 1,4 ----
***************
*** 19,23 ****
  	assert numRetries > 0
  	for info in win32ras.EnumConnections():
! 		if string.lower(info[1])==string.lower(rasEntryName):
  			print("Already connected to", rasEntryName)
  			return 0, info[0]
--- 18,22 ----
  	assert numRetries > 0
  	for info in win32ras.EnumConnections():
! 		if info[1].lower()==rasEntryName.lower():
  			print("Already connected to", rasEntryName)
  			return 0, info[0]
***************
*** 47,51 ****
  	if type(handle)==type(''): # have they passed a connection name?
  		for info in win32ras.EnumConnections():
! 			if string.lower(info[1])==string.lower(handle):
  				handle = info[0]
  				break
--- 46,50 ----
  	if type(handle)==type(''): # have they passed a connection name?
  		for info in win32ras.EnumConnections():
! 			if info[1].lower()==handle.lower():
  				handle = info[0]
  				break

[pywin32-checkins] pywin32/com/win32com/test GenTestScripts.py, 1.3.4.3, 1.3.4.4 testExplorer.py, 1.7.2.2, 1.7.2.3 testGatewayAddresses.py, 1.2.4.4, 1.2.4.5 testPyComTest.py, 1.32.2.5, 1.32.2.6 testmakepy.py, 1.5.4.1, 1.5.4.2 testvb.py, 1.20.4.3, 1.20.4.4

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

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

Modified Files:
      Tag: py3k
	GenTestScripts.py testExplorer.py testGatewayAddresses.py 
	testPyComTest.py testmakepy.py testvb.py 
Log Message:
merge recent UnicodeType, string module and NeedUnicodeConversions changes from trunk

Index: GenTestScripts.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/GenTestScripts.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
*** GenTestScripts.py	27 Nov 2008 05:36:19 -0000	1.3.4.3
--- GenTestScripts.py	4 Dec 2008 05:08:41 -0000	1.3.4.4
***************
*** 27,31 ****
      print(fname, ": generating -", end=' ')
      f = open(os.path.join(genPath, fname + ".py"), "w")
!     win32com.client.makepy.GenerateFromTypeLibSpec(loadArgs, f, bQuiet = 1, bGUIProgress = 1, bUnicodeToString=NeedUnicodeConversions)
      f.close()
      print("compiling -", end=' ')
--- 27,31 ----
      print(fname, ": generating -", end=' ')
      f = open(os.path.join(genPath, fname + ".py"), "w")
!     win32com.client.makepy.GenerateFromTypeLibSpec(loadArgs, f, bQuiet = 1, bGUIProgress = 1)
      f.close()
      print("compiling -", end=' ')

Index: testGatewayAddresses.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testGatewayAddresses.py,v
retrieving revision 1.2.4.4
retrieving revision 1.2.4.5
diff -C2 -d -r1.2.4.4 -r1.2.4.5
*** testGatewayAddresses.py	27 Nov 2008 11:31:05 -0000	1.2.4.4
--- testGatewayAddresses.py	4 Dec 2008 05:08:41 -0000	1.2.4.5
***************
*** 37,41 ****
  from win32com.server.util import wrap
  import pythoncom
- import string
  from .util import CheckClean
  
--- 37,40 ----
***************
*** 44,49 ****
  # Check that the 2 objects both have identical COM pointers.
  def CheckSameCOMObject(ob1, ob2):
!     addr1 = string.split(repr(ob1))[6][:-1]
!     addr2 = string.split(repr(ob2))[6][:-1]
      return addr1==addr2
  
--- 43,48 ----
  # Check that the 2 objects both have identical COM pointers.
  def CheckSameCOMObject(ob1, ob2):
!     addr1 = repr(ob1).split()[6][:-1]
!     addr2 = repr(ob2).split()[6][:-1]
      return addr1==addr2
  

Index: testExplorer.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testExplorer.py,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -C2 -d -r1.7.2.2 -r1.7.2.3
*** testExplorer.py	26 Nov 2008 09:03:29 -0000	1.7.2.2
--- testExplorer.py	4 Dec 2008 05:08:41 -0000	1.7.2.3
***************
*** 1,5 ****
  # testExplorer -
  
- import string
  import sys
  import os
--- 1,4 ----

Index: testPyComTest.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testPyComTest.py,v
retrieving revision 1.32.2.5
retrieving revision 1.32.2.6
diff -C2 -d -r1.32.2.5 -r1.32.2.6
*** testPyComTest.py	27 Nov 2008 11:31:05 -0000	1.32.2.5
--- testPyComTest.py	4 Dec 2008 05:08:41 -0000	1.32.2.6
***************
*** 41,46 ****
  def TestApplyResult(fn, args, result):
      try:
!         import string
!         fnName = string.split(str(fn))[1]
      except:
          fnName = str(fn)
--- 41,45 ----
  def TestApplyResult(fn, args, result):
      try:
!         fnName = str(fn).split()[1]
      except:
          fnName = str(fn)

Index: testvb.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testvb.py,v
retrieving revision 1.20.4.3
retrieving revision 1.20.4.4
diff -C2 -d -r1.20.4.3 -r1.20.4.4
*** testvb.py	27 Nov 2008 11:31:05 -0000	1.20.4.3
--- testvb.py	4 Dec 2008 05:08:41 -0000	1.20.4.4
***************
*** 7,11 ****
  import pythoncom, win32com.client, win32com.client.dynamic, win32com.client.gencache
  from win32com.server.util import NewCollection, wrap
- import string
  from win32com.test import util
  
--- 7,10 ----
***************
*** 242,246 ****
      _DoTestArray(vbtest, (1.0, 2.0, 3.0))
      # Strings.
!     _DoTestArray(vbtest, tuple(string.split("Hello from Python")))
      # Date and Time?
      # COM objects.
--- 241,245 ----
      _DoTestArray(vbtest, (1.0, 2.0, 3.0))
      # Strings.
!     _DoTestArray(vbtest, tuple("Hello from Python".split()))
      # Date and Time?
      # COM objects.
***************
*** 289,293 ****
          # Therefore, Python sees _2_ result values - one for the result,
          # and one for the byref.
!         testData = string.split("Mark was here")
          resultData, byRefParam = vbtest.PassSAFEARRAY(testData)
          if testData != list(resultData):
--- 288,292 ----
          # Therefore, Python sees _2_ result values - one for the result,
          # and one for the byref.
!         testData = "Mark was here".split()
          resultData, byRefParam = vbtest.PassSAFEARRAY(testData)
          if testData != list(resultData):

Index: testmakepy.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testmakepy.py,v
retrieving revision 1.5.4.1
retrieving revision 1.5.4.2
diff -C2 -d -r1.5.4.1 -r1.5.4.2
*** testmakepy.py	26 Nov 2008 09:03:29 -0000	1.5.4.1
--- testmakepy.py	4 Dec 2008 05:08:41 -0000	1.5.4.2
***************
*** 6,10 ****
  import glob
  import os
- import string
  import traceback
  
--- 6,9 ----

[pywin32-checkins] pywin32/com/win32com/client __init__.py, 1.34.4.5, 1.34.4.6 build.py, 1.31.2.5, 1.31.2.6 combrowse.py, 1.8.2.4, 1.8.2.5 dynamic.py, 1.22.2.6, 1.22.2.7 genpy.py, 1.55.2.6, 1.55.2.7 makepy.py, 1.25.2.5, 1.25.2.6 tlbrowse.py, 1.4.4.2, 1.4.4.3

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

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

Modified Files:
      Tag: py3k
	__init__.py build.py combrowse.py dynamic.py genpy.py 
	makepy.py tlbrowse.py 
Log Message:
merge recent UnicodeType, string module and NeedUnicodeConversions changes from trunk

Index: makepy.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/makepy.py,v
retrieving revision 1.25.2.5
retrieving revision 1.25.2.6
diff -C2 -d -r1.25.2.5 -r1.25.2.6
*** makepy.py	27 Nov 2008 11:31:04 -0000	1.25.2.5
--- makepy.py	4 Dec 2008 05:08:41 -0000	1.25.2.6
***************
*** 69,73 ****
  import sys, os, pythoncom
  from win32com.client import genpy, selecttlb, gencache
! from win32com.client import NeedUnicodeConversions, Dispatch
  
  bForDemandDefault = 0 # Default value of bForDemand - toggle this to change the world - see also gencache.py
--- 69,73 ----
  import sys, os, pythoncom
  from win32com.client import genpy, selecttlb, gencache
! from win32com.client import Dispatch
  
  bForDemandDefault = 0 # Default value of bForDemand - toggle this to change the world - see also gencache.py
***************
*** 211,215 ****
  		sys.exit(1)
  
! def GenerateFromTypeLibSpec(typelibInfo, file = None, verboseLevel = None, progressInstance = None, bUnicodeToString=NeedUnicodeConversions, bForDemand = bForDemandDefault, bBuildHidden = 1):
  	if verboseLevel is None:
  		verboseLevel = 0 # By default, we use no gui and no verbose level!
--- 211,216 ----
  		sys.exit(1)
  
! def GenerateFromTypeLibSpec(typelibInfo, file = None, verboseLevel = None, progressInstance = None, bUnicodeToString=None, bForDemand = bForDemandDefault, bBuildHidden = 1):
! 	assert bUnicodeToString is None, "this is deprecated and will go away"
  	if verboseLevel is None:
  		verboseLevel = 0 # By default, we use no gui and no verbose level!
***************
*** 252,256 ****
  
  	for typelib, info in typelibs:
! 		gen = genpy.Generator(typelib, info.dll, progress, bUnicodeToString=bUnicodeToString, bBuildHidden=bBuildHidden)
  
  		if file is None:
--- 253,257 ----
  
  	for typelib, info in typelibs:
! 		gen = genpy.Generator(typelib, info.dll, progress, bBuildHidden=bBuildHidden)
  
  		if file is None:
***************
*** 287,291 ****
  	progress.Close()
  
! def GenerateChildFromTypeLibSpec(child, typelibInfo, verboseLevel = None, progressInstance = None, bUnicodeToString=NeedUnicodeConversions):
  	if verboseLevel is None:
  		verboseLevel = 0 # By default, we use no gui, and no verbose level for the children.
--- 288,293 ----
  	progress.Close()
  
! def GenerateChildFromTypeLibSpec(child, typelibInfo, verboseLevel = None, progressInstance = None, bUnicodeToString=None):
! 	assert bUnicodeToString is None, "this is deprecated and will go away"
  	if verboseLevel is None:
  		verboseLevel = 0 # By default, we use no gui, and no verbose level for the children.
***************
*** 313,317 ****
  		progress.LogBeginGenerate(dir_path_name)
  
! 		gen = genpy.Generator(typelib, info.dll, progress, bUnicodeToString=bUnicodeToString)
  		gen.generate_child(child, dir_path_name)
  		progress.SetDescription("Importing module")
--- 315,319 ----
  		progress.LogBeginGenerate(dir_path_name)
  
! 		gen = genpy.Generator(typelib, info.dll, progress)
  		gen.generate_child(child, dir_path_name)
  		progress.SetDescription("Importing module")
***************
*** 322,326 ****
  	import getopt
  	hiddenSpec = 1
- 	bUnicodeToString = NeedUnicodeConversions
  	outputName = None
  	verboseLevel = 1
--- 324,327 ----
***************
*** 332,337 ****
  			if o=='-h':
  				hiddenSpec = 0
- 			elif o=='-u':
- 				bUnicodeToString = not NeedUnicodeConversions
  			elif o=='-o':
  				outputName = v
--- 333,336 ----

Index: dynamic.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/dynamic.py,v
retrieving revision 1.22.2.6
retrieving revision 1.22.2.7
diff -C2 -d -r1.22.2.6 -r1.22.2.7
*** dynamic.py	27 Nov 2008 11:31:04 -0000	1.22.2.6
--- dynamic.py	4 Dec 2008 05:08:41 -0000	1.22.2.7
***************
*** 27,31 ****
  
  import win32com.client # Needed as code we eval() references it.
- from win32com.client import NeedUnicodeConversions
  
  debugging=0			# General debugging
--- 27,30 ----
***************
*** 106,110 ****
  	return entry.desc[4]
  
! def Dispatch(IDispatch, userName = None, createClass = None, typeinfo = None, UnicodeToString=NeedUnicodeConversions, clsctx = pythoncom.CLSCTX_SERVER):
  	IDispatch, userName = _GetGoodDispatchAndUserName(IDispatch,userName,clsctx)
  	if createClass is None:
--- 105,110 ----
  	return entry.desc[4]
  
! def Dispatch(IDispatch, userName = None, createClass = None, typeinfo = None, UnicodeToString=None, clsctx = pythoncom.CLSCTX_SERVER):
! 	assert UnicodeToString is None, "this is deprecated and will go away"
  	IDispatch, userName = _GetGoodDispatchAndUserName(IDispatch,userName,clsctx)
  	if createClass is None:
***************
*** 123,127 ****
  		typeinfo = None
  	olerepr = MakeOleRepr(IDispatch, typeinfo, lazydata)
! 	return createClass(IDispatch, olerepr, userName,UnicodeToString, lazydata)
  
  def MakeOleRepr(IDispatch, typeinfo, typecomp):
--- 123,127 ----
  		typeinfo = None
  	olerepr = MakeOleRepr(IDispatch, typeinfo, lazydata)
! 	return createClass(IDispatch, olerepr, userName, lazydata=lazydata)
  
  def MakeOleRepr(IDispatch, typeinfo, typecomp):
***************
*** 147,159 ****
  	return olerepr
  
! def DumbDispatch(IDispatch, userName = None, createClass = None,UnicodeToString=NeedUnicodeConversions, clsctx=pythoncom.CLSCTX_SERVER):
  	"Dispatch with no type info"
  	IDispatch, userName = _GetGoodDispatchAndUserName(IDispatch,userName,clsctx)
  	if createClass is None:
  		createClass = CDispatch
! 	return createClass(IDispatch, build.DispatchItem(), userName,UnicodeToString)
  
  class CDispatch:
! 	def __init__(self, IDispatch, olerepr, userName =  None, UnicodeToString=NeedUnicodeConversions, lazydata = None):
  		if userName is None: userName = "<unknown>"
  		self.__dict__['_oleobj_'] = IDispatch
--- 147,161 ----
  	return olerepr
  
! def DumbDispatch(IDispatch, userName = None, createClass = None,UnicodeToString=None, clsctx=pythoncom.CLSCTX_SERVER):
  	"Dispatch with no type info"
+ 	assert UnicodeToString is None, "this is deprecated and will go away"
  	IDispatch, userName = _GetGoodDispatchAndUserName(IDispatch,userName,clsctx)
  	if createClass is None:
  		createClass = CDispatch
! 	return createClass(IDispatch, build.DispatchItem(), userName)
  
  class CDispatch:
! 	def __init__(self, IDispatch, olerepr, userName=None, UnicodeToString=None, lazydata=None):
! 		assert UnicodeToString is None, "this is deprecated and will go away"
  		if userName is None: userName = "<unknown>"
  		self.__dict__['_oleobj_'] = IDispatch
***************
*** 163,167 ****
  		self.__dict__['_builtMethods_'] = {}
  		self.__dict__['_enum_'] = None
! 		self.__dict__['_unicode_to_string_'] = UnicodeToString
  		self.__dict__['_lazydata_'] = lazydata
  
--- 165,169 ----
  		self.__dict__['_builtMethods_'] = {}
  		self.__dict__['_enum_'] = None
! 		self.__dict__['_unicode_to_string_'] = None
  		self.__dict__['_lazydata_'] = lazydata
  
***************
*** 263,269 ****
  		return self._get_good_object_(result, user, resultCLSID)
  
! 	def _wrap_dispatch_(self, ob, userName = None, returnCLSID = None, UnicodeToString = NeedUnicodeConversions):
  		# Given a dispatch object, wrap it in a class
! 		return Dispatch(ob, userName, UnicodeToString=UnicodeToString)
  
  	def _get_good_single_object_(self,ob,userName = None, ReturnCLSID=None):
--- 265,272 ----
  		return self._get_good_object_(result, user, resultCLSID)
  
! 	def _wrap_dispatch_(self, ob, userName = None, returnCLSID = None, UnicodeToString=None):
  		# Given a dispatch object, wrap it in a class
! 		assert UnicodeToString is None, "this is deprecated and will go away"
! 		return Dispatch(ob, userName)
  
  	def _get_good_single_object_(self,ob,userName = None, ReturnCLSID=None):

Index: combrowse.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/combrowse.py,v
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -C2 -d -r1.8.2.4 -r1.8.2.5
*** combrowse.py	27 Nov 2008 11:31:04 -0000	1.8.2.4
--- combrowse.py	4 Dec 2008 05:08:41 -0000	1.8.2.5
***************
*** 171,175 ****
                  else:
                      try:
!                         lcid = string.atof(subKey)
                          lcidkey = win32api.RegOpenKey(key, subKey)
                          # Enumerate the platforms
--- 171,175 ----
                  else:
                      try:
!                         lcid = int(subKey)
                          lcidkey = win32api.RegOpenKey(key, subKey)
                          # Enumerate the platforms
***************
*** 207,211 ****
                  extraDescs.append("locale=%s"%lcid)
              extraDesc = ""
!             if extraDescs: extraDesc = " (%s)" % string.join(extraDescs, ", ")
              ret.append(HLITypeLib(fname, "Type Library" + extraDesc))
          ret.sort()
--- 207,211 ----
                  extraDescs.append("locale=%s"%lcid)
              extraDesc = ""
!             if extraDescs: extraDesc = " (%s)" % ", ".join(extraDescs)
              ret.append(HLITypeLib(fname, "Type Library" + extraDesc))
          ret.sort()
***************
*** 440,444 ****
                  flagDescs.append(desc)
          if flagDescs:
!             ret.append(browser.MakeHLI(string.join(flagDescs, ", "), "Function Flags"))
          return ret
  
--- 440,444 ----
                  flagDescs.append(desc)
          if flagDescs:
!             ret.append(browser.MakeHLI(", ".join(flagDescs), "Function Flags"))
          return ret
  
***************
*** 499,503 ****
                              break
                          try:
!                             versionFlt = string.atof(versionStr)
                          except ValueError:
                              versionFlt = 0 # ????
--- 499,503 ----
                              break
                          try:
!                             versionFlt = float(versionStr)
                          except ValueError:
                              versionFlt = 0 # ????

Index: __init__.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/__init__.py,v
retrieving revision 1.34.4.5
retrieving revision 1.34.4.6
diff -C2 -d -r1.34.4.5 -r1.34.4.6
*** __init__.py	27 Nov 2008 11:31:04 -0000	1.34.4.5
--- __init__.py	4 Dec 2008 05:08:41 -0000	1.34.4.6
***************
*** 7,13 ****
  # with dynamic.Dispatch behaviour, where dynamic objects are always used.
  
- # This can go away
- NeedUnicodeConversions = False
- 
  import pythoncom
  from . import dynamic
--- 7,10 ----
***************
*** 20,24 ****
  
  def __WrapDispatch(dispatch, userName = None, resultCLSID = None, typeinfo = None, \
!                   UnicodeToString = NeedUnicodeConversions, clsctx = pythoncom.CLSCTX_SERVER,
                    WrapperClass = None):
    """
--- 17,21 ----
  
  def __WrapDispatch(dispatch, userName = None, resultCLSID = None, typeinfo = None, \
!                   UnicodeToString=None, clsctx = pythoncom.CLSCTX_SERVER,
                    WrapperClass = None):
    """
***************
*** 26,29 ****
--- 23,27 ----
      otherwise cope by using CDispatch.
    """
+   assert UnicodeToString is None, "this is deprecated and will go away"
    if resultCLSID is None:
      try:
***************
*** 43,47 ****
    # Return a "dynamic" object - best we can do!
    if WrapperClass is None: WrapperClass = CDispatch
!   return dynamic.Dispatch(dispatch, userName, WrapperClass, typeinfo, UnicodeToString=UnicodeToString,clsctx=clsctx)
  
  
--- 41,45 ----
    # Return a "dynamic" object - best we can do!
    if WrapperClass is None: WrapperClass = CDispatch
!   return dynamic.Dispatch(dispatch, userName, WrapperClass, typeinfo, clsctx=clsctx)
  
  
***************
*** 89,103 ****
    moniker, i, bindCtx = pythoncom.MkParseDisplayName(Pathname)
    dispatch = moniker.BindToObject(bindCtx, None, pythoncom.IID_IDispatch)
!   return __WrapDispatch(dispatch, Pathname, clsctx = clsctx)
    
! def Dispatch(dispatch, userName = None, resultCLSID = None, typeinfo = None, UnicodeToString=NeedUnicodeConversions, clsctx = pythoncom.CLSCTX_SERVER):
    """Creates a Dispatch based COM object.
    """
    dispatch, userName = dynamic._GetGoodDispatchAndUserName(dispatch,userName,clsctx)
!   return __WrapDispatch(dispatch, userName, resultCLSID, typeinfo, UnicodeToString, clsctx)
  
! def DispatchEx(clsid, machine=None, userName = None, resultCLSID = None, typeinfo = None, UnicodeToString=NeedUnicodeConversions, clsctx = None):
    """Creates a Dispatch based COM object on a specific machine.
    """
    # If InProc is registered, DCOM will use it regardless of the machine name 
    # (and regardless of the DCOM config for the object.)  So unless the user
--- 87,103 ----
    moniker, i, bindCtx = pythoncom.MkParseDisplayName(Pathname)
    dispatch = moniker.BindToObject(bindCtx, None, pythoncom.IID_IDispatch)
!   return __WrapDispatch(dispatch, Pathname, clsctx=clsctx)
    
! def Dispatch(dispatch, userName = None, resultCLSID = None, typeinfo = None, UnicodeToString=None, clsctx = pythoncom.CLSCTX_SERVER):
    """Creates a Dispatch based COM object.
    """
+   assert UnicodeToString is None, "this is deprecated and will go away"
    dispatch, userName = dynamic._GetGoodDispatchAndUserName(dispatch,userName,clsctx)
!   return __WrapDispatch(dispatch, userName, resultCLSID, typeinfo, clsctx=clsctx)
  
! def DispatchEx(clsid, machine=None, userName = None, resultCLSID = None, typeinfo = None, UnicodeToString=None, clsctx = None):
    """Creates a Dispatch based COM object on a specific machine.
    """
+   assert UnicodeToString is None, "this is deprecated and will go away"
    # If InProc is registered, DCOM will use it regardless of the machine name 
    # (and regardless of the DCOM config for the object.)  So unless the user
***************
*** 112,116 ****
    if userName is None: userName = clsid
    dispatch = pythoncom.CoCreateInstanceEx(clsid, None, clsctx, serverInfo, (pythoncom.IID_IDispatch,))[0]
!   return Dispatch(dispatch, userName, resultCLSID, typeinfo, UnicodeToString=UnicodeToString, clsctx=clsctx)
  
  class CDispatch(dynamic.CDispatch):
--- 112,116 ----
    if userName is None: userName = clsid
    dispatch = pythoncom.CoCreateInstanceEx(clsid, None, clsctx, serverInfo, (pythoncom.IID_IDispatch,))[0]
!   return Dispatch(dispatch, userName, resultCLSID, typeinfo, clsctx=clsctx)
  
  class CDispatch(dynamic.CDispatch):
***************
*** 121,126 ****
      if/when possible.
    """
!   def _wrap_dispatch_(self, ob, userName = None, returnCLSID = None, UnicodeToString = NeedUnicodeConversions):
!     return Dispatch(ob, userName, returnCLSID,None,UnicodeToString)
  
  def CastTo(ob, target):
--- 121,127 ----
      if/when possible.
    """
!   def _wrap_dispatch_(self, ob, userName = None, returnCLSID = None, UnicodeToString=None):
!     assert UnicodeToString is None, "this is deprecated and will go away"
!     return Dispatch(ob, userName, returnCLSID,None)
  
  def CastTo(ob, target):
***************
*** 473,477 ****
  def _get_good_single_object_(obj, obUserName=None, resultCLSID=None):
  	if _PyIDispatchType==type(obj):
! 		return Dispatch(obj, obUserName, resultCLSID, UnicodeToString=NeedUnicodeConversions)
  	return obj
  
--- 474,478 ----
  def _get_good_single_object_(obj, obUserName=None, resultCLSID=None):
  	if _PyIDispatchType==type(obj):
! 		return Dispatch(obj, obUserName, resultCLSID)
  	return obj
  

Index: build.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/build.py,v
retrieving revision 1.31.2.5
retrieving revision 1.31.2.6
diff -C2 -d -r1.31.2.5 -r1.31.2.6
*** build.py	27 Nov 2008 05:33:25 -0000	1.31.2.5
--- build.py	4 Dec 2008 05:08:41 -0000	1.31.2.6
***************
*** 22,29 ****
  
  from keyword import iskeyword
- from win32com.client import NeedUnicodeConversions
  
  import pythoncom
! from pywintypes import UnicodeType, TimeType
  import winerror
  
--- 22,28 ----
  
  from keyword import iskeyword
  
  import pythoncom
! from pywintypes import TimeType
  import winerror
  
***************
*** 353,365 ****
  					s = s + "%s\t\texcept pythoncom.error:\n" % (linePrefix,)
  					s = s + "%s\t\t\treturn ret\n" % (linePrefix,)
! 				s = s + '%s\t\tret = Dispatch(ret, %s, %s, UnicodeToString=%d)\n' % (linePrefix,repr(name), resclsid, NeedUnicodeConversions) 
  				s = s + '%s\treturn ret' % (linePrefix)
  			elif rd == pythoncom.VT_BSTR:
! 				if NeedUnicodeConversions:
! 					s = "%s\t# Result is a Unicode object - perform automatic string conversion\n" % (linePrefix,)
! 					s = s + '%s\treturn str(self._oleobj_.InvokeTypes(%d, LCID, %s, %s, %s%s))' % (linePrefix, id, fdesc[4], retDesc, repr(argsDesc), _BuildArgList(fdesc, names))
! 				else:
! 					s = "%s\t# Result is a Unicode object - return as-is for this version of Python\n" % (linePrefix,)
! 					s = s + '%s\treturn self._oleobj_.InvokeTypes(%d, LCID, %s, %s, %s%s)' % (linePrefix, id, fdesc[4], retDesc, repr(argsDesc), _BuildArgList(fdesc, names))
  			# else s remains None
  		if s is None:
--- 352,360 ----
  					s = s + "%s\t\texcept pythoncom.error:\n" % (linePrefix,)
  					s = s + "%s\t\t\treturn ret\n" % (linePrefix,)
! 				s = s + '%s\t\tret = Dispatch(ret, %s, %s)\n' % (linePrefix,repr(name), resclsid) 
  				s = s + '%s\treturn ret' % (linePrefix)
  			elif rd == pythoncom.VT_BSTR:
! 				s = "%s\t# Result is a Unicode object\n" % (linePrefix,)
! 				s = s + '%s\treturn self._oleobj_.InvokeTypes(%d, LCID, %s, %s, %s%s)' % (linePrefix, id, fdesc[4], retDesc, repr(argsDesc), _BuildArgList(fdesc, names))
  			# else s remains None
  		if s is None:
***************
*** 558,564 ****
      # hack for Unicode until it repr's better.
      val = defArgVal[2]
!     if type(val) is UnicodeType:
!       return repr(str(val))
!     elif type(val) is TimeType:
        year=val.year; month=val.month; day=val.day; hour=val.hour; minute=val.minute; second=val.second; msec=val.msec
        return "pythoncom.MakeTime((%(year)d, %(month)d, %(day)d, %(hour)d, %(minute)d, %(second)d,0,0,0,%(msec)d))" % locals()
--- 553,557 ----
      # hack for Unicode until it repr's better.
      val = defArgVal[2]
!     if type(val) is TimeType:
        year=val.year; month=val.month; day=val.day; hour=val.hour; minute=val.minute; second=val.second; msec=val.msec
        return "pythoncom.MakeTime((%(year)d, %(month)d, %(day)d, %(hour)d, %(minute)d, %(second)d,0,0,0,%(msec)d))" % locals()

Index: genpy.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/genpy.py,v
retrieving revision 1.55.2.6
retrieving revision 1.55.2.7
diff -C2 -d -r1.55.2.6 -r1.55.2.7
*** genpy.py	27 Nov 2008 11:31:04 -0000	1.55.2.6
--- genpy.py	4 Dec 2008 05:08:41 -0000	1.55.2.7
***************
*** 23,27 ****
  
  error = "makepy.error"
! makepy_version = "0.4.98" # Written to generated file.
  
  GEN_FULL="full"
--- 23,27 ----
  
  error = "makepy.error"
! makepy_version = "0.5.00" # Written to generated file.
  
  GEN_FULL="full"
***************
*** 29,39 ****
  GEN_DEMAND_CHILD = "demand(child)"
  
- try:
-     TrueRepr = repr(True)
-     FalseRepr = repr(False)
- except NameError:
-     TrueRepr = "1"
-     FalseRepr = "0"
- 
  # This map is used purely for the users benefit -it shows the
  # raw, underlying type of Alias/Enums, etc.  The COM implementation
--- 29,32 ----
***************
*** 543,547 ****
              print("\t#This class has a __len__ - this is needed so 'if object:' always returns TRUE.", file=stream)
              print("\tdef __nonzero__(self):", file=stream)
!             print("\t\treturn %s" % (TrueRepr,), file=stream)
  
  class CoClassItem(build.OleItem, WritableItem):
--- 536,540 ----
              print("\t#This class has a __len__ - this is needed so 'if object:' always returns TRUE.", file=stream)
              print("\tdef __nonzero__(self):", file=stream)
!             print("\t\treturn True", file=stream)
  
  class CoClassItem(build.OleItem, WritableItem):
***************
*** 642,646 ****
  
  class Generator:
!   def __init__(self, typelib, sourceFilename, progressObject, bBuildHidden=1, bUnicodeToString=0):
      self.bHaveWrittenDispatchBaseClass = 0
      self.bHaveWrittenCoClassBaseClass = 0
--- 635,640 ----
  
  class Generator:
!   def __init__(self, typelib, sourceFilename, progressObject, bBuildHidden=1, bUnicodeToString=None):
!     assert bUnicodeToString is None, "this is deprecated and will go away"
      self.bHaveWrittenDispatchBaseClass = 0
      self.bHaveWrittenCoClassBaseClass = 0
***************
*** 649,653 ****
      self.sourceFilename = sourceFilename
      self.bBuildHidden = bBuildHidden
-     self.bUnicodeToString = bUnicodeToString
      self.progress = progressObject
      # These 2 are later additions and most of the code still 'print's...
--- 643,646 ----

Index: tlbrowse.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/tlbrowse.py,v
retrieving revision 1.4.4.2
retrieving revision 1.4.4.3
diff -C2 -d -r1.4.4.2 -r1.4.4.3
*** tlbrowse.py	3 Oct 2008 02:30:19 -0000	1.4.4.2
--- tlbrowse.py	4 Dec 2008 05:08:41 -0000	1.4.4.3
***************
*** 2,6 ****
  import win32con
  import win32api
- import string
  import commctrl
  import pythoncom
--- 2,5 ----

[pywin32-checkins] pywin32/com/win32comext/axscript/test leakTest.py, 1.1.4.3, 1.1.4.4 testHost4Dbg.py, 1.1.4.2, 1.1.4.3

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

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

Modified Files:
      Tag: py3k
	leakTest.py testHost4Dbg.py 
Log Message:
merge recent UnicodeType, string module and NeedUnicodeConversions changes from trunk

Index: testHost4Dbg.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axscript/test/testHost4Dbg.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
*** testHost4Dbg.py	27 Nov 2008 11:31:05 -0000	1.1.4.2
--- testHost4Dbg.py	4 Dec 2008 05:08:41 -0000	1.1.4.3
***************
*** 1,3 ****
! import string, os, sys, traceback
  from win32com.axscript import axscript
  from win32com.axscript.server import axsite
--- 1,3 ----
! import os, sys, traceback
  from win32com.axscript import axscript
  from win32com.axscript.server import axsite
***************
*** 24,30 ****
    _public_methods_ = [ 'echo', 'msgbox' ]
    def echo(self, *args):
!     print(string.join(map(str, args)))
    def msgbox(self, *args):
!     msg = string.join(map(str, args))
      win32ui.MessageBox(msg)
  
--- 24,30 ----
    _public_methods_ = [ 'echo', 'msgbox' ]
    def echo(self, *args):
!     print(''.join(map(str, args)))
    def msgbox(self, *args):
!     msg = ''.join(map(str, args))
      win32ui.MessageBox(msg)
  

Index: leakTest.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axscript/test/leakTest.py,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -C2 -d -r1.1.4.3 -r1.1.4.4
*** leakTest.py	27 Nov 2008 11:31:05 -0000	1.1.4.3
--- leakTest.py	4 Dec 2008 05:08:41 -0000	1.1.4.4
***************
*** 1,3 ****
! import string, sys
  from win32com.axscript.server.error import Exception
  from win32com.axscript import axscript
--- 1,3 ----
! import sys
  from win32com.axscript.server.error import Exception
  from win32com.axscript import axscript
***************
*** 19,23 ****
      if st is None: st = ""
      text = st + "\n" + (" " * (char-1)) + "^" + "\n" + exc[2]
!     for line in string.split(text,"\n"):
        print("  >" + line)
  
--- 19,23 ----
      if st is None: st = ""
      text = st + "\n" + (" " * (char-1)) + "^" + "\n" + exc[2]
!     for line in text.splitlines():
        print("  >" + line)
  
***************
*** 37,41 ****
  
    def echo(self, *args):
!     self.last = string.join(map(str, args))
      if self.verbose:
        for arg in args:
--- 37,41 ----
  
    def echo(self, *args):
!     self.last = ''.join(map(str, args))
      if self.verbose:
        for arg in args:

[pywin32-checkins] pywin32/com/win32com/makegw makegw.py, 1.9.2.2, 1.9.2.3 makegwparse.py, 1.13.2.1, 1.13.2.2

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

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

Modified Files:
      Tag: py3k
	makegw.py makegwparse.py 
Log Message:
merge recent UnicodeType, string module and NeedUnicodeConversions changes from trunk

Index: makegw.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/makegw/makegw.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
*** makegw.py	27 Nov 2008 11:31:04 -0000	1.9.2.2
--- makegw.py	4 Dec 2008 05:08:41 -0000	1.9.2.3
***************
*** 48,52 ****
  
  import re
- import string
  from . import makegwparse
  
--- 48,51 ----
***************
*** 353,361 ****
      if method.args:
        for arg in method.args[:-1]:
!         inoutstr = string.join(arg.inout, '][')
          f.write("\t\t/* [%s] */ %s,\n" % (inoutstr, arg.GetRawDeclaration()))
          
        arg = method.args[-1]
!       inoutstr = string.join(arg.inout, '][')
        f.write("\t\t/* [%s] */ %s)\n" % (inoutstr, arg.GetRawDeclaration()))
      else:
--- 352,360 ----
      if method.args:
        for arg in method.args[:-1]:
!         inoutstr = ']['.join(arg.inout)
          f.write("\t\t/* [%s] */ %s,\n" % (inoutstr, arg.GetRawDeclaration()))
          
        arg = method.args[-1]
!       inoutstr = ']['.join(arg.inout)
        f.write("\t\t/* [%s] */ %s)\n" % (inoutstr, arg.GetRawDeclaration()))
      else:

Index: makegwparse.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/makegw/makegwparse.py,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -C2 -d -r1.13.2.1 -r1.13.2.2
*** makegwparse.py	26 Nov 2008 09:03:29 -0000	1.13.2.1
--- makegwparse.py	4 Dec 2008 05:08:41 -0000	1.13.2.2
***************
*** 14,18 ****
  import re
  import traceback
- import string
  
  class error_not_found(Exception):
--- 14,17 ----

[pywin32-checkins] pywin32/win32/Lib regcheck.py,1.6.2.3,1.6.2.4

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

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

Modified Files:
      Tag: py3k
	regcheck.py 
Log Message:
merge recent UnicodeType, string module and NeedUnicodeConversions changes from trunk

Index: regcheck.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/regcheck.py,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -C2 -d -r1.6.2.3 -r1.6.2.4
*** regcheck.py	27 Nov 2008 11:31:05 -0000	1.6.2.3
--- regcheck.py	4 Dec 2008 05:08:41 -0000	1.6.2.4
***************
*** 21,26 ****
  
  def CheckPathString(pathString):
! 	import string
! 	for path in string.split(pathString, ";"):
  		if not os.path.isdir(path):
  			return "'%s' is not a valid directory!" % path
--- 21,25 ----
  
  def CheckPathString(pathString):
! 	for path in pathString.split(";"):
  		if not os.path.isdir(path):
  			return "'%s' is not a valid directory!" % path

[pywin32-checkins] pywin32/win32/Demos rastest.py,1.3.4.1,1.3.4.2

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

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

Modified Files:
      Tag: py3k
	rastest.py 
Log Message:
merge recent UnicodeType, string module and NeedUnicodeConversions changes from trunk

Index: rastest.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Demos/rastest.py,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -C2 -d -r1.3.4.1 -r1.3.4.2
*** rastest.py	29 Aug 2008 04:59:23 -0000	1.3.4.1
--- rastest.py	4 Dec 2008 05:08:41 -0000	1.3.4.2
***************
*** 3,7 ****
  
  import sys
- import string
  import os
  import win32ras
--- 3,6 ----
***************
*** 89,95 ****
  def Disconnect( rasEntry ):
      # Need to find the entry
!     name = string.lower( rasEntry )
      for hcon, entryName, devName, devType in win32ras.EnumConnections():
!         if string.lower( entryName ) == name:
              win32ras.HangUp( hcon )
              print("Disconnected from", rasEntry)
--- 88,94 ----
  def Disconnect( rasEntry ):
      # Need to find the entry
!     name = rasEntry.lower()
      for hcon, entryName, devName, devType in win32ras.EnumConnections():
!         if entryName.lower() == name:
              win32ras.HangUp( hcon )
              print("Disconnected from", rasEntry)

[pywin32-checkins] pywin32/com/win32comext/axdebug codecontainer.py, 1.4.4.2, 1.4.4.3

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

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

Modified Files:
      Tag: py3k
	codecontainer.py 
Log Message:
merge recent UnicodeType, string module and NeedUnicodeConversions changes from trunk

Index: codecontainer.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axdebug/codecontainer.py,v
retrieving revision 1.4.4.2
retrieving revision 1.4.4.3
diff -C2 -d -r1.4.4.2 -r1.4.4.3
*** codecontainer.py	27 Nov 2008 04:58:41 -0000	1.4.4.2
--- codecontainer.py	4 Dec 2008 05:08:41 -0000	1.4.4.3
***************
*** 5,23 ****
  """
  
! import string, sys
  from win32com.axdebug import axdebug
  import tokenize
! from util import RaiseNotImpl, _wrap
  
  from win32com.server.exception import Exception
  import win32api, winerror
! import contexts
  
  _keywords = {}                          # set of Python keywords
! for name in string.split("""
   and assert break class continue def del elif else except exec
   finally for from global if import in is lambda not
   or pass print raise return try while
!  """):
      _keywords[name] = 1
  
--- 5,23 ----
  """
  
! import sys
  from win32com.axdebug import axdebug
  import tokenize
! from .util import RaiseNotImpl, _wrap
  
  from win32com.server.exception import Exception
  import win32api, winerror
! from . import contexts
  
  _keywords = {}                          # set of Python keywords
! for name in """
   and assert break class continue def del elif else except exec
   finally for from global if import in is lambda not
   or pass print raise return try while
!  """.split():
      _keywords[name] = 1
  
***************
*** 89,93 ****
  
      def _buildline(self, pos):
!         i = string.find(self.text, '\n', pos)
          if i < 0:
              newpos = len(self.text)
--- 89,93 ----
  
      def _buildline(self, pos):
!         i = self.text.find('\n', pos)
          if i < 0:
              newpos = len(self.text)
***************
*** 124,128 ****
  
          if type==tokenize.NAME:
!             if _keywords.has_key(token):
                  attr = axdebug.SOURCETEXT_ATTR_KEYWORD
          elif type==tokenize.STRING:
--- 124,128 ----
  
          if type==tokenize.NAME:
!             if token in _keywords:
                  attr = axdebug.SOURCETEXT_ATTR_KEYWORD
          elif type==tokenize.STRING:
***************
*** 221,225 ****
              fname = name
          if dnt==axdebug.DOCUMENTNAMETYPE_APPNODE:
!             return string.split(name, ".")[-1]
          elif dnt==axdebug.DOCUMENTNAMETYPE_TITLE:
              return fname
--- 221,225 ----
              fname = name
          if dnt==axdebug.DOCUMENTNAMETYPE_APPNODE:
!             return name.split(".")[-1]
          elif dnt==axdebug.DOCUMENTNAMETYPE_TITLE:
              return fname

[pywin32-checkins] pywin32/com/win32com/servers dictionary.py, 1.3.4.1, 1.3.4.2 interp.py, 1.2.4.2, 1.2.4.3

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

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

Modified Files:
      Tag: py3k
	dictionary.py interp.py 
Log Message:
merge recent UnicodeType, string module and NeedUnicodeConversions changes from trunk

Index: interp.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/servers/interp.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
*** interp.py	27 Nov 2008 04:58:41 -0000	1.2.4.2
--- interp.py	4 Dec 2008 05:08:41 -0000	1.2.4.3
***************
*** 13,17 ****
  
  from win32com.server.exception import Exception
- from pywintypes import UnicodeType
  import winerror
  
--- 13,16 ----
***************
*** 34,38 ****
          """Evaluate an expression.
          """
!         if type(exp) not in [type(''),UnicodeType]:
              raise Exception(desc="Must be a string",scode=winerror.DISP_E_TYPEMISMATCH)
  
--- 33,37 ----
          """Evaluate an expression.
          """
!         if type(exp) not in [str, str]:
              raise Exception(desc="Must be a string",scode=winerror.DISP_E_TYPEMISMATCH)
  
***************
*** 41,45 ****
          """Execute a statement.
          """
!         if type(exp) not in [type(''), UnicodeType]:
              raise Exception(desc="Must be a string",scode=winerror.DISP_E_TYPEMISMATCH)
          exec(str(exp), self.dict)
--- 40,44 ----
          """Execute a statement.
          """
!         if type(exp) not in [str, str]:
              raise Exception(desc="Must be a string",scode=winerror.DISP_E_TYPEMISMATCH)
          exec(str(exp), self.dict)

Index: dictionary.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/servers/dictionary.py,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -C2 -d -r1.3.4.1 -r1.3.4.2
*** dictionary.py	27 Nov 2008 04:58:41 -0000	1.3.4.1
--- dictionary.py	4 Dec 2008 05:08:41 -0000	1.3.4.2
***************
*** 32,36 ****
  """
  
- import string
  import pythoncom
  from win32com.server import util, policy
--- 32,35 ----
***************
*** 43,50 ****
  from winerror import S_OK
  
- UnicodeType = pywintypes.UnicodeType
- StringType = bytes
- 
- 
  class DictionaryPolicy(policy.BasicWrapPolicy):
    ### BasicWrapPolicy looks for this
--- 42,45 ----
***************
*** 79,87 ****
  
        key = args[0]
!       if type(key) == UnicodeType:
!         pass
!       elif type(key) == StringType:
!         key = pywintypes.Unicode(key)
!       else:
          ### the nArgErr thing should be 0-based, not reversed... sigh
          raise COMException(desc="Key must be a string", scode=winerror.DISP_E_TYPEMISMATCH)
--- 74,78 ----
  
        key = args[0]
!       if type(exp) not in [str, str]:
          ### the nArgErr thing should be 0-based, not reversed... sigh
          raise COMException(desc="Key must be a string", scode=winerror.DISP_E_TYPEMISMATCH)
***************
*** 124,129 ****
      ### this is a copy of MappedWrapPolicy._getidsofnames_ ...
  
!     # Note: these names will always be StringType
!     name = string.lower(names[0])
      try:
        return (self._name_to_dispid_[name],)
--- 115,119 ----
      ### this is a copy of MappedWrapPolicy._getidsofnames_ ...
  
!     name = names[0].lower()
      try:
        return (self._name_to_dispid_[name],)

[pywin32-checkins] pywin32/win32/Lib win32rcparser.py, 1.5.2.2, 1.5.2.3

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

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

Modified Files:
      Tag: py3k
	win32rcparser.py 
Log Message:
merge various minor changes from trunk

Index: win32rcparser.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32rcparser.py,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -C2 -d -r1.5.2.2 -r1.5.2.3
*** win32rcparser.py	27 Nov 2008 11:31:10 -0000	1.5.2.2
--- win32rcparser.py	4 Dec 2008 05:06:25 -0000	1.5.2.3
***************
*** 32,35 ****
--- 32,40 ----
                 }
  
+ # These are "default styles" for certain controls - ie, Visual Studio assumes
+ # the styles will be applied, and emits a "NOT {STYLE_NAME}" if it is to be
+ # disabled.  These defaults have been determined by experimentation, so may
+ # not be completely accurate (most notably, some styles and/or control-types
+ # may be missing.
  _addDefaults = {"EDITTEXT":win32con.WS_BORDER | win32con.WS_TABSTOP,
                  "GROUPBOX":win32con.BS_GROUPBOX,
***************
*** 39,43 ****
                  "CTEXT":win32con.SS_CENTER,
                  "RTEXT":win32con.SS_RIGHT,
!                 "ICON":win32con.SS_ICON}
  
  defaultControlStyle = win32con.WS_CHILD | win32con.WS_VISIBLE
--- 44,50 ----
                  "CTEXT":win32con.SS_CENTER,
                  "RTEXT":win32con.SS_RIGHT,
!                 "ICON":win32con.SS_ICON,
!                 "LISTBOX":win32con.LBS_NOTIFY,
!                 }
  
  defaultControlStyle = win32con.WS_CHILD | win32con.WS_VISIBLE

[pywin32-checkins] pywin32/com/win32comext/axscript/client framework.py, 1.25.2.3, 1.25.2.4

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

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

Modified Files:
      Tag: py3k
	framework.py 
Log Message:
merge various minor changes from trunk

Index: framework.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axscript/client/framework.py,v
retrieving revision 1.25.2.3
retrieving revision 1.25.2.4
diff -C2 -d -r1.25.2.3 -r1.25.2.4
*** framework.py	27 Nov 2008 11:31:05 -0000	1.25.2.3
--- framework.py	4 Dec 2008 05:06:25 -0000	1.25.2.4
***************
*** 747,753 ****
  	def ResetNamedItems(self):
  		# Due to the way we work, we re-create persistent ones.
- 		si = self.subItems.items()
  		self.subItems = {}
! 		for name, item in si:
  			item.Close()
  			if item.flags & axscript.SCRIPTITEM_ISPERSISTENT:
--- 747,752 ----
  	def ResetNamedItems(self):
  		# Due to the way we work, we re-create persistent ones.
  		self.subItems = {}
! 		for name, item in self.subItems.items():
  			item.Close()
  			if item.flags & axscript.SCRIPTITEM_ISPERSISTENT:

[pywin32-checkins] pywin32/Pythonwin/pywin/framework app.py, 1.14.2.1, 1.14.2.2

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

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

Modified Files:
      Tag: py3k
	app.py 
Log Message:
merge various minor changes from trunk

Index: app.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/app.py,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -C2 -d -r1.14.2.1 -r1.14.2.2
*** app.py	29 Aug 2008 06:16:41 -0000	1.14.2.1
--- app.py	4 Dec 2008 05:06:25 -0000	1.14.2.2
***************
*** 11,16 ****
  import string
  import os
! from pywin.mfc import window, dialog, thread, afxres
  import traceback
  from . import scriptutils
  
--- 11,19 ----
  import string
  import os
! from pywin.mfc import window, dialog, afxres
! from pywin.mfc.thread import WinApp
  import traceback
+ import regutil
+ 
  from . import scriptutils
  
***************
*** 113,121 ****
  		return 0
  
! class CApp(thread.WinApp):
  	" A class for the application "
  	def __init__(self):
  		self.oldCallbackCaller = None
! 		thread.WinApp.__init__(self, win32ui.GetApp() )
  		self.idleHandlers = []
  		
--- 116,124 ----
  		return 0
  
! class CApp(WinApp):
  	" A class for the application "
  	def __init__(self):
  		self.oldCallbackCaller = None
! 		WinApp.__init__(self, win32ui.GetApp() )
  		self.idleHandlers = []
  		
***************
*** 196,200 ****
  	def OnHelp(self,id, code):
  		try:
- 			import regutil
  			if id==win32ui.ID_HELP_GUI_REF:
  				helpFile = regutil.GetRegisteredHelpFile("Pythonwin Reference")
--- 199,202 ----
***************
*** 372,381 ****
  	return eval(input(prompt))
  
! 
! ## sys.modules['__builtin__'].raw_input=Win32RawInput
! ## sys.modules['__builtin__'].input=Win32Input
! import code
! code.InteractiveConsole.raw_input=Win32RawInput
! code.InteractiveConsole.input=Win32Input
  
  def HaveGoodGUI():
--- 374,385 ----
  	return eval(input(prompt))
  
! try:
! 	raw_input
! 	# must be py2x...
! 	sys.modules['__builtin__'].raw_input=Win32RawInput
! except NameError:
! 	# must be py3k
! 	import code
! 	code.InteractiveConsole.input=Win32Input
  
  def HaveGoodGUI():

[pywin32-checkins] pywin32/com/win32comext/axdebug adb.py, 1.6.2.1, 1.6.2.2

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

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

Modified Files:
      Tag: py3k
	adb.py 
Log Message:
update to py3k syntax

Index: adb.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axdebug/adb.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
*** adb.py	26 Nov 2008 09:03:29 -0000	1.6.2.1
--- adb.py	4 Dec 2008 05:04:32 -0000	1.6.2.2
***************
*** 4,8 ****
  from win32com.server.util import unwrap
  import win32com.client.connect
! import gateways
  import sys, bdb, traceback
  import axdebug, stackframe
--- 4,8 ----
  from win32com.server.util import unwrap
  import win32com.client.connect
! from . import gateways
  import sys, bdb, traceback
  import axdebug, stackframe
***************
*** 87,91 ****
      def __xxxxx__set_break(self, filename, lineno, cond = None):
          # As per standard one, except no linecache checking!
!         if not self.breaks.has_key(filename):
              self.breaks[filename] = []
          list = self.breaks[filename]
--- 87,91 ----
      def __xxxxx__set_break(self, filename, lineno, cond = None):
          # As per standard one, except no linecache checking!
!         if filename not in self.breaks:
              self.breaks[filename] = []
          list = self.breaks[filename]

[pywin32-checkins] pywin32/com/TestSources/PyCOMTest PyCOMTest.dsp, 1.2, 1.2.4.1

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

Update of /cvsroot/pywin32/pywin32/com/TestSources/PyCOMTest
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26544/com/TestSources/PyCOMTest

Modified Files:
      Tag: py3k
	PyCOMTest.dsp 
Log Message:
merge from trunk: build com test object using a static crt

Index: PyCOMTest.dsp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/TestSources/PyCOMTest/PyCOMTest.dsp,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -d -r1.2 -r1.2.4.1
*** PyCOMTest.dsp	25 Apr 2004 04:10:48 -0000	1.2
--- PyCOMTest.dsp	4 Dec 2008 04:50:49 -0000	1.2.4.1
***************
*** 46,50 ****
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_MBCS" /Yu"stdafx.h" /c
! # ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /Yu"preconn.h" /FD /c
  # ADD BASE MTL /nologo /D "NDEBUG" /win32
  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
--- 46,50 ----
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_MBCS" /Yu"stdafx.h" /c
! # ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /Yu"preconn.h" /FD /c
  # ADD BASE MTL /nologo /D "NDEBUG" /win32
  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
***************
*** 83,87 ****
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_MBCS" /Yu"stdafx.h" /c
! # ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /Yu"preconn.h" /FD /c
  # ADD BASE MTL /nologo /D "_DEBUG" /win32
  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
--- 83,87 ----
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_MBCS" /Yu"stdafx.h" /c
! # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /Yu"preconn.h" /FD /c
  # ADD BASE MTL /nologo /D "_DEBUG" /win32
  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

[pywin32-checkins] pywin32/Pythonwin/pywin/framework/editor frame.py, 1.6.2.1, 1.6.2.2

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

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

Modified Files:
      Tag: py3k
	frame.py 
Log Message:
whitespace change from trunk

Index: frame.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/editor/frame.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
*** frame.py	29 Aug 2008 06:17:09 -0000	1.6.2.1
--- frame.py	4 Dec 2008 04:50:15 -0000	1.6.2.2
***************
*** 4,7 ****
--- 4,8 ----
  import win32con
  import afxres
+ 
  from . import ModuleBrowser
  

[pywin32-checkins] pywin32/Pythonwin/pywin/dialogs list.py, 1.1.4.2, 1.1.4.3 status.py, 1.3.4.3, 1.3.4.4

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

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

Modified Files:
      Tag: py3k
	list.py status.py 
Log Message:
Move a couple more dialog templates back to None for extstyle

Index: list.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/dialogs/list.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
*** list.py	31 Aug 2008 18:15:01 -0000	1.1.4.2
--- list.py	4 Dec 2008 04:48:31 -0000	1.1.4.3
***************
*** 23,27 ****
  			win32con.WS_VISIBLE
  		     )
! 		return [ [title, (0, 0, 200, 200), style, 0, (8, "MS Sans Serif")],
  			["SysListView32", None, win32ui.IDC_LIST1, (0, 0, 200, 200), ls], 
  			[128,	"OK", win32con.IDOK, (10, 0, 50, 14), bs | win32con.BS_DEFPUSHBUTTON],
--- 23,27 ----
  			win32con.WS_VISIBLE
  		     )
! 		return [ [title, (0, 0, 200, 200), style, None, (8, "MS Sans Serif")],
  			["SysListView32", None, win32ui.IDC_LIST1, (0, 0, 200, 200), ls], 
  			[128,	"OK", win32con.IDOK, (10, 0, 50, 14), bs | win32con.BS_DEFPUSHBUTTON],

Index: status.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/dialogs/status.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
*** status.py	3 Oct 2008 04:07:12 -0000	1.3.4.3
--- status.py	4 Dec 2008 04:48:31 -0000	1.3.4.4
***************
*** 26,30 ****
  	    (0, 0, w, h),
  	    style,
! 	    0,
  	    (8, "MS Sans Serif")],
  	   ]
--- 26,30 ----
  	    (0, 0, w, h),
  	    style,
! 	    None,
  	    (8, "MS Sans Serif")],
  	   ]

[pywin32-checkins] pywin32/Pythonwin/pywin/framework sgrepmdi.py, 1.7.2.2, 1.7.2.3

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

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

Modified Files:
      Tag: py3k
	sgrepmdi.py 
Log Message:
Move a couple more dialog templates back to None for extstyle

Index: sgrepmdi.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/sgrepmdi.py,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -C2 -d -r1.7.2.2 -r1.7.2.3
*** sgrepmdi.py	27 Nov 2008 11:31:03 -0000	1.7.2.2
--- sgrepmdi.py	4 Dec 2008 04:48:31 -0000	1.7.2.3
***************
*** 404,408 ****
  		style = win32con.DS_MODALFRAME | win32con.WS_POPUP | win32con.WS_VISIBLE | win32con.WS_CAPTION | win32con.WS_SYSMENU | win32con.DS_SETFONT
  		CS = win32con.WS_CHILD | win32con.WS_VISIBLE
! 		tmp = [ ["Grep", (0, 0, 210, 90), style, 0, (8, "MS Sans Serif")], ]
  		tmp.append([STATIC, "Grep For:",            -1, (7,   7,  50,  9), CS ])
  		tmp.append([EDIT,   gp,                    101, (52,  7, 144,  11), CS | win32con.WS_TABSTOP | win32con.ES_AUTOHSCROLL | win32con.WS_BORDER])
--- 404,408 ----
  		style = win32con.DS_MODALFRAME | win32con.WS_POPUP | win32con.WS_VISIBLE | win32con.WS_CAPTION | win32con.WS_SYSMENU | win32con.DS_SETFONT
  		CS = win32con.WS_CHILD | win32con.WS_VISIBLE
! 		tmp = [ ["Grep", (0, 0, 210, 90), style, None, (8, "MS Sans Serif")], ]
  		tmp.append([STATIC, "Grep For:",            -1, (7,   7,  50,  9), CS ])
  		tmp.append([EDIT,   gp,                    101, (52,  7, 144,  11), CS | win32con.WS_TABSTOP | win32con.ES_AUTOHSCROLL | win32con.WS_BORDER])
***************
*** 478,482 ****
  		style = win32con.DS_MODALFRAME | win32con.WS_POPUP | win32con.WS_VISIBLE | win32con.WS_CAPTION | win32con.WS_SYSMENU | win32con.DS_SETFONT
  		CS = win32con.WS_CHILD | win32con.WS_VISIBLE
! 		tmp = [ ["Grep Parameters", (0, 0, 205, 100), style, 0, (8, "MS Sans Serif")], ]
  		tmp.append([LISTBOX, '',                   107, (7,   7,  150,  72), CS | win32con.LBS_MULTIPLESEL| win32con.LBS_STANDARD | win32con.LBS_HASSTRINGS | win32con.WS_TABSTOP | win32con.LBS_NOTIFY])
  		tmp.append([BUTTON,'OK',         win32con.IDOK, (167, 7,  32, 12), CS | win32con.BS_DEFPUSHBUTTON| win32con.WS_TABSTOP])
--- 478,482 ----
  		style = win32con.DS_MODALFRAME | win32con.WS_POPUP | win32con.WS_VISIBLE | win32con.WS_CAPTION | win32con.WS_SYSMENU | win32con.DS_SETFONT
  		CS = win32con.WS_CHILD | win32con.WS_VISIBLE
! 		tmp = [ ["Grep Parameters", (0, 0, 205, 100), style, None, (8, "MS Sans Serif")], ]
  		tmp.append([LISTBOX, '',                   107, (7,   7,  150,  72), CS | win32con.LBS_MULTIPLESEL| win32con.LBS_STANDARD | win32con.LBS_HASSTRINGS | win32con.WS_TABSTOP | win32con.LBS_NOTIFY])
  		tmp.append([BUTTON,'OK',         win32con.IDOK, (167, 7,  32, 12), CS | win32con.BS_DEFPUSHBUTTON| win32con.WS_TABSTOP])

[pywin32-checkins] pywin32/com/win32comext/axscript/server axsite.py, 1.4, 1.5

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

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

Modified Files:
	axsite.py 
Log Message:
Fix recent accidental breakage of axscript servers.


Index: axsite.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axscript/server/axsite.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** axsite.py	27 Nov 2008 11:10:04 -0000	1.4
--- axsite.py	4 Dec 2008 04:22:31 -0000	1.5
***************
*** 64,67 ****
--- 64,71 ----
      self.lcid = lcid
      self.objModel = { }
+     for name, object in objModel.items():
+       # Gregs code did string.lower this - I think that is callers job if he wants!
+       self.objModel[name] = object
+ 
      self.engine = None
      if engine:

[pywin32-checkins] pywin32/com/win32com/client combrowse.py, 1.10, 1.11

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

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

Modified Files:
	combrowse.py 
Log Message:
correct previous checking - atof should have become float()!


Index: combrowse.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/combrowse.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** combrowse.py	4 Dec 2008 03:10:02 -0000	1.10
--- combrowse.py	4 Dec 2008 03:48:43 -0000	1.11
***************
*** 499,503 ****
                              break
                          try:
!                             versionFlt = int(versionStr)
                          except ValueError:
                              versionFlt = 0 # ????
--- 499,503 ----
                              break
                          try:
!                             versionFlt = float(versionStr)
                          except ValueError:
                              versionFlt = 0 # ????

[pywin32-checkins] pywin32/com/win32com/test testExplorer.py, 1.9, 1.10 testGatewayAddresses.py, 1.4, 1.5 testPyComTest.py, 1.39, 1.40 testmakepy.py, 1.6, 1.7 testvb.py, 1.23, 1.24

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

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

Modified Files:
	testExplorer.py testGatewayAddresses.py testPyComTest.py 
	testmakepy.py testvb.py 
Log Message:
remove use of string module

Index: testvb.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testvb.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** testvb.py	27 Nov 2008 09:33:22 -0000	1.23
--- testvb.py	4 Dec 2008 03:38:20 -0000	1.24
***************
*** 7,11 ****
  import pythoncom, win32com.client, win32com.client.dynamic, win32com.client.gencache
  from win32com.server.util import NewCollection, wrap
- import string
  from win32com.test import util
  
--- 7,10 ----
***************
*** 242,246 ****
      _DoTestArray(vbtest, (1.0, 2.0, 3.0))
      # Strings.
!     _DoTestArray(vbtest, tuple(string.split("Hello from Python")))
      # Date and Time?
      # COM objects.
--- 241,245 ----
      _DoTestArray(vbtest, (1.0, 2.0, 3.0))
      # Strings.
!     _DoTestArray(vbtest, tuple("Hello from Python".split()))
      # Date and Time?
      # COM objects.
***************
*** 288,292 ****
          # Therefore, Python sees _2_ result values - one for the result,
          # and one for the byref.
!         testData = string.split("Mark was here")
          resultData, byRefParam = vbtest.PassSAFEARRAY(testData)
          if testData != list(resultData):
--- 287,291 ----
          # Therefore, Python sees _2_ result values - one for the result,
          # and one for the byref.
!         testData = "Mark was here".split()
          resultData, byRefParam = vbtest.PassSAFEARRAY(testData)
          if testData != list(resultData):

Index: testmakepy.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testmakepy.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** testmakepy.py	27 Nov 2008 09:33:22 -0000	1.6
--- testmakepy.py	4 Dec 2008 03:38:20 -0000	1.7
***************
*** 6,10 ****
  import glob
  import os
- import string
  import traceback
  
--- 6,9 ----

Index: testGatewayAddresses.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testGatewayAddresses.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** testGatewayAddresses.py	27 Nov 2008 03:53:25 -0000	1.4
--- testGatewayAddresses.py	4 Dec 2008 03:38:20 -0000	1.5
***************
*** 37,41 ****
  from win32com.server.util import wrap
  import pythoncom
- import string
  from util import CheckClean
  
--- 37,40 ----
***************
*** 44,49 ****
  # Check that the 2 objects both have identical COM pointers.
  def CheckSameCOMObject(ob1, ob2):
!     addr1 = string.split(repr(ob1))[6][:-1]
!     addr2 = string.split(repr(ob2))[6][:-1]
      return addr1==addr2
  
--- 43,48 ----
  # Check that the 2 objects both have identical COM pointers.
  def CheckSameCOMObject(ob1, ob2):
!     addr1 = repr(ob1).split()[6][:-1]
!     addr2 = repr(ob2).split()[6][:-1]
      return addr1==addr2
  

Index: testExplorer.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testExplorer.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** testExplorer.py	26 Nov 2008 08:52:32 -0000	1.9
--- testExplorer.py	4 Dec 2008 03:38:20 -0000	1.10
***************
*** 1,5 ****
  # testExplorer -
  
- import string
  import sys
  import os
--- 1,4 ----

Index: testPyComTest.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testPyComTest.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** testPyComTest.py	27 Nov 2008 09:33:22 -0000	1.39
--- testPyComTest.py	4 Dec 2008 03:38:20 -0000	1.40
***************
*** 41,46 ****
  def TestApplyResult(fn, args, result):
      try:
!         import string
!         fnName = string.split(str(fn))[1]
      except:
          fnName = str(fn)
--- 41,45 ----
  def TestApplyResult(fn, args, result):
      try:
!         fnName = str(fn).split()[1]
      except:
          fnName = str(fn)

[pywin32-checkins] pywin32/win32/scripts rasutil.py, 1.3, 1.4 regsetup.py, 1.17, 1.18

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

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

Modified Files:
	rasutil.py regsetup.py 
Log Message:
remove use of string module

Index: regsetup.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/scripts/regsetup.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** regsetup.py	27 Nov 2008 04:15:21 -0000	1.17
--- regsetup.py	4 Dec 2008 03:38:20 -0000	1.18
***************
*** 90,94 ****
      regPath = regutil.GetRegisteredNamedPath(appName)
      if regPath:
!         pathLook = string.split(regPath,";")[0]
      if regPath and FileExists(os.path.join(pathLook, knownFileName)):
          return None # The currently registered one is good.
--- 90,94 ----
      regPath = regutil.GetRegisteredNamedPath(appName)
      if regPath:
!         pathLook = regPath.split(";")[0]
      if regPath and FileExists(os.path.join(pathLook, knownFileName)):
          return None # The currently registered one is good.
***************
*** 130,134 ****
      import regutil, string
      try:
!         string.index(fname, " ") # Other chars forcing quote?
          return '"%s"' % fname
      except ValueError:
--- 130,134 ----
      import regutil, string
      try:
!         fname.index(" ") # Other chars forcing quote?
          return '"%s"' % fname
      except ValueError:
***************
*** 145,149 ****
      """
      import regutil, string, os
!     fileNames = string.split(fileNamesString,";")
      for path in searchPaths:
          for fileName in fileNames:
--- 145,149 ----
      """
      import regutil, string, os
!     fileNames = fileNamesString.split(";")
      for path in searchPaths:
          for fileName in fileNames:
***************
*** 201,208 ****
       the Python path.
      """
!     import string, os, regutil
      currentPath = regutil.GetRegisteredNamedPath(None)
      if currentPath:
!         presearchPaths = string.split(currentPath, ";")
      else:
          presearchPaths = [os.path.abspath(".")]
--- 201,208 ----
       the Python path.
      """
!     import os, regutil
      currentPath = regutil.GetRegisteredNamedPath(None)
      if currentPath:
!         presearchPaths = currentPath.split(";")
      else:
          presearchPaths = [os.path.abspath(".")]
***************
*** 243,247 ****
      import regutil, string
      if not packageName: raise error("A package name must be supplied")
!     corePaths = string.split(regutil.GetRegisteredNamedPath(None),";")
      if not searchPaths: searchPaths = corePaths
      registryAppName = registryAppName or packageName
--- 243,247 ----
      import regutil, string
      if not packageName: raise error("A package name must be supplied")
!     corePaths = regutil.GetRegisteredNamedPath(None).split(";")
      if not searchPaths: searchPaths = corePaths
      registryAppName = registryAppName or packageName
***************
*** 279,283 ****
          return
  
!     regutil.RegisterNamedPath(appName, string.join(paths,";"))
  
  def FindRegisterPythonExe(exeAlias, searchPaths, actualFileNames = None):
--- 279,283 ----
          return
  
!     regutil.RegisterNamedPath(appName, ";".join(paths))
  
  def FindRegisterPythonExe(exeAlias, searchPaths, actualFileNames = None):
***************
*** 317,321 ****
          sys.path.append(path)
  
!     import string, os
      import regutil, win32api,win32con
  
--- 317,321 ----
          sys.path.append(path)
  
!     import os
      import regutil, win32api,win32con
  
***************
*** 323,327 ****
      # Register the core Pythonpath.
      print corePaths
!     regutil.RegisterNamedPath(None, string.join(corePaths,";"))
  
      # Register the install path.
--- 323,327 ----
      # Register the core Pythonpath.
      print corePaths
!     regutil.RegisterNamedPath(None, ';'.join(corePaths))
  
      # Register the install path.
***************
*** 493,497 ****
              if o=='-a':
                  import regutil
!                 path = string.join(searchPaths,";")
                  print "Registering application", a,"to path",path
                  regutil.RegisterNamedPath(a,path)
--- 493,497 ----
              if o=='-a':
                  import regutil
!                 path = ";".join(searchPaths)
                  print "Registering application", a,"to path",path
                  regutil.RegisterNamedPath(a,path)
***************
*** 500,504 ****
                      raise error("-c option must provide at least one additional path")
                  import win32api, regutil
!                 currentPaths = string.split(regutil.GetRegisteredNamedPath(None),";")
                  oldLen = len(currentPaths)
                  for newPath in searchPaths:
--- 500,504 ----
                      raise error("-c option must provide at least one additional path")
                  import win32api, regutil
!                 currentPaths = regutil.GetRegisteredNamedPath(None).split(";")
                  oldLen = len(currentPaths)
                  for newPath in searchPaths:
***************
*** 507,511 ****
                  if len(currentPaths)!=oldLen:
                      print "Registering %d new core paths" % (len(currentPaths)-oldLen)
!                     regutil.RegisterNamedPath(None,string.join(currentPaths,";"))
                  else:
                      print "All specified paths are already registered."
--- 507,511 ----
                  if len(currentPaths)!=oldLen:
                      print "Registering %d new core paths" % (len(currentPaths)-oldLen)
!                     regutil.RegisterNamedPath(None,";".join(currentPaths))
                  else:
                      print "All specified paths are already registered."

Index: rasutil.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/scripts/rasutil.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** rasutil.py	27 Nov 2008 04:15:21 -0000	1.3
--- rasutil.py	4 Dec 2008 03:38:20 -0000	1.4
***************
*** 1,5 ****
  # A demo of using the RAS API from Python
  import sys
- import string
  import win32ras
  
--- 1,4 ----
***************
*** 19,23 ****
  	assert numRetries > 0
  	for info in win32ras.EnumConnections():
! 		if string.lower(info[1])==string.lower(rasEntryName):
  			print "Already connected to", rasEntryName
  			return 0, info[0]
--- 18,22 ----
  	assert numRetries > 0
  	for info in win32ras.EnumConnections():
! 		if info[1].lower()==rasEntryName.lower():
  			print "Already connected to", rasEntryName
  			return 0, info[0]
***************
*** 47,51 ****
  	if type(handle)==type(''): # have they passed a connection name?
  		for info in win32ras.EnumConnections():
! 			if string.lower(info[1])==string.lower(handle):
  				handle = info[0]
  				break
--- 46,50 ----
  	if type(handle)==type(''): # have they passed a connection name?
  		for info in win32ras.EnumConnections():
! 			if info[1].lower()==handle.lower():
  				handle = info[0]
  				break