Author: Alex Gaynor <alex.gay...@gmail.com>
Branch: list-strategies
Changeset: r48765:a7d33918047a
Date: 2011-11-04 16:40 -0400
http://bitbucket.org/pypy/pypy/changeset/a7d33918047a/
Log: fix from merge
diff --git a/pypy/objspace/std/test/test_listobject.py
b/pypy/objspace/std/test/test_listobject.py
--- a/pypy/objspace/std/test/test_listobject.py
+++ b/pypy/objspace/std/test/test_listobject.py
@@ -413,8 +413,6 @@
assert not l.__contains__(-20)
assert not l.__contains__(-21)
-=======
->>>>>>> other
def test_call_list(self):
assert list('') == []
assert list('abc') == ['a', 'b', 'c']
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
