[pypy-commit] pypy py3k: remove __builtins__._issubtype

amauryfa noreply at buildbot.pypy.org
Tue Dec 20 01:32:48 CET 2011


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

Log:	remove __builtins__._issubtype

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
@@ -61,7 +61,6 @@
         'coerce'        : 'operation.coerce',
         'divmod'        : 'operation.divmod',
         'format'        : 'operation.format',
-        '_issubtype'    : 'operation._issubtype',
         'issubclass'    : 'abstractinst.app_issubclass',
         'isinstance'    : 'abstractinst.app_isinstance',
         'getattr'       : 'operation.getattr',
diff --git a/pypy/module/__builtin__/operation.py b/pypy/module/__builtin__/operation.py
--- a/pypy/module/__builtin__/operation.py
+++ b/pypy/module/__builtin__/operation.py
@@ -119,10 +119,6 @@
     """Return the tuple ((x-x%y)/y, x%y).  Invariant: div*y + mod == x."""
     return space.divmod(w_x, w_y)
 
-# semi-private: works only for new-style classes.
-def _issubtype(space, w_cls1, w_cls2):
-    return space.issubtype(w_cls1, w_cls2)
-
 # ____________________________________________________________
 
 # Here 0.30103 is an upper bound for log10(2)
diff --git a/pypy/translator/geninterplevel.py b/pypy/translator/geninterplevel.py
--- a/pypy/translator/geninterplevel.py
+++ b/pypy/translator/geninterplevel.py
@@ -182,12 +182,6 @@
         # catching all builtins in advance, to avoid problems
         # with modified builtins
 
-        # add a dummy _issubtype() to builtins
-        if not hasattr(__builtin__, '_issubtype'):
-            def _issubtype(cls1, cls2):
-                raise TypeError, "this dummy should *not* be reached"
-            __builtin__._issubtype = _issubtype
-
         class bltinstub:
             def __init__(self, name):
                 self.__name__ = name


More information about the pypy-commit mailing list