Unmerged except and finally clauses

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()

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