Author: Maciej Fijalkowski <fij...@gmail.com>
Branch:
Changeset: r45373:582113929b62
Date: 2011-07-06 20:20 +0200
http://bitbucket.org/pypy/pypy/changeset/582113929b62/
Log: merge
diff --git a/lib-python/2.7/test/test_sets.py
b/lib-python/modified-2.7/test/test_sets.py
copy from lib-python/2.7/test/test_sets.py
copy to lib-python/modified-2.7/test/test_sets.py
--- a/lib-python/2.7/test/test_sets.py
+++ b/lib-python/modified-2.7/test/test_sets.py
@@ -686,7 +686,9 @@
set_list = sorted(self.set)
self.assertEqual(len(dup_list), len(set_list))
for i, el in enumerate(dup_list):
- self.assertIs(el, set_list[i])
+ # Object identity is not guarnteed for immutable objects, so we
+ # can't use assertIs here.
+ self.assertEqual(el, set_list[i])
def test_deep_copy(self):
dup = copy.deepcopy(self.set)
diff --git a/pypy/rpython/memory/gc/minimark.py
b/pypy/rpython/memory/gc/minimark.py
--- a/pypy/rpython/memory/gc/minimark.py
+++ b/pypy/rpython/memory/gc/minimark.py
@@ -256,10 +256,6 @@
# (may) contain a pointer to a young object. Populated by
# the write barrier: when we clear GCFLAG_TRACK_YOUNG_PTRS, we
# add it to this list.
- class Cls(self.AddressStack):
- def append(self2, addr):
- assert addr not in self2.tolist()
- self.AddressStack.append(self2, addr)
self.objects_pointing_to_young = self.AddressStack()
#
# Similar to 'objects_pointing_to_young', but lists objects
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
