Author: Philip Jenvey <pjen...@underboss.org>
Branch: py3k
Changeset: r69748:19a9d0a0df2f
Date: 2014-03-05 17:31 -0800
http://bitbucket.org/pypy/pypy/changeset/19a9d0a0df2f/
Log: adapt to py3k and kill new withrangelist tests
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
@@ -527,13 +527,13 @@
assert l == list(assignment)
def test_range_init(self):
- x = range(5,1)
+ x = list(range(5,1))
assert x == []
- x = range(1,10)
+ x = list(range(1,10))
x[22:0:-1] == range(1,10)
- r = range(10, 10)
+ r = list(range(10, 10))
assert len(r) == 0
assert list(reversed(r)) == []
assert r[:] == []
@@ -619,9 +619,9 @@
l.sort(key=lower)
assert l == ['a']
- r = range(10)
+ r = list(range(10))
r.sort(key=lambda x: -x)
- assert r == range(9, -1, -1)
+ assert r == list(range(9, -1, -1))
def test_sort_reversed(self):
l = list(range(10))
@@ -647,7 +647,7 @@
assert l == ["a", "b", "c", "d"]
def test_sort_range(self):
- l = range(3, 10, 3)
+ l = list(range(3, 10, 3))
l.sort()
assert l == [3, 6, 9]
l.sort(reverse=True)
@@ -709,7 +709,7 @@
l[0] = "2"
assert l == ["2",3]
- l = range(3)
+ l = list(range(3))
l[0] = 1
assert l == [1,1,2]
@@ -783,7 +783,7 @@
assert x[10:0] == []
assert x[10:0:None] == []
- x = range(1,5)
+ x = list(range(1,5))
assert x[10:0] == []
assert x[10:0:None] == []
@@ -794,7 +794,7 @@
assert x[-1:10:None] == [4]
def test_getslice_range_backwards(self):
- x = range(1,10)
+ x = list(range(1,10))
assert x[22:-10] == []
assert x[22:-10:-1] == [9,8,7,6,5,4,3,2,1]
assert x[10:3:-1] == [9,8,7,6,5]
@@ -834,7 +834,7 @@
l1 += [0]
assert l1 == ['a', 'b', 'c', 0]
- r1 = r2 = range(5)
+ r1 = r2 = list(range(5))
assert r1 is r2
r1 += [15]
assert r1 is r2
@@ -985,7 +985,7 @@
l = []
l2 = range(3)
- l.__setslice__(0,3,l2)
+ l.__setitem__(slice(0,3),l2)
assert l == [0,1,2]
def test_assign_extended_slice(self):
@@ -1082,19 +1082,19 @@
l.append(4.4)
assert l == [1.1, 2.2, 3.3, 4.4]
- l = range(4)
+ l = list(range(4))
l.append(4)
- assert l == range(5)
+ assert l == list(range(5))
- l = range(5)
+ l = list(range(5))
l.append(26)
assert l == [0,1,2,3,4,26]
- l = range(5)
+ l = list(range(5))
l.append("a")
assert l == [0,1,2,3,4,"a"]
- l = range(5)
+ l = list(range(5))
l.append(5)
assert l == [0,1,2,3,4,5]
@@ -1125,7 +1125,7 @@
l.insert(0,"a")
assert l == ["a", 1, 2, 3]
- l = range(3)
+ l = list(range(3))
l.insert(1,5)
assert l == [0,5,1,2]
@@ -1212,11 +1212,11 @@
c.reverse()
assert ''.join(c) == 'dlrow olleh'
- l = range(3)
+ l = list(range(3))
l.reverse()
assert l == [2,1,0]
- r = range(3)
+ r = list(range(3))
r[0] = 1
assert r == [1, 1, 2]
r.reverse()
@@ -1498,113 +1498,6 @@
assert item11 in l[::11]
-class AppTestListObjectWithRangeList(AppTestListObject):
- """Run the list object tests with range lists enabled. Tests should go in
- AppTestListObject so they can be run -A against CPython as well.
- """
- spaceconfig = {"objspace.std.withrangelist": True}
-
-
-class AppTestRangeListForcing:
- """Tests for range lists that test forcing. Regular tests should go in
- AppTestListObject so they can be run -A against CPython as well. Separate
- from AppTestListObjectWithRangeList so we don't silently overwrite tests
- with the same names.
- """
- spaceconfig = {"objspace.std.withrangelist": True}
-
- def setup_class(cls):
- if cls.runappdirect:
- py.test.skip("__pypy__.internal_repr() cannot be used to see "
- "if a range list was forced on top of pypy-c")
- cls.w_not_forced = cls.space.appexec([], """():
- import __pypy__
- def f(r):
- return (isinstance(r, list) and
- "RangeListStrategy" in __pypy__.internal_repr(r))
- return f
- """)
-
- def test_simple(self):
- result = []
- r = range(1, 8, 2)
- for i in r:
- result.append(i)
- assert result == [1, 3, 5, 7]
- assert self.not_forced(r)
-
- def test_getitem_slice(self):
- result = []
- r = range(1, 100, 2)
- for i in r[10:15]:
- result.append(i)
- assert result == [21, 23, 25, 27, 29]
- assert not self.not_forced(r)
-
- def test_getitem_extended_slice(self):
- result = []
- r = range(1, 100, 2)
- for i in r[40:30:-2]:
- result.append(i)
- assert result == [81, 77, 73, 69, 65]
- assert not self.not_forced(r)
-
- def test_repr(self):
- r = range(5)
- assert repr(r) == "[0, 1, 2, 3, 4]"
- assert self.not_forced(r)
-
- def test_force(self):
- r = range(10)
- r[0] = 42
- assert not self.not_forced(r)
- assert r == [42, 1, 2, 3, 4, 5, 6, 7, 8, 9]
-
- def test_reverse(self):
- r = range(10)
- r.reverse()
- assert not self.not_forced(r)
- assert r == range(9, -1, -1)
-
- def test_pop(self):
- # RangeListStrategy
- r = range(1, 10)
- res = r.pop()
- assert res == 9
- assert self.not_forced(r)
- assert repr(r) == repr(range(1, 9))
- res = r.pop(0)
- assert res == 1
- assert self.not_forced(r)
- assert repr(r) == repr(range(2, 9))
- res = r.pop(len(r) - 1)
- assert res == 8
- assert self.not_forced(r)
- assert repr(r) == repr(range(2, 8))
- res = r.pop(2)
- assert res == 4
- assert not self.not_forced(r)
- assert r == [2, 3, 5, 6, 7]
- res = r.pop(2)
- assert res == 5
- assert not self.not_forced(r)
- assert r == [2, 3, 6, 7]
-
- # SimpleRangeListStrategy
- r = range(10)
- res = r.pop()
- assert res == 9
- assert self.not_forced(r)
- res = r.pop()
- assert res == 8
- assert repr(r) == repr(range(8))
- assert self.not_forced(r)
- res = r.pop(0)
- assert res == 0
- assert not self.not_forced(r)
- assert r == [1, 2, 3, 4, 5, 6, 7]
-
-
class AppTestWithoutStrategies:
spaceconfig = {"objspace.std.withliststrategies": False}
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
