Skip to content

Commit f0dbceb

Browse files
committed
First attempt to port the repo from python2 to python3
1 parent 6fc336a commit f0dbceb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+1047
-735
lines changed

grumpy-runtime-src/benchmarks/bm_call_method.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ def qux(self):
110110

111111
def BenchmarkCallMethod(b):
112112
f = Foo()
113-
for _ in xrange(b.N):
113+
for _ in range(b.N):
114114
# 20 calls
115115
f.foo(1, 2, 3, 4)
116116
f.foo(1, 2, 3, 4)

grumpy-runtime-src/benchmarks/bm_call_simple.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def qux():
111111

112112

113113
def BenchmarkCallSimple(b):
114-
for _ in xrange(b.N):
114+
for _ in range(b.N):
115115
# 20 calls
116116
foo(1, 2, 3, 4)
117117
foo(1, 2, 3, 4)

grumpy-runtime-src/benchmarks/call.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,42 +22,42 @@
2222
def BenchmarkCallNoArgs(b):
2323
def Foo():
2424
pass
25-
for _ in xrange(b.N):
25+
for _ in range(b.N):
2626
Foo()
2727

2828

2929
def BenchmarkCallPositionalArgs(b):
3030
def Foo(a, b, c):
3131
pass
32-
for _ in xrange(b.N):
32+
for _ in range(b.N):
3333
Foo(1, 2, 3)
3434

3535

3636
def BenchmarkCallKeywords(b):
3737
def Foo(a, b, c):
3838
pass
39-
for _ in xrange(b.N):
39+
for _ in range(b.N):
4040
Foo(a=1, b=2, c=3)
4141

4242

4343
def BenchmarkCallDefaults(b):
4444
def Foo(a=1, b=2, c=3):
4545
pass
46-
for _ in xrange(b.N):
46+
for _ in range(b.N):
4747
Foo()
4848

4949

5050
def BenchmarkCallVarArgs(b):
5151
def Foo(*args):
5252
pass
53-
for _ in xrange(b.N):
53+
for _ in range(b.N):
5454
Foo(1, 2, 3)
5555

5656

5757
def BenchmarkCallKwargs(b):
5858
def Foo(**kwargs):
5959
pass
60-
for _ in xrange(b.N):
60+
for _ in range(b.N):
6161
Foo(a=1, b=2, c=3)
6262

6363

grumpy-runtime-src/benchmarks/comprehension.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,23 @@
2121

2222
def BenchmarkGeneratorExpCreate(b):
2323
l = []
24-
for _ in xrange(b.N):
24+
for _ in range(b.N):
2525
(x for x in l) # pylint: disable=pointless-statement
2626

2727

2828
def BenchmarkGeneratorExpIterate(b):
29-
for _ in (x for x in xrange(b.N)):
29+
for _ in (x for x in range(b.N)):
3030
pass
3131

3232

3333
def BenchmarkListCompCreate(b):
34-
for _ in xrange(b.N):
35-
[x for x in xrange(1000)] # pylint: disable=expression-not-assigned
34+
for _ in range(b.N):
35+
[x for x in range(1000)] # pylint: disable=expression-not-assigned
3636

3737

3838
def BenchmarkDictCompCreate(b):
39-
for _ in xrange(b.N):
40-
{x: x for x in xrange(1000)} # pylint: disable=expression-not-assigned
39+
for _ in range(b.N):
40+
{x: x for x in range(1000)} # pylint: disable=expression-not-assigned
4141

4242

4343
if __name__ == '__main__':

grumpy-runtime-src/benchmarks/concurrent.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ def Benchmark(b): # pylint: disable=missing-docstring
4141
e = threading.Event()
4242
def Target():
4343
e.wait()
44-
for _ in xrange(b.N / p):
44+
for _ in range(b.N / p):
4545
work_func(*args)
4646
threads = []
47-
for _ in xrange(p):
47+
for _ in range(p):
4848
t = threading.Thread(target=Target)
4949
t.start()
5050
threads.append(t)
@@ -56,7 +56,7 @@ def Target():
5656

5757

5858
def _RegisterBenchmarks():
59-
for p in xrange(1, 13):
59+
for p in range(1, 13):
6060
for work_func, arg in _WORKLOADS:
6161
name = 'Benchmark' + work_func.__name__
6262
if p > 1:

grumpy-runtime-src/benchmarks/dict.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,43 +20,43 @@
2020

2121

2222
def BenchmarkDictCreate(b):
23-
for _ in xrange(b.N):
23+
for _ in range(b.N):
2424
d = {'one': 1, 'two': 2, 'three': 3}
2525

2626

2727
def BenchmarkDictCreateFunc(b):
28-
for _ in xrange(b.N):
28+
for _ in range(b.N):
2929
d = dict(one=1, two=2, three=3)
3030

3131

3232
def BenchmarkDictGetItem(b):
3333
d = {42: 123}
34-
for _ in xrange(b.N):
34+
for _ in range(b.N):
3535
d[42]
3636

3737

3838
def BenchmarkDictStringOnlyGetItem(b):
3939
d = {'foo': 123}
40-
for _ in xrange(b.N):
40+
for _ in range(b.N):
4141
d['foo']
4242

4343

4444
def BenchmarkDictSetItem(b):
4545
d = {}
46-
for _ in xrange(b.N):
46+
for _ in range(b.N):
4747
d[42] = 123
4848

4949

5050
def BenchmarkDictStringOnlySetItem(b):
5151
d = {}
52-
for _ in xrange(b.N):
52+
for _ in range(b.N):
5353
d['foo'] = 123
5454

5555

5656
def BenchmarkHashStrCached(b):
5757
"""Hashes the same value repeatedly to exercise any hash caching logic."""
5858
h = hash # Prevent builtins lookup each iteration.
59-
for _ in xrange(b.N):
59+
for _ in range(b.N):
6060
h('foobarfoobarfoobar')
6161

6262

grumpy-runtime-src/benchmarks/generator.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
def BenchmarkGeneratorIterate(b):
2121
def Gen(n):
22-
for i in xrange(n):
22+
for i in range(n):
2323
yield i
2424
for _ in Gen(b.N):
2525
pass
@@ -28,7 +28,7 @@ def Gen(n):
2828
def BenchmarkGeneratorCreate(b):
2929
def Gen():
3030
yield 1
31-
for _ in xrange(b.N):
31+
for _ in range(b.N):
3232
Gen()
3333

3434

grumpy-runtime-src/benchmarks/list.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@
2121

2222
def BenchmarkListGetItem(b):
2323
l = [1, 3, 9]
24-
for _ in xrange(b.N):
24+
for _ in range(b.N):
2525
l[2]
2626

2727

2828
def BenchmarkListContains3(b):
2929
l = [1, 3, 9]
30-
for _ in xrange(b.N):
30+
for _ in range(b.N):
3131
9 in l
3232

3333

3434
def BenchmarkListContains10(b):
35-
l = range(10)
36-
for _ in xrange(b.N):
35+
l = list(range(10))
36+
for _ in range(b.N):
3737
9 in l
3838

3939

grumpy-runtime-src/benchmarks/loop.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919

2020
def BenchmarkForXRange(b):
21-
for _ in xrange(b.N):
21+
for _ in range(b.N):
2222
pass
2323

2424

@@ -29,10 +29,10 @@ def BenchmarkWhileCounter(b):
2929

3030

3131
def BenchmarkWhileXRange(b):
32-
i = iter(xrange(b.N))
32+
i = iter(range(b.N))
3333
try:
3434
while True:
35-
i.next()
35+
next(i)
3636
except StopIteration:
3737
pass
3838

grumpy-runtime-src/benchmarks/tuple.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@
2121

2222
def BenchmarkTupleGetItem(b):
2323
l = (1, 3, 9)
24-
for _ in xrange(b.N):
24+
for _ in range(b.N):
2525
l[2]
2626

2727

2828
def BenchmarkTupleContains3(b):
2929
t = (1, 3, 9)
30-
for _ in xrange(b.N):
30+
for _ in range(b.N):
3131
9 in t
3232

3333

3434
def BenchmarkTupleContains10(b):
3535
t = tuple(range(10))
36-
for _ in xrange(b.N):
36+
for _ in range(b.N):
3737
9 in t
3838

3939

grumpy-runtime-src/lib/cStringIO.py

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)