Author: Manuel Jacob
Branch: remove-set-smm
Changeset: r64133:166b0bd43694
Date: 2013-05-15 11:26 +0200
http://bitbucket.org/pypy/pypy/changeset/166b0bd43694/
Log: Remove set.__and__ multi-method.
diff --git a/pypy/objspace/std/setobject.py b/pypy/objspace/std/setobject.py
--- a/pypy/objspace/std/setobject.py
+++ b/pypy/objspace/std/setobject.py
@@ -249,6 +249,9 @@
w_currently_in_repr = ec._py_repr = space.newdict()
return setrepr(space, w_currently_in_repr, self)
+ def descr_and(self, space, w_other):
+ return self.intersect(w_other)
+
def descr_copy(self, space):
"""Return a shallow copy of a set."""
if type(self) is W_FrozensetObject:
@@ -461,7 +464,7 @@
__len__ = gateway.interp2app(W_BaseSetObject.descr_len),
__iter__ = gateway.interp2app(W_BaseSetObject.descr_iter),
__contains__ = gateway.interp2app(W_BaseSetObject.descr_contains),
- #__and__ = gateway.interp2app(W_BaseSetObject.descr_intersection),
+ __and__ = gateway.interp2app(W_BaseSetObject.descr_and),
#__or__ = gateway.interp2app(W_BaseSetObject.descr_union),
#__xor__ = gateway.interp2app(W_BaseSetObject.descr_symmetric_difference),
@@ -555,7 +558,7 @@
__len__ = gateway.interp2app(W_BaseSetObject.descr_len),
__iter__ = gateway.interp2app(W_BaseSetObject.descr_iter),
__contains__ = gateway.interp2app(W_BaseSetObject.descr_contains),
- #__and__ = gateway.interp2app(W_BaseSetObject.descr_intersection),
+ __and__ = gateway.interp2app(W_BaseSetObject.descr_and),
#__or__ = gateway.interp2app(W_BaseSetObject.descr_union),
#__xor__ = gateway.interp2app(W_BaseSetObject.descr_symmetric_difference),
@@ -1517,15 +1520,6 @@
w_left.switch_to_empty_strategy()
return deleted
-
-def and__Set_Set(space, self, w_other):
- new_set = self.intersect(w_other)
- return new_set
-
-and__Set_Frozenset = and__Set_Set
-and__Frozenset_Set = and__Set_Set
-and__Frozenset_Frozenset = and__Set_Set
-
def inplace_and__Set_Set(space, self, w_other):
self.intersect_update(w_other)
return self
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
