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