Author: Alex Gaynor <[email protected]>
Branch:
Changeset: r67141:70a0fb93833b
Date: 2013-09-29 21:49 -0700
http://bitbucket.org/pypy/pypy/changeset/70a0fb93833b/
Log: Probably we don't care about things that have been removed for
nearly a decade
diff --git a/pypy/module/__builtin__/test/test_builtin.py
b/pypy/module/__builtin__/test/test_builtin.py
--- a/pypy/module/__builtin__/test/test_builtin.py
+++ b/pypy/module/__builtin__/test/test_builtin.py
@@ -263,25 +263,9 @@
assert next(x) == 3
def test_xrange_args(self):
-## # xrange() attributes are deprecated and were removed in Python 2.3.
-## x = xrange(2)
-## assert x.start == 0
-## assert x.stop == 2
-## assert x.step == 1
-
-## x = xrange(2,10,2)
-## assert x.start == 2
-## assert x.stop == 10
-## assert x.step == 2
-
-## x = xrange(2.3, 10.5, 2.4)
-## assert x.start == 2
-## assert x.stop == 10
-## assert x.step == 2
-
raises(ValueError, xrange, 0, 1, 0)
- def test_xrange_repr(self):
+ def test_xrange_repr(self):
assert repr(xrange(1)) == 'xrange(1)'
assert repr(xrange(1,2)) == 'xrange(1, 2)'
assert repr(xrange(1,2,3)) == 'xrange(1, 4, 3)'
@@ -340,7 +324,7 @@
raises(TypeError, xrange, 1, 3+2j)
raises(TypeError, xrange, 1, 2, '1')
raises(TypeError, xrange, 1, 2, 3+2j)
-
+
def test_sorted(self):
l = []
sorted_l = sorted(l)
@@ -359,7 +343,7 @@
assert sorted_l is not l
assert sorted_l == ['C', 'b', 'a']
raises(TypeError, sorted, [], reverse=None)
-
+
def test_reversed_simple_sequences(self):
l = range(5)
rev = reversed(l)
@@ -375,8 +359,8 @@
return 42
obj = SomeClass()
assert reversed(obj) == 42
-
-
+
+
def test_cmp(self):
assert cmp(9,9) == 0
assert cmp(0,9) < 0
@@ -409,7 +393,7 @@
raises(RuntimeError, cmp, a, c)
# okay, now break the cycles
a.pop(); b.pop(); c.pop()
-
+
def test_coerce(self):
assert coerce(1, 2) == (1, 2)
assert coerce(1L, 2L) == (1L, 2L)
@@ -476,7 +460,7 @@
assert eval("1+2") == 3
assert eval(" \t1+2\n") == 3
assert eval("len([])") == 0
- assert eval("len([])", {}) == 0
+ assert eval("len([])", {}) == 0
# cpython 2.4 allows this (raises in 2.3)
assert eval("3", None, None) == 3
i = 4
@@ -694,15 +678,15 @@
w_value = space.getitem(w_dict, space.wrap('i'))
assert space.eq_w(w_value, space.wrap(42))
- def test_execfile_different_lineendings(self, space):
+ def test_execfile_different_lineendings(self, space):
from rpython.tool.udir import udir
d = udir.ensure('lineending', dir=1)
- dos = d.join('dos.py')
- f = dos.open('wb')
+ dos = d.join('dos.py')
+ f = dos.open('wb')
f.write("x=3\r\n\r\ny=4\r\n")
- f.close()
+ f.close()
space.appexec([space.wrap(str(dos))], """
- (filename):
+ (filename):
d = {}
execfile(filename, d)
assert d['x'] == 3
@@ -710,12 +694,12 @@
""")
unix = d.join('unix.py')
- f = unix.open('wb')
+ f = unix.open('wb')
f.write("x=5\n\ny=6\n")
- f.close()
+ f.close()
space.appexec([space.wrap(str(unix))], """
- (filename):
+ (filename):
d = {}
execfile(filename, d)
assert d['x'] == 5
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
