[pypy-commit] pypy py3k: kill hex and oct from the baseobjectspace method table, and add them only in the flow objspace

antocuni noreply at buildbot.pypy.org
Wed Feb 29 23:00:04 CET 2012


Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: py3k
Changeset: r53026:6bfa14832536
Date: 2012-02-29 14:10 +0100
http://bitbucket.org/pypy/pypy/changeset/6bfa14832536/

Log:	kill hex and oct from the baseobjectspace method table, and add them
	only in the flow objspace

diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -1528,10 +1528,6 @@
     ('neg',             'neg',       1, ['__neg__']),
     ('nonzero',         'truth',     1, ['__bool__']),
     ('abs' ,            'abs',       1, ['__abs__']),
-    # hex and oct no longer calls special methods in py3k, but we need to keep
-    # them in this table for the flow object space
-    ('hex',             'hex',       1, []),
-    ('oct',             'oct',       1, []),
     ('ord',             'ord',       1, []),
     ('invert',          '~',         1, ['__invert__']),
     ('add',             '+',         2, ['__add__', '__radd__']),
diff --git a/pypy/objspace/flow/operation.py b/pypy/objspace/flow/operation.py
--- a/pypy/objspace/flow/operation.py
+++ b/pypy/objspace/flow/operation.py
@@ -19,6 +19,9 @@
     ('getslice',        'getslice',  3, ['__getslice__']),
     ('setslice',        'setslice',  4, ['__setslice__']),
     ('delslice',        'delslice',  3, ['__delslice__']),
+    # hex and oct no longer calls special methods in py3k
+    ('hex',             'hex',       1, []),
+    ('oct',             'oct',       1, []),
 ])
 
 


More information about the pypy-commit mailing list