Reverting last commit. I had some staled data from an attempted svnmerge in my local sandbox
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 @@
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():