summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1992-05-06 11:39:49 (GMT)
committerGuido van Rossum <guido@python.org>1992-05-06 11:39:49 (GMT)
commit9ea0fbc6de1162a90ef8028078f26c0b3f0352e0 (patch)
tree0e02fbf833d8f37166aa3c98e584d725b8ed1d4b /Lib
parent8899a9ca400b90100c2f05eea7211d00b30e4843 (diff)
downloadcpython-9ea0fbc6de1162a90ef8028078f26c0b3f0352e0.zip
cpython-9ea0fbc6de1162a90ef8028078f26c0b3f0352e0.tar.gz
cpython-9ea0fbc6de1162a90ef8028078f26c0b3f0352e0.tar.bz2
Unmerged except and finally clauses
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_exceptions.py9
-rw-r--r--Lib/test/test_opcodes.py1
2 files changed, 5 insertions, 5 deletions
diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index 7ee6e21..cf7c50d 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 41f1b8f..4cc6ee9 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