diff options
| author | Christian Heimes <christian@cheimes.de> | 2007-12-03 19:53:57 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2007-12-03 19:53:57 (GMT) |
| commit | f9290773fc026c5064fa96e1d06c3924e49fa89b (patch) | |
| tree | ac767593229fbe98dc8780146cb1dfadd43737dd /Lib/test | |
| parent | e69c320d48a5708c900cc6c78bf006fef68c62bd (diff) | |
| download | cpython-f9290773fc026c5064fa96e1d06c3924e49fa89b.zip cpython-f9290773fc026c5064fa96e1d06c3924e49fa89b.tar.gz cpython-f9290773fc026c5064fa96e1d06c3924e49fa89b.tar.bz2 | |
Reverting last commit. I had some staled data from an attempted svnmerge in my local sandbox
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/exception_hierarchy.txt | 2 | ||||
| -rw-r--r-- | Lib/test/test_generators.py | 13 |
2 files changed, 1 insertions, 14 deletions
diff --git a/Lib/test/exception_hierarchy.txt b/Lib/test/exception_hierarchy.txt index 73ccb66..965252c 100644 --- a/Lib/test/exception_hierarchy.txt +++ b/Lib/test/exception_hierarchy.txt @@ -1,8 +1,8 @@ BaseException +-- SystemExit +-- KeyboardInterrupt - +-- GeneratorExit +-- Exception + +-- GeneratorExit +-- StopIteration +-- ArithmeticError | +-- FloatingPointError diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py index 0d6908d..4710c8c 100644 --- a/Lib/test/test_generators.py +++ b/Lib/test/test_generators.py @@ -1668,19 +1668,6 @@ And finalization: exiting -GeneratorExit is not caught by except Exception: - ->>> def f(): -... try: yield -... except Exception: print 'except' -... finally: print 'finally' - ->>> g = f() ->>> g.next() ->>> del g -finally - - Now let's try some ill-behaved generators: >>> def f(): |