Merge pull request #1327 from josephok/master

some modifications in demos/benchmark so it can run both in py2 and py3
tornadoweb · Feb 7, 2015 · db88a65 · db88a65
2 parents 30631d4 + c34b4f7
commit db88a65
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/demos/benchmark/benchmark.py b/demos/benchmark/benchmark.py
@@ -22,6 +22,11 @@
 import signal
 import subprocess
 
+try:
+    xrange
+except NameError:
+    xrange = range
+
 # choose a random port to avoid colliding with TIME_WAIT sockets left over
 # from previous runs.
 define("min_port", type=int, default=8000)

diff --git a/demos/benchmark/gen_benchmark.py b/demos/benchmark/gen_benchmark.py
@@ -38,10 +38,10 @@ def main():
     parse_command_line()
     t = Timer(e1)
     results = t.timeit(options.num) / options.num
-    print 'engine: %0.3f ms per iteration' % (results * 1000)
+    print('engine: %0.3f ms per iteration' % (results * 1000))
     t = Timer(c1)
     results = t.timeit(options.num) / options.num
-    print 'coroutine: %0.3f ms per iteration' % (results * 1000)
+    print('coroutine: %0.3f ms per iteration' % (results * 1000))
 
 if __name__ == '__main__':
     main()
diff --git a/demos/benchmark/stack_context_benchmark.py b/demos/benchmark/stack_context_benchmark.py
@@ -68,7 +68,7 @@ def main():
         'ExceptionBenchmark().call_wrapped(500)',
         ]
     for cmd in cmds:
-        print cmd
+        print(cmd)
         subprocess.check_call(base_cmd + [cmd])
 
 if __name__ == '__main__':

diff --git a/demos/benchmark/template_benchmark.py b/demos/benchmark/template_benchmark.py
@@ -57,11 +57,11 @@ def render():
 def main():
     parse_command_line()
     if options.dump:
-        print tmpl.code
+        print(tmpl.code)
         sys.exit(0)
     t = Timer(render)
     results = t.timeit(options.num) / options.num
-    print '%0.3f ms per iteration' % (results*1000)
+    print('%0.3f ms per iteration' % (results*1000))
 
 if __name__ == '__main__':
     main()