more refactoring

Author: cgl

grumpy-runtime-src/benchmarks/comprehension.py

@@ -37,7 +37,7 @@ def BenchmarkListCompCreate(b):
 
 def BenchmarkDictCompCreate(b):
   for _ in range(b.N):
-    {x: x for x in range(1000)}  # pylint: disable=expression-not-assigned
+    {x: x for x in list(range(1000))}  # pylint: disable=expression-not-assigned
 
 
 if __name__ == '__main__':

grumpy-runtime-src/benchmarks/loop.py

@@ -29,7 +29,7 @@ def BenchmarkWhileCounter(b):
 
 
 def BenchmarkWhileXRange(b):
-  i = iter(range(b.N))
+  i = iter(list(range(b.N)))
   try:
     while True:
       next(i)

grumpy-runtime-src/lib/cStringIO.py

@@ -291,14 +291,14 @@ def test():
     if f.getvalue() != text:
         raise RuntimeError('write failed')
     length = f.tell()
-    print('File length =', length)
+    print(('File length =', length))
     f.seek(len(lines[0]))
     f.write(lines[1])
     f.seek(0)
-    print('First line =', repr(f.readline()))
-    print('Position =', f.tell())
+    print(('First line =', repr(f.readline())))
+    print(('Position =', f.tell()))
     line = f.readline()
-    print('Second line =', repr(line))
+    print(('Second line =', repr(line)))
     f.seek(-len(line), 1)
     line2 = f.read(len(line))
     if line != line2:
@@ -310,13 +310,13 @@ def test():
     line2 = f.read()
     if line != line2:
         raise RuntimeError('bad result after seek back from EOF')
-    print('Read', len(list), 'more lines')
-    print('File length =', f.tell())
+    print(('Read', len(list), 'more lines'))
+    print(('File length =', f.tell()))
     if f.tell() != length:
         raise RuntimeError('bad length')
     f.truncate(length/2)
     f.seek(0, 2)
-    print('Truncated length =', f.tell())
+    print(('Truncated length =', f.tell()))
     if f.tell() != length/2:
         raise RuntimeError('truncate did not adjust length')
     f.close()

grumpy-runtime-src/lib/itertools.py

@@ -133,7 +133,7 @@ def imap(function, *iterables):
 
 def islice(iterable, *args):
   s = slice(*args)
-  it = iter(range(s.start or 0, s.stop or sys.maxsize, s.step or 1))
+  it = iter(list(range(s.start or 0, s.stop or sys.maxsize, s.step or 1)))
   nexti = next(it)
   for i, element in enumerate(iterable):
     if i == nexti:

grumpy-runtime-src/setup.py

@@ -86,7 +86,7 @@ def _glob_deep(directory, pattern, rmtree=None):
                 filename = os.path.join(root, basename)
                 for filtered_name in blacklisted:
                     if filtered_name in filename:
-                        print('Trying to rmtree', filename)
+                        print(('Trying to rmtree', filename))
                         shutil.rmtree(filename, ignore_errors=True)
                         continue  # Skip this blacklisted one.
                 yield filename

grumpy-runtime-src/testing/builtin_test.py

@@ -346,7 +346,7 @@ class Foo(object):
 assert list(map(str, (1, 2, 3))) == ["1", "2", "3"]
 # assert map(str, (1.0, 2.0, 3.0)) == ["1", "2", "3"]
 assert list(map(str, list(range(3)))) == ["0", "1", "2"]
-assert list(map(str, range(3))) == ["0", "1", "2"]
+assert list(map(str, list(range(3)))) == ["0", "1", "2"]
 assert list(map(int, ["1", "2", "3"])) == [1, 2, 3]
 assert list(map(int, "123")) == [1, 2, 3]
 assert list(map(int, {"1": "a", "2": "b"})) == [1, 2]

grumpy-runtime-src/testing/import_test.py

@@ -14,4 +14,4 @@
 
 import sys
 
-print(sys.maxsize)
+print((sys.maxsize))

grumpy-runtime-src/third_party/ouroboros/test/test_operator.py

@@ -158,7 +158,7 @@ def test_truediv(self):
 
     def test_getitem(self):
         #operator = self.module
-        a = range(10)
+        a = list(range(10))
         self.assertRaises(TypeError, operator.getitem)
         self.assertRaises(TypeError, operator.getitem, a, None)
         self.assertTrue(operator.getitem(a, 2) == 2)
@@ -240,8 +240,8 @@ def test_contains(self):
         #operator = self.module
         self.assertRaises(TypeError, operator.contains)
         self.assertRaises(TypeError, operator.contains, None, None)
-        self.assertTrue(operator.contains(range(4), 2))
-        self.assertFalse(operator.contains(range(4), 5))
+        self.assertTrue(operator.contains(list(range(4)), 2))
+        self.assertFalse(operator.contains(list(range(4)), 5))
 
     def test_setitem(self):
         #operator = self.module
@@ -377,7 +377,7 @@ def __getitem__(self, name):
                   [('orange', 1), ('banana', 2), ('apple', 3), ('pear', 5)])
 
         # multiple gets
-        data = list(map(str, range(20)))
+        data = list(map(str, list(range(20))))
         self.assertEqual(operator.itemgetter(2,10,5)(data), ('2', '10', '5'))
         self.assertRaises(TypeError, operator.itemgetter(2, 'x', 5), data)
 

grumpy-runtime-src/third_party/pypy/_collections.py

@@ -433,5 +433,5 @@ def __reduce__(self):
 
            This API is used by pickle.py and copy.py.
         """
-        return (type(self), (self.default_factory,), None, None, iter(self.items()))
+        return (type(self), (self.default_factory,), None, None, iter(list(self.items())))
 

grumpy-runtime-src/third_party/pypy/_csv.py

@@ -95,7 +95,7 @@ def __new__(cls, dialect, **kwargs):
 
             # Can we reuse this instance?
             if (isinstance(dialect, Dialect)
-                and all(value is None for value in iter(kwargs.values()))):
+                and all(value is None for value in iter(list(kwargs.values())))):
                 return dialect
 
         self = object.__new__(cls)