|
From: Mark H. <mha...@us...> - 2008-11-26 09:03:34
|
Update of /cvsroot/pywin32/pywin32/win32/test In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20331/win32/test Modified Files: Tag: py3k handles.py test_exceptions.py test_win32inet.py test_win32trace.py testall.py Log Message: many more upgrades to py3k syntax Index: test_win32inet.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/test/test_win32inet.py,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** test_win32inet.py 12 Jun 2004 13:40:34 -0000 1.1 --- test_win32inet.py 26 Nov 2008 09:03:31 -0000 1.1.4.1 *************** *** 47,51 **** hftp = FtpCommand(hcon, True, FTP_TRANSFER_TYPE_ASCII, 'NLST', 0) except error: ! print "Error info is", InternetGetLastResponseInfo() InternetReadFile(hftp, 2048) hftp.Close() --- 47,51 ---- hftp = FtpCommand(hcon, True, FTP_TRANSFER_TYPE_ASCII, 'NLST', 0) except error: ! print("Error info is", InternetGetLastResponseInfo()) InternetReadFile(hftp, 2048) hftp.Close() Index: testall.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/test/testall.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 *** testall.py 26 Nov 2008 07:17:39 -0000 1.6.2.1 --- testall.py 26 Nov 2008 09:03:31 -0000 1.6.2.2 *************** *** 34,38 **** if rc: base = os.path.basename(self.argv[1]) ! raise AssertionError, "%s failed with exit code %s. Output is:\n%s" % (base, rc, output) def get_demo_tests(): --- 34,38 ---- if rc: base = os.path.basename(self.argv[1]) ! raise AssertionError("%s failed with exit code %s. Output is:\n%s" % (base, rc, output)) def get_demo_tests(): *************** *** 46,50 **** continue if base in ok_exceptions: ! print "Ack - can't handle test %s - can't catch specific exceptions" % (base,) continue argv = (sys.executable, os.path.join(demo_dir, base+".py")) + \ --- 46,50 ---- continue if base in ok_exceptions: ! print("Ack - can't handle test %s - can't catch specific exceptions" % (base,)) continue argv = (sys.executable, os.path.join(demo_dir, base+".py")) + \ *************** *** 73,77 **** __import__(base) except ImportError: ! print "FAILED to import", name raise num += 1 --- 73,77 ---- __import__(base) except ImportError: ! print("FAILED to import", name) raise num += 1 *************** *** 92,98 **** try: mod = __import__(base) ! except ImportError, why: ! print "FAILED to import test module" ! print why continue if hasattr(mod, "suite"): --- 92,98 ---- try: mod = __import__(base) ! except ImportError as why: ! print("FAILED to import test module") ! print(why) continue if hasattr(mod, "suite"): Index: test_win32trace.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/test/test_win32trace.py,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -C2 -d -r1.5 -r1.5.4.1 *** test_win32trace.py 6 Mar 2005 23:55:59 -0000 1.5 --- test_win32trace.py 26 Nov 2008 09:03:31 -0000 1.5.4.1 *************** *** 18,23 **** win32trace.TermRead() win32trace.TermWrite() ! raise RuntimeError, "An existing win32trace reader appears to be " \ ! "running - please stop this process and try again" class TestInitOps(unittest.TestCase): --- 18,23 ---- win32trace.TermRead() win32trace.TermWrite() ! raise RuntimeError("An existing win32trace reader appears to be " \ ! "running - please stop this process and try again") class TestInitOps(unittest.TestCase): Index: handles.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/test/handles.py,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** handles.py 30 Oct 2007 09:53:32 -0000 1.4 --- handles.py 26 Nov 2008 09:03:30 -0000 1.4.2.1 *************** *** 27,31 **** try: f1(invalidate) ! except ZeroDivisionError, exc: raise IOError("raise 2") --- 27,31 ---- try: f1(invalidate) ! except ZeroDivisionError as exc: raise IOError("raise 2") Index: test_exceptions.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/test/test_exceptions.py,v retrieving revision 1.2.2.4 retrieving revision 1.2.2.5 diff -C2 -d -r1.2.2.4 -r1.2.2.5 *** test_exceptions.py 7 Oct 2008 11:35:36 -0000 1.2.2.4 --- test_exceptions.py 26 Nov 2008 09:03:30 -0000 1.2.2.5 *************** *** 18,22 **** try: win32api.CloseHandle(1) ! except win32api.error, exc: return exc self.fail("Didn't get invalid-handle exception.") --- 18,22 ---- try: win32api.CloseHandle(1) ! except win32api.error as exc: return exc self.fail("Didn't get invalid-handle exception.") *************** *** 42,46 **** win32api.CloseHandle(1) self.fail("expected exception!") ! except win32api.error, (werror, func, msg): self.failUnlessEqual(werror, winerror.ERROR_INVALID_HANDLE) self.failUnlessEqual(func, "CloseHandle") --- 42,47 ---- win32api.CloseHandle(1) self.fail("expected exception!") ! except win32api.error as xxx_todo_changeme: ! (werror, func, msg) = xxx_todo_changeme.args self.failUnlessEqual(werror, winerror.ERROR_INVALID_HANDLE) self.failUnlessEqual(func, "CloseHandle") *************** *** 89,93 **** raise pywintypes.error() self.fail("Expected exception") ! except pywintypes.error, exc: self.failUnlessEqual(exc.args, ()) self.failUnlessEqual(exc.winerror, None) --- 90,94 ---- raise pywintypes.error() self.fail("Expected exception") ! except pywintypes.error as exc: self.failUnlessEqual(exc.args, ()) self.failUnlessEqual(exc.winerror, None) *************** *** 99,103 **** raise pywintypes.error("foo") self.fail("Expected exception") ! except pywintypes.error, exc: assert exc.args[0] == "foo" # 'winerror' always args[0] --- 100,104 ---- raise pywintypes.error("foo") self.fail("Expected exception") ! except pywintypes.error as exc: assert exc.args[0] == "foo" # 'winerror' always args[0] *************** *** 110,114 **** raise pywintypes.error("foo", "bar", "you", "never", "kn", 0) self.fail("Expected exception") ! except pywintypes.error, exc: self.failUnlessEqual(exc.args[0], "foo") self.failUnlessEqual(exc.args[-1], 0) --- 111,115 ---- raise pywintypes.error("foo", "bar", "you", "never", "kn", 0) self.fail("Expected exception") ! except pywintypes.error as exc: self.failUnlessEqual(exc.args[0], "foo") self.failUnlessEqual(exc.args[-1], 0) *************** *** 121,125 **** try: pythoncom.StgOpenStorage("foo", None, 0) ! except pythoncom.com_error, exc: return exc self.fail("Didn't get storage exception.") --- 122,126 ---- try: pythoncom.StgOpenStorage("foo", None, 0) ! except pythoncom.com_error as exc: return exc self.fail("Didn't get storage exception.") *************** *** 181,185 **** raise pywintypes.com_error() self.fail("Expected exception") ! except pywintypes.com_error, exc: self.failUnlessEqual(exc.args, ()) self.failUnlessEqual(exc.hresult, None) --- 182,186 ---- raise pywintypes.com_error() self.fail("Expected exception") ! except pywintypes.com_error as exc: self.failUnlessEqual(exc.args, ()) self.failUnlessEqual(exc.hresult, None) *************** *** 192,196 **** raise pywintypes.com_error("foo") self.fail("Expected exception") ! except pywintypes.com_error, exc: self.failUnlessEqual(exc.args[0], "foo") self.failUnlessEqual(exc.hresult, "foo") --- 193,197 ---- raise pywintypes.com_error("foo") self.fail("Expected exception") ! except pywintypes.com_error as exc: self.failUnlessEqual(exc.args[0], "foo") self.failUnlessEqual(exc.hresult, "foo") *************** *** 203,207 **** raise pywintypes.com_error("foo", "bar", "you", "never", "kn", 0) self.fail("Expected exception") ! except pywintypes.com_error, exc: self.failUnlessEqual(exc.args[0], "foo") self.failUnlessEqual(exc.args[-1], 0) --- 204,208 ---- raise pywintypes.com_error("foo", "bar", "you", "never", "kn", 0) self.fail("Expected exception") ! except pywintypes.com_error as exc: self.failUnlessEqual(exc.args[0], "foo") self.failUnlessEqual(exc.args[-1], 0) |
