Author: Ronan Lamy <ronan.l...@gmail.com>
Branch: py3.5
Changeset: r87280:7ed96cd63af0
Date: 2016-09-21 16:34 +0100
http://bitbucket.org/pypy/pypy/changeset/7ed96cd63af0/
Log: Remove dunder aliases from _operator, as on CPython
diff --git a/pypy/module/operator/__init__.py b/pypy/module/operator/__init__.py
--- a/pypy/module/operator/__init__.py
+++ b/pypy/module/operator/__init__.py
@@ -4,21 +4,8 @@
"""Operator Builtin Module. """
applevel_name = '_operator'
- # HACK! override loaders to be able to access different operations
- # under same name. I.e., operator.eq == operator.__eq__
-
- def __init__(self, space, w_name):
- def create_lambda(name, alsoname):
- return lambda space : self.getdictvalue(space, alsoname)
-
- MixedModule.__init__(self, space, w_name)
- for name, alsoname in self.mapping.iteritems():
- self.loaders[name] = create_lambda(name, alsoname)
-
appleveldefs = {}
-
app_names = ['countOf', 'attrgetter', 'itemgetter', 'methodcaller']
-
for name in app_names:
appleveldefs[name] = 'app_operator.%s' % name
@@ -41,53 +28,3 @@
for name in interp_names:
interpleveldefs[name] = 'interp_operator.%s' % name
-
- mapping = {
- '__abs__' : 'abs',
- '__add__' : 'add',
- '__and__' : 'and_',
- '__concat__' : 'concat',
- '__contains__' : 'contains',
- '__index__' : 'index',
- '__delitem__' : 'delitem',
- '__eq__' : 'eq',
- '__floordiv__' : 'floordiv',
- '__ge__' : 'ge',
- '__getitem__' : 'getitem',
- '__gt__' : 'gt',
- '__inv__' : 'inv',
- '__invert__' : 'invert',
- '__le__' : 'le',
- '__lshift__' : 'lshift',
- '__lt__' : 'lt',
- '__mod__' : 'mod',
- '__mul__' : 'mul',
- '__ne__' : 'ne',
- '__neg__' : 'neg',
- '__not__' : 'not_',
- '__or__' : 'or_',
- '__pos__' : 'pos',
- '__pow__' : 'pow',
- '__rshift__' : 'rshift',
- '__setitem__' : 'setitem',
- '__sub__' : 'sub',
- '__truediv__' : 'truediv',
- '__xor__' : 'xor',
- '__matmul__' : 'matmul',
- # in-place
- '__iadd__' : 'iadd',
- '__iand__' : 'iand',
- '__iconcat__' : 'iconcat',
- '__ifloordiv__' : 'ifloordiv',
- '__ilshift__' : 'ilshift',
- '__imod__' : 'imod',
- '__imul__' : 'imul',
- '__ior__' : 'ior',
- '__ipow__' : 'ipow',
- '__irshift__' : 'irshift',
- '__isub__' : 'isub',
- '__itruediv__' : 'itruediv',
- '__ixor__' : 'ixor',
- '__imatmul__' : 'imatmul',
- }
-
diff --git a/pypy/module/operator/test/test_operator.py
b/pypy/module/operator/test/test_operator.py
--- a/pypy/module/operator/test/test_operator.py
+++ b/pypy/module/operator/test/test_operator.py
@@ -3,10 +3,6 @@
class AppTestOperator:
spaceconfig = dict(usemodules=['operator'])
- def test_equality(self):
- import _operator as operator
- assert operator.eq == operator.__eq__
-
def test_getters_are_not_regular_functions(self):
import _operator as operator
class A(object):
@@ -191,7 +187,6 @@
def test_index(self):
import _operator as operator
assert operator.index(42) == 42
- assert operator.__index__(42) == 42
raises(TypeError, operator.index, "abc")
exc = raises(TypeError, operator.index, "abc")
assert str(exc.value) == "'str' object cannot be interpreted as an
integer"
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
