[pypy-commit] pypy py3k: More xrange->range renames

[amauryfa]

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3k
Changeset: r47991:c109778c3305
Date: 2011-10-12 22:19 +0200
http://bitbucket.org/pypy/pypy/changeset/c109778c3305/

Log:	More xrange->range renames

diff --git a/pypy/module/__builtin__/test/test_functional.py b/pypy/module/__builtin__/test/test_functional.py
--- a/pypy/module/__builtin__/test/test_functional.py
+++ b/pypy/module/__builtin__/test/test_functional.py
@@ -119,47 +119,47 @@
                return i * 10
        assert filter(lambda x: x != 20, T("abcd")) == (0, 10, 30)
 
-class AppTestXRange:
-   def test_xrange(self):
-      x = xrange(2, 9, 3)
+class AppTestRange:
+   def test_range(self):
+      x = range(2, 9, 3)
       assert x[1] == 5
       assert len(x) == 3
       assert list(x) == [2, 5, 8]
-      # test again, to make sure that xrange() is not its own iterator
+      # test again, to make sure that range() is not its own iterator
       assert list(x) == [2, 5, 8]
 
-   def test_xrange_iter(self):
-      x = xrange(2, 9, 3)
+   def test_range_iter(self):
+      x = range(2, 9, 3)
       it = iter(x)
       assert iter(it) is it
       assert it.next() == 2
       assert it.next() == 5
       assert it.next() == 8
       raises(StopIteration, it.next)
-      # test again, to make sure that xrange() is not its own iterator
+      # test again, to make sure that range() is not its own iterator
       assert iter(x).next() == 2
 
-   def test_xrange_object_with___int__(self):
+   def test_range_object_with___int__(self):
        class A(object):
           def __int__(self):
              return 5
 
-       assert list(xrange(A())) == [0, 1, 2, 3, 4]
-       assert list(xrange(0, A())) == [0, 1, 2, 3, 4]
-       assert list(xrange(0, 10, A())) == [0, 5]
+       assert list(range(A())) == [0, 1, 2, 3, 4]
+       assert list(range(0, A())) == [0, 1, 2, 3, 4]
+       assert list(range(0, 10, A())) == [0, 5]
  
-   def test_xrange_float(self):
-      assert list(xrange(0.1, 2.0, 1.1)) == [0, 1]
+   def test_range_float(self):
+      assert list(range(0.1, 2.0, 1.1)) == [0, 1]
 
-   def test_xrange_long(self):
+   def test_range_long(self):
        import sys
        a = long(10 * sys.maxint)
-       raises(OverflowError, xrange, a)
-       raises(OverflowError, xrange, 0, a)
-       raises(OverflowError, xrange, 0, 1, a)
+       raises(OverflowError, range, a)
+       raises(OverflowError, range, 0, a)
+       raises(OverflowError, range, 0, 1, a)
 
-   def test_xrange_reduce(self):
-      x = xrange(2, 9, 3)
+   def test_range_reduce(self):
+      x = range(2, 9, 3)
       callable, args = x.__reduce__()
       y = callable(*args)
       assert list(y) == list(x)
diff --git a/pypy/module/_pickle_support/__init__.py b/pypy/module/_pickle_support/__init__.py
--- a/pypy/module/_pickle_support/__init__.py
+++ b/pypy/module/_pickle_support/__init__.py
@@ -19,7 +19,7 @@
         'frame_new'    : 'maker.frame_new',
         'traceback_new' : 'maker.traceback_new',
         'generator_new' : 'maker.generator_new',
-        'xrangeiter_new': 'maker.xrangeiter_new',
+        'rangeiter_new': 'maker.rangeiter_new',
         'builtin_code': 'maker.builtin_code',
         'builtin_function' : 'maker.builtin_function',
         'enumerate_new': 'maker.enumerate_new',
diff --git a/pypy/module/_pickle_support/maker.py b/pypy/module/_pickle_support/maker.py
--- a/pypy/module/_pickle_support/maker.py
+++ b/pypy/module/_pickle_support/maker.py
@@ -67,9 +67,9 @@
     return space.wrap(new_generator)
 
 @unwrap_spec(current=int, remaining=int, step=int)
-def xrangeiter_new(space, current, remaining, step):
-    from pypy.module.__builtin__.functional import W_XRangeIterator
-    new_iter = W_XRangeIterator(space, current, remaining, step)
+def rangeiter_new(space, current, remaining, step):
+    from pypy.module.__builtin__.functional import W_RangeIterator
+    new_iter = W_RangeIterator(space, current, remaining, step)
     return space.wrap(new_iter)
 
 @unwrap_spec(identifier=str)
diff --git a/pypy/objspace/std/test/test_index.py b/pypy/objspace/std/test/test_index.py
--- a/pypy/objspace/std/test/test_index.py
+++ b/pypy/objspace/std/test/test_index.py
@@ -269,16 +269,16 @@
         self.w_const = self.space.appexec([], """(): return unicode""")
 
 
-class AppTest_XRangeTestCase:
+class AppTest_RangeTestCase:
 
-    def test_xrange(self):
+    def test_range(self):
         class newstyle(object):
             def __index__(self):
                 return self.ind
         n = newstyle()
         n.ind = 5
-        assert xrange(1, 20)[n] == 6
-        assert xrange(1, 20).__getitem__(n) == 6
+        assert range(1, 20)[n] == 6
+        assert range(1, 20).__getitem__(n) == 6
 
 class AppTest_OverflowTestCase: