Author: Lukas Diekmann <[email protected]>
Branch: set-strategies
Changeset: r49228:7e7690516d69
Date: 2011-10-11 15:32 +0200
http://bitbucket.org/pypy/pypy/changeset/7e7690516d69/
Log: keep the same order for similar methods
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
@@ -570,6 +570,13 @@
return False
return True
+ def _isdisjoint_wrapped(w_set, w_other):
+ d = self.unerase(w_set.sstorage)
+ for key in d:
+ if w_other.has_key(self.wrap(key)):
+ return False
+ return True
+
def isdisjoint(self, w_set, w_other):
if w_other.length() == 0:
return True
@@ -581,15 +588,6 @@
else:
return self._isdisjoint_wrapped(w_set, w_other)
- # XXX can you please order the functions XXX, _XXX_base, _XXX_unwrapped and
- # _XXX_wrapped in a consistent way?
- def _isdisjoint_wrapped(w_set, w_other):
- d = self.unerase(w_set.sstorage)
- for key in d:
- if w_other.has_key(self.wrap(key)):
- return False
- return True
-
def update(self, w_set, w_other):
# XXX again, this is equivalent to self is
self.space.fromcache(ObjectSetStrategy)
# this shows that the following condition is nonsense! you should
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
