[pypy-commit] pypy py3k: kill longs, unicode, range() --> list(range())

[antocuni]

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: py3k
Changeset: r53863:03caac737b17
Date: 2012-03-21 12:19 +0100
http://bitbucket.org/pypy/pypy/changeset/03caac737b17/

Log:	kill longs, unicode, range() --> list(range())

diff --git a/pypy/objspace/std/test/test_obj.py b/pypy/objspace/std/test/test_obj.py
--- a/pypy/objspace/std/test/test_obj.py
+++ b/pypy/objspace/std/test/test_obj.py
@@ -183,18 +183,17 @@
         if self.cpython_apptest:
             skip("cpython behaves differently")
         import sys
-        l = range(-10, 10)
+        l = list(range(-10, 10))
         for i in range(10):
             l.append(float(i))
             l.append(i + 0.1)
-            l.append(long(i))
             l.append(i + sys.maxint)
             l.append(i - sys.maxint)
             l.append(i + 1j)
             l.append(1 + i * 1j)
             s = str(i)
             l.append(s)
-            u = unicode(s)
+            u = bytes(s, 'ascii')
             l.append(u)
         l.append(-0.0)
         l.append(None)
@@ -202,7 +201,7 @@
         l.append(False)
         s = "s"
         l.append(s)
-        s = u"s"
+        s = b"s"
         l.append(s)
 
         for i, a in enumerate(l):
@@ -237,7 +236,7 @@
                     assert a == b
 
     def test_identity_bug(self):
-        x = 0x4000000000000000L
+        x = 0x4000000000000000
         y = 2j
         assert id(x) != id(y)