diff options
Diffstat (limited to 'Lib/test/test_opcodes.py')
| -rw-r--r-- | Lib/test/test_opcodes.py | 35 |
1 files changed, 13 insertions, 22 deletions
diff --git a/Lib/test/test_opcodes.py b/Lib/test/test_opcodes.py index 6d117d62b1b..f510bac9f02 100644 --- a/Lib/test/test_opcodes.py +++ b/Lib/test/test_opcodes.py @@ -1,6 +1,6 @@ # Python test set -- part 2, opcodes -from test.test_support import run_unittest, check_py3k_warnings +from test.support import run_unittest import unittest class OpcodeTest(unittest.TestCase): @@ -9,7 +9,7 @@ class OpcodeTest(unittest.TestCase): n = 0 for i in range(10): n = n+i - try: 1 // 0 + try: 1/0 except NameError: pass except ZeroDivisionError: pass except TypeError: pass @@ -23,9 +23,9 @@ class OpcodeTest(unittest.TestCase): def test_raise_class_exceptions(self): - class AClass: pass + class AClass(Exception): pass class BClass(AClass): pass - class CClass: pass + class CClass(Exception): pass class DClass(AClass): def __init__(self, ignore): pass @@ -46,24 +46,20 @@ class OpcodeTest(unittest.TestCase): a = AClass() b = BClass() - try: raise AClass, b - except BClass, v: - self.assertEqual(v, b) - else: self.fail("no exception") - - try: raise b - except AClass, v: + try: + raise b + except AClass as v: self.assertEqual(v, b) else: self.fail("no exception") # not enough arguments - try: raise BClass, a - except TypeError: pass - else: self.fail("no exception") + ##try: raise BClass, a + ##except TypeError: pass + ##else: self.fail("no exception") - try: raise DClass, a - except DClass, v: + try: raise DClass(a) + except DClass as v: self.assertIsInstance(v, DClass) else: self.fail("no exception") @@ -110,12 +106,7 @@ class OpcodeTest(unittest.TestCase): def test_main(): - with check_py3k_warnings(("exceptions must derive from BaseException", - DeprecationWarning), - ("catching classes that don't inherit " - "from BaseException is not allowed", - DeprecationWarning)): - run_unittest(OpcodeTest) + run_unittest(OpcodeTest) if __name__ == '__main__': test_main() |