Author: Manuel Jacob
Branch: remove-set-smm
Changeset: r64130:7ff94598f1e2
Date: 2013-05-15 11:15 +0200
http://bitbucket.org/pypy/pypy/changeset/7ff94598f1e2/
Log: Remove set.__iter__ 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
@@ -229,6 +229,9 @@
def descr_len(self, space):
return space.newint(self.length())
+ def descr_iter(self, space):
+ return W_SetIterObject(space, self.iter())
+
def descr_copy(self, space):
"""Return a shallow copy of a set."""
if type(self) is W_FrozensetObject:
@@ -438,6 +441,7 @@
# non-mutating operators
__len__ = gateway.interp2app(W_BaseSetObject.descr_len),
+ __iter__ = gateway.interp2app(W_BaseSetObject.descr_iter),
#__and__ = gateway.interp2app(W_BaseSetObject.descr_intersection),
#__or__ = gateway.interp2app(W_BaseSetObject.descr_union),
#__xor__ = gateway.interp2app(W_BaseSetObject.descr_symmetric_difference),
@@ -529,6 +533,7 @@
# non-mutating operators
__len__ = gateway.interp2app(W_BaseSetObject.descr_len),
+ __iter__ = gateway.interp2app(W_BaseSetObject.descr_iter),
#__and__ = gateway.interp2app(W_BaseSetObject.descr_intersection),
#__or__ = gateway.interp2app(W_BaseSetObject.descr_union),
#__xor__ = gateway.interp2app(W_BaseSetObject.descr_symmetric_difference),
@@ -1541,11 +1546,6 @@
xor__Frozenset_Set = xor__Set_Set
xor__Frozenset_Frozenset = xor__Set_Set
-def iter__Set(space, self):
- return W_SetIterObject(space, self.iter())
-
-iter__Frozenset = iter__Set
-
def cmp__Set_settypedef(space, self, w_other):
# hack hack until we get the expected result
raise OperationError(space.w_TypeError,
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
