[pypy-commit] pypy py3k: Exception checks are not abstract anymore

[amauryfa]

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3k
Changeset: r50741:ed5224a1b668
Date: 2011-12-19 23:33 +0100
http://bitbucket.org/pypy/pypy/changeset/ed5224a1b668/

Log:	Exception checks are not abstract anymore

diff --git a/pypy/module/__builtin__/__init__.py b/pypy/module/__builtin__/__init__.py
--- a/pypy/module/__builtin__/__init__.py
+++ b/pypy/module/__builtin__/__init__.py
@@ -129,7 +129,3 @@
         space.abstract_issubclass_w = ab.abstract_issubclass_w.__get__(space)
         space.abstract_isclass_w = ab.abstract_isclass_w.__get__(space)
         space.abstract_getclass = ab.abstract_getclass.__get__(space)
-        space.exception_is_valid_class_w = ab.exception_is_valid_class_w.__get__(space)
-        space.exception_is_valid_obj_as_class_w = ab.exception_is_valid_obj_as_class_w.__get__(space)
-        space.exception_getclass = ab.exception_getclass.__get__(space)
-        space.exception_issubclass_w = ab.exception_issubclass_w.__get__(space)
diff --git a/pypy/module/__builtin__/abstractinst.py b/pypy/module/__builtin__/abstractinst.py
--- a/pypy/module/__builtin__/abstractinst.py
+++ b/pypy/module/__builtin__/abstractinst.py
@@ -152,21 +152,6 @@
                 " or tuple of classes and types")
     return _issubclass_recurse(space, w_derived, w_klass_or_tuple)
 
-# ------------------------------------------------------------
-# Exception helpers
-
-def exception_is_valid_obj_as_class_w(space, w_obj):
-    return BaseObjSpace.exception_is_valid_obj_as_class_w(space, w_obj)
-
-def exception_is_valid_class_w(space, w_cls):
-    return BaseObjSpace.exception_is_valid_class_w(space, w_cls)
-
-def exception_getclass(space, w_obj):
-    return BaseObjSpace.exception_getclass(space, w_obj)
-
-def exception_issubclass_w(space, w_cls1, w_cls2):
-    return BaseObjSpace.exception_issubclass_w(space, w_cls1, w_cls2)
-
 # ____________________________________________________________
 # App-level interface