[pywin32-checkins] pywin32/com/win32comext/axscript/test leakTest.py, 1.1.4.2, 1.1.4.3 testHost.py, 1.5.2.3, 1.5.2.4 testHost4Dbg.py, 1.1.4.1, 1.1.4.2

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

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

Modified Files:
      Tag: py3k
	leakTest.py testHost.py testHost4Dbg.py 
Log Message:
merge lots of fixes from the trunk

Index: testHost4Dbg.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axscript/test/testHost4Dbg.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
*** testHost4Dbg.py	26 Nov 2008 09:03:30 -0000	1.1.4.1
--- testHost4Dbg.py	27 Nov 2008 11:31:05 -0000	1.1.4.2
***************
*** 51,55 ****
  #    sessionProvider.StartDebugSession(None)
      
!     raw_input("Press enter to continue")
   #   forthEngine.Start()
      pyEngine.Start() # Actually run the Python code
--- 51,55 ----
  #    sessionProvider.StartDebugSession(None)
      
!     input("Press enter to continue")
   #   forthEngine.Start()
      pyEngine.Start() # Actually run the Python code

Index: testHost.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axscript/test/testHost.py,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -C2 -d -r1.5.2.3 -r1.5.2.4
*** testHost.py	27 Nov 2008 04:58:41 -0000	1.5.2.3
--- testHost.py	27 Nov 2008 11:31:05 -0000	1.5.2.4
***************
*** 109,113 ****
  end sub
  """
! PyScript = u"""\
  # A unicode \xa9omment.
  prop = "Property Value"
--- 109,113 ----
  end sub
  """
! PyScript = """\
  # A unicode \xa9omment.
  prop = "Property Value"
***************
*** 125,131 ****
  """
  
! PyScript_Exc = u"""\
  def hello(arg1):
!   raise RuntimeError(u"exc with extended \xa9har")
  """
  
--- 125,134 ----
  """
  
! # XXX - needs py3k work!  Throwing a bytes string with an extended char
! # doesn't make much sense, but py2x allows it.  What it gets upset with
! # is a real unicode arg - which is the only thing py3k allows!
! PyScript_Exc = """\
  def hello(arg1):
!   raise RuntimeError("exc with extended \xa9har")
  """
  
***************
*** 218,222 ****
                        self._TestEngine, "VBScript", ErrScript)
    def testPythonExceptions(self):
!     expected = u"RuntimeError: exc with extended \xa9har"
      self._TestEngine("Python", PyScript_Exc, expected)
  
--- 221,225 ----
                        self._TestEngine, "VBScript", ErrScript)
    def testPythonExceptions(self):
!     expected = "RuntimeError: exc with extended \xa9har"
      self._TestEngine("Python", PyScript_Exc, expected)
  

Index: leakTest.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axscript/test/leakTest.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
*** leakTest.py	27 Nov 2008 04:58:41 -0000	1.1.4.2
--- leakTest.py	27 Nov 2008 11:31:05 -0000	1.1.4.3
***************
*** 145,149 ****
  
  def dotestall():
!   for i in xrange(10):
      TestEngine("Python", PyScript)
      print(sys.gettotalrefcount())
--- 145,149 ----
  
  def dotestall():
!   for i in range(10):
      TestEngine("Python", PyScript)
      print(sys.gettotalrefcount())