Commit 9ea0fbc6 authored by Guido van Rossum's avatar Guido van Rossum

Unmerged except and finally clauses

parent 8899a9ca
...@@ -19,10 +19,11 @@ fp.close() ...@@ -19,10 +19,11 @@ fp.close()
fp = open(TESTFN, 'r') fp = open(TESTFN, 'r')
savestdin = sys.stdin savestdin = sys.stdin
try: try:
sys.stdin = fp try:
x = raw_input() sys.stdin = fp
except EOFError: x = raw_input()
pass except EOFError:
pass
finally: finally:
sys.stdin = savestdin sys.stdin = savestdin
fp.close() fp.close()
......
...@@ -14,7 +14,6 @@ for i in range(10): ...@@ -14,7 +14,6 @@ for i in range(10):
except NameError: pass except NameError: pass
except ZeroDivisionError: pass except ZeroDivisionError: pass
except TypeError: pass except TypeError: pass
finally: pass
try: pass try: pass
except: pass except: pass
try: pass try: pass
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment