summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2007-12-03 19:53:57 (GMT)
committerChristian Heimes <christian@cheimes.de>2007-12-03 19:53:57 (GMT)
commitf9290773fc026c5064fa96e1d06c3924e49fa89b (patch)
treeac767593229fbe98dc8780146cb1dfadd43737dd /Objects
parente69c320d48a5708c900cc6c78bf006fef68c62bd (diff)
downloadcpython-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 'Objects')
-rw-r--r--Objects/exceptions.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index cbcda7b..4c6a122 100644
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -424,9 +424,9 @@ SimpleExtendsException(PyExc_Exception, StopIteration,
/*
- * GeneratorExit extends BaseException
+ * GeneratorExit extends Exception
*/
-SimpleExtendsException(PyExc_BaseException, GeneratorExit,
+SimpleExtendsException(PyExc_Exception, GeneratorExit,
"Request that a generator exit.");