Author: Manuel Jacob
Branch: remove-set-smm
Changeset: r64137:16d1f0e926fa
Date: 2013-05-15 11:36 +0200
http://bitbucket.org/pypy/pypy/changeset/16d1f0e926fa/
Log: Remove set.__sub__ 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 @@
return space.newbool(self.has_key(w_f))
raise
+ def descr_sub(self, space, w_other):
+ return self.difference(w_other)
+
def descr_and(self, space, w_other):
return self.intersect(w_other)
@@ -470,6 +473,7 @@
__len__ = gateway.interp2app(W_BaseSetObject.descr_len),
__iter__ = gateway.interp2app(W_BaseSetObject.descr_iter),
__contains__ = gateway.interp2app(W_BaseSetObject.descr_contains),
+ __sub__ = gateway.interp2app(W_BaseSetObject.descr_sub),
__and__ = gateway.interp2app(W_BaseSetObject.descr_and),
__or__ = gateway.interp2app(W_BaseSetObject.descr_or),
__xor__ = gateway.interp2app(W_BaseSetObject.descr_xor),
@@ -564,6 +568,7 @@
__len__ = gateway.interp2app(W_BaseSetObject.descr_len),
__iter__ = gateway.interp2app(W_BaseSetObject.descr_iter),
__contains__ = gateway.interp2app(W_BaseSetObject.descr_contains),
+ __sub__ = gateway.interp2app(W_BaseSetObject.descr_sub),
__and__ = gateway.interp2app(W_BaseSetObject.descr_and),
__or__ = gateway.interp2app(W_BaseSetObject.descr_or),
__xor__ = gateway.interp2app(W_BaseSetObject.descr_xor),
@@ -1492,13 +1497,6 @@
inplace_or__Set_Frozenset = inplace_or__Set_Set
-def sub__Set_Set(space, self, w_other):
- return self.difference(w_other)
-
-sub__Set_Frozenset = sub__Set_Set
-sub__Frozenset_Set = sub__Set_Set
-sub__Frozenset_Frozenset = sub__Set_Set
-
def inplace_sub__Set_Set(space, self, w_other):
self.difference_update(w_other)
return self
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
