[ZPT] CVS: Packages/TAL/tests - test_sourcepos.py:1.2.24.1 test_talinterpreter.py:1.3.92.1

[Evan Simpson]

Update of /cvs-repository/Packages/TAL/tests
In directory cvs.zope.org:/tmp/cvs-serv28386/tests

Modified Files:
      Tag: evan-zpt-1_5_2-branch
	test_sourcepos.py test_talinterpreter.py 
Log Message:
Remove string methods.


=== Packages/TAL/tests/test_sourcepos.py 1.2 => 1.2.24.1 ===
 #! /usr/bin/env python
 """Tests for TALInterpreter."""
 
-import sys
+import sys, string
 import unittest
 
 from StringIO import StringIO
@@ -68,8 +68,8 @@
         stream = StringIO()
         interp = TALInterpreter(page1_program, macros, eng, stream)
         interp()
-        self.assertEqual(stream.getvalue().strip(), expected.strip(),
-                         stream.getvalue())
+        self.assert_(string.strip(stream.getvalue()) == string.strip(expected),
+                     stream.getvalue())
 
 
 def test_suite():


=== Packages/TAL/tests/test_talinterpreter.py 1.3 => 1.3.92.1 ===
         sio = StringIO()
         interp = TALInterpreter(program, {}, DummyEngine(), sio, wrap=60)
         interp()
-        self.assertEqual(sio.getvalue(), EXPECTED)
+        self.assert_(sio.getvalue() == EXPECTED)
 
 
 def test_suite():