First attempt to port the repo from python2 to python3 with 2to3

grumpy-runtime-src/benchmarks/bm_call_method.py

@@ -110,7 +110,7 @@ def qux(self):
 
 def BenchmarkCallMethod(b):
   f = Foo()
-  for _ in xrange(b.N):
+  for _ in range(b.N):
     # 20 calls
     f.foo(1, 2, 3, 4)
     f.foo(1, 2, 3, 4)

grumpy-runtime-src/benchmarks/bm_call_simple.py

@@ -111,7 +111,7 @@ def qux():
 
 
 def BenchmarkCallSimple(b):
-  for _ in xrange(b.N):
+  for _ in range(b.N):
     # 20 calls
     foo(1, 2, 3, 4)
     foo(1, 2, 3, 4)

grumpy-runtime-src/benchmarks/call.py

@@ -22,42 +22,42 @@
 def BenchmarkCallNoArgs(b):
   def Foo():
     pass
-  for _ in xrange(b.N):
+  for _ in range(b.N):
     Foo()
 
 
 def BenchmarkCallPositionalArgs(b):
   def Foo(a, b, c):
     pass
-  for _ in xrange(b.N):
+  for _ in range(b.N):
     Foo(1, 2, 3)
 
 
 def BenchmarkCallKeywords(b):
   def Foo(a, b, c):
     pass
-  for _ in xrange(b.N):
+  for _ in range(b.N):
     Foo(a=1, b=2, c=3)
 
 
 def BenchmarkCallDefaults(b):
   def Foo(a=1, b=2, c=3):
     pass
-  for _ in xrange(b.N):
+  for _ in range(b.N):
     Foo()
 
 
 def BenchmarkCallVarArgs(b):
   def Foo(*args):
     pass
-  for _ in xrange(b.N):
+  for _ in range(b.N):
     Foo(1, 2, 3)
 
 
 def BenchmarkCallKwargs(b):
   def Foo(**kwargs):
     pass
-  for _ in xrange(b.N):
+  for _ in range(b.N):
     Foo(a=1, b=2, c=3)
 
 

grumpy-runtime-src/benchmarks/comprehension.py

@@ -21,23 +21,23 @@
 
 def BenchmarkGeneratorExpCreate(b):
   l = []
-  for _ in xrange(b.N):
+  for _ in range(b.N):
     (x for x in l)  # pylint: disable=pointless-statement
 
 
 def BenchmarkGeneratorExpIterate(b):
-  for _ in (x for x in xrange(b.N)):
+  for _ in (x for x in range(b.N)):
     pass
 
 
 def BenchmarkListCompCreate(b):
-  for _ in xrange(b.N):
-    [x for x in xrange(1000)]  # pylint: disable=expression-not-assigned
+  for _ in range(b.N):
+    [x for x in range(1000)]  # pylint: disable=expression-not-assigned
 
 
 def BenchmarkDictCompCreate(b):
-  for _ in xrange(b.N):
-    {x: x for x in xrange(1000)}  # pylint: disable=expression-not-assigned
+  for _ in range(b.N):
+    {x: x for x in list(range(1000))}  # pylint: disable=expression-not-assigned
 
 
 if __name__ == '__main__':

grumpy-runtime-src/benchmarks/concurrent.py

@@ -41,10 +41,10 @@ def Benchmark(b):  # pylint: disable=missing-docstring
     e = threading.Event()
     def Target():
       e.wait()
-      for _ in xrange(b.N / p):
+      for _ in range(b.N / p):
         work_func(*args)
     threads = []
-    for _ in xrange(p):
+    for _ in range(p):
       t = threading.Thread(target=Target)
       t.start()
       threads.append(t)
@@ -56,7 +56,7 @@ def Target():
 
 
 def _RegisterBenchmarks():
-  for p in xrange(1, 13):
+  for p in range(1, 13):
     for work_func, arg in _WORKLOADS:
       name = 'Benchmark' + work_func.__name__
       if p > 1:

grumpy-runtime-src/benchmarks/dict.py

@@ -20,43 +20,43 @@
 
 
 def BenchmarkDictCreate(b):  
-  for _ in xrange(b.N):
+  for _ in range(b.N):
     d = {'one': 1, 'two': 2, 'three': 3}
 
 
 def BenchmarkDictCreateFunc(b):  
-  for _ in xrange(b.N):
+  for _ in range(b.N):
     d = dict(one=1, two=2, three=3)
 
 
 def BenchmarkDictGetItem(b):
   d = {42: 123}
-  for _ in xrange(b.N):
+  for _ in range(b.N):
     d[42]
 
 
 def BenchmarkDictStringOnlyGetItem(b):
   d = {'foo': 123}
-  for _ in xrange(b.N):
+  for _ in range(b.N):
     d['foo']
 
 
 def BenchmarkDictSetItem(b):
   d = {}
-  for _ in xrange(b.N):
+  for _ in range(b.N):
     d[42] = 123
 
 
 def BenchmarkDictStringOnlySetItem(b):
   d = {}
-  for _ in xrange(b.N):
+  for _ in range(b.N):
     d['foo'] = 123
 
 
 def BenchmarkHashStrCached(b):
   """Hashes the same value repeatedly to exercise any hash caching logic."""
   h = hash  # Prevent builtins lookup each iteration.
-  for _ in xrange(b.N):
+  for _ in range(b.N):
     h('foobarfoobarfoobar')
 
 

grumpy-runtime-src/benchmarks/generator.py

@@ -19,7 +19,7 @@
 
 def BenchmarkGeneratorIterate(b):
   def Gen(n):
-    for i in xrange(n):
+    for i in range(n):
       yield i
   for _ in Gen(b.N):
     pass
@@ -28,7 +28,7 @@ def Gen(n):
 def BenchmarkGeneratorCreate(b):
   def Gen():
     yield 1
-  for _ in xrange(b.N):
+  for _ in range(b.N):
     Gen()
 
 

grumpy-runtime-src/benchmarks/list.py

@@ -21,19 +21,19 @@
 
 def BenchmarkListGetItem(b):
   l = [1, 3, 9]
-  for _ in xrange(b.N):
+  for _ in range(b.N):
     l[2]
 
 
 def BenchmarkListContains3(b):
   l = [1, 3, 9]
-  for _ in xrange(b.N):
+  for _ in range(b.N):
     9 in l
 
 
 def BenchmarkListContains10(b):
-  l = range(10)
-  for _ in xrange(b.N):
+  l = list(range(10))
+  for _ in range(b.N):
     9 in l
 
 

grumpy-runtime-src/benchmarks/loop.py

@@ -18,7 +18,7 @@
 
 
 def BenchmarkForXRange(b):
-  for _ in xrange(b.N):
+  for _ in range(b.N):
     pass
 
 
@@ -29,10 +29,10 @@ def BenchmarkWhileCounter(b):
 
 
 def BenchmarkWhileXRange(b):
-  i = iter(xrange(b.N))
+  i = iter(list(range(b.N)))
   try:
     while True:
-      i.next()
+      next(i)
   except StopIteration:
     pass
 

grumpy-runtime-src/benchmarks/tuple.py

@@ -21,19 +21,19 @@
 
 def BenchmarkTupleGetItem(b):
   l = (1, 3, 9)
-  for _ in xrange(b.N):
+  for _ in range(b.N):
     l[2]
 
 
 def BenchmarkTupleContains3(b):
   t = (1, 3, 9)
-  for _ in xrange(b.N):
+  for _ in range(b.N):
     9 in t
 
 
 def BenchmarkTupleContains10(b):
   t = tuple(range(10))
-  for _ in xrange(b.N):
+  for _ in range(b.N):
     9 in t