Unmerged except and finally clauses

diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index 7ee6e219f239c962c5fac961604e104fdf128001..cf7c50dbe09cc3ebba631f35edecd2092e4106b4 100644 (file)
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -19,10 +19,11 @@ fp.close()
 fp = open(TESTFN, 'r')
 savestdin = sys.stdin
 try:
-       sys.stdin = fp
-       x = raw_input()
-except EOFError:
-       pass
+       try:
+               sys.stdin = fp
+               x = raw_input()
+       except EOFError:
+               pass
 finally:
        sys.stdin = savestdin
        fp.close()

diff --git a/Lib/test/test_opcodes.py b/Lib/test/test_opcodes.py
index 41f1b8fe0fc3e3a52a57a21fe59dcc60fcefcc89..4cc6ee91184df15615c15b4672b019c623b7387f 100644 (file)
--- a/Lib/test/test_opcodes.py
+++ b/Lib/test/test_opcodes.py
@@ -14,7 +14,6 @@ for i in range(10):
        except NameError: pass
        except ZeroDivisionError: pass
        except TypeError: pass
-       finally: pass
        try: pass
        except: pass
        try: pass