[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 ----