Author: Philip Jenvey <[email protected]>
Branch:
Changeset: r65159:2ee41b828b47
Date: 2013-07-01 16:32 -0700
http://bitbucket.org/pypy/pypy/changeset/2ee41b828b47/
Log: whitespace
diff --git a/pypy/objspace/std/test/test_identityset.py
b/pypy/objspace/std/test/test_identityset.py
--- a/pypy/objspace/std/test/test_identityset.py
+++ b/pypy/objspace/std/test/test_identityset.py
@@ -1,23 +1,22 @@
import py
+class AppTestIdentitySet(object):
-class AppTestIdentitySet(object):
-
- #needed for compares_by_identity
+ # needed for compares_by_identity
spaceconfig = {"objspace.std.withidentitydict": True}
-
+
def setup_class(cls):
from pypy.objspace.std import identitydict
if cls.runappdirect:
py.test.skip("interp2app doesn't work on appdirect")
-
+
def w_uses_strategy(self, s , obj):
import __pypy__
return s in __pypy__.internal_repr(obj)
-
+
def test_use_identity_strategy(self):
-
+
class Plain(object):
pass
@@ -32,113 +31,113 @@
class CustomHash(object):
def __hash__(self):
return 0
-
+
s = set()
-
+
assert not self.uses_strategy('IdentitySetStrategy',s)
-
+
s.add(Plain())
-
+
assert self.uses_strategy('IdentitySetStrategy',s)
-
+
for cls in [CustomEq,CustomCmp,CustomHash]:
s = set()
s.add(cls())
assert not self.uses_strategy('IdentitySetStrategy',s)
-
-
+
+
def test_use_identity_strategy_list(self):
-
+
class X(object):
pass
-
+
assert self.uses_strategy('IdentitySetStrategy',set([X(),X()]))
assert not self.uses_strategy('IdentitySetStrategy',set([X(),""]))
assert not self.uses_strategy('IdentitySetStrategy',set([X(),u""]))
assert not self.uses_strategy('IdentitySetStrategy',set([X(),1]))
-
+
def test_identity_strategy_add(self):
-
+
class X(object):
pass
-
+
class NotIdent(object):
def __eq__(self,other):
pass
-
+
s = set([X(),X()])
s.add('foo')
assert not self.uses_strategy('IdentitySetStrategy',s)
s = set([X(),X()])
s.add(NotIdent())
assert not self.uses_strategy('IdentitySetStrategy',s)
-
+
def test_identity_strategy_sanity(self):
-
+
class X(object):
pass
-
+
class Y(object):
pass
-
+
a,b,c,d,e,f = X(),Y(),X(),Y(),X(),Y()
-
+
s = set([a,b]).union(set([c]))
- assert self.uses_strategy('IdentitySetStrategy',s)
+ assert self.uses_strategy('IdentitySetStrategy',s)
assert set([a,b,c]) == s
s = set([a,b,c,d,e,f]) - set([d,e,f])
assert self.uses_strategy('IdentitySetStrategy',s)
assert set([a,b,c]) == s
-
-
+
+
s = set([a])
s.update([b,c])
-
+
assert s == set([a,b,c])
-
-
+
+
def test_identity_strategy_iterators(self):
-
+
class X(object):
pass
-
+
s = set([X() for i in range(10)])
counter = 0
for item in s:
counter += 1
assert item in s
-
+
assert counter == 10
-
-
+
+
def test_identity_strategy_other_cmp(self):
-
- #test tries to hit positive and negative in
+
+ # test tries to hit positive and negative in
# may_contain_equal_elements
-
+
class X(object):
pass
-
- s = set([X() for i in range(10)])
-
+
+ s = set([X() for i in range(10)])
+
assert s.intersection(set([1,2,3])) == set()
assert s.intersection(set(['a','b','c'])) == set()
assert s.intersection(set(['a','b','c'])) == set()
assert s.intersection(set([X(),X()])) == set()
-
+
other = set(['a','b','c',s.__iter__().next()])
intersect = s.intersection(other)
assert len(intersect) == 1
assert intersect.__iter__().next() in s
assert intersect.__iter__().next() in other
-
+
def test_class_monkey_patch(self):
-
+
class X(object):
pass
-
+
s = set()
-
+
s.add(X())
assert self.uses_strategy('IdentitySetStrategy',s)
X.__eq__ = lambda self,other : None
@@ -148,47 +147,47 @@
assert not self.uses_strategy('IdentitySetStrategy',set([X(),""]))
assert not self.uses_strategy('IdentitySetStrategy',set([X(),u""]))
assert not self.uses_strategy('IdentitySetStrategy',set([X(),1]))
-
- # An interesting case, add an instance, mutate the class,
+
+ # An interesting case, add an instance, mutate the class,
# then add the same instance.
-
+
class X(object):
pass
-
+
s = set()
inst = X()
s.add(inst)
X.__eq__ = lambda x,y : x is y
s.add(inst)
-
+
assert len(s) == 1
assert s.__iter__().next() is inst
assert not self.uses_strategy('IdentitySetStrategy',s)
-
-
- #Add instance, mutate class, check membership of that instance.
-
+
+
+ # Add instance, mutate class, check membership of that instance.
+
class X(object):
pass
-
-
+
+
inst = X()
s = set()
s.add(inst)
X.__eq__ = lambda x,y : x is y
assert inst in s
-
+
# Test Wrong strategy
# If the strategy is changed by mutation, but the instance
# does not change, then this tests the methods that call
# may_contain_equal_elements still function.
# i.e. same instance in two sets, one with object strategy, one with
# identity strategy.
-
+
class X(object):
pass
-
-
+
+
inst = X()
s1 = set()
s1.add(inst)
@@ -197,13 +196,10 @@
s2 = set()
s2.add(inst)
assert not self.uses_strategy('IdentitySetStrategy',s2)
-
+
assert s1.intersection(s2) == set([inst])
assert (s1 - s2) == set()
assert (s2 - s1) == set()
-
+
s1.difference_update(s2)
assert s1 == set()
-
-
-
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
