From: Guido van Rossum <guido@python.org>
Date: Wed, 6 May 1992 11:39:49 +0000 (+0000)
Subject: Unmerged except and finally clauses
X-Git-Tag: v0.9.8~330
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9ea0fbc6de1162a90ef8028078f26c0b3f0352e0;p=thirdparty%2FPython%2Fcpython.git

Unmerged except and finally clauses
---

diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index 7ee6e219f239..cf7c50dbe09c 100644
--- 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 41f1b8fe0fc3..4cc6ee91184d 100644
--- 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