Browse Source

uses xrange for py2 and range for py3

Keith Newman 10 years ago
parent
commit
fcb3414c06
1 changed files with 5 additions and 2 deletions
  1. 5 2
      frameworks/Python/cherrypy/app.py

+ 5 - 2
frameworks/Python/cherrypy/app.py

@@ -1,4 +1,5 @@
 import os
 import os
+import sys
 from functools import partial
 from functools import partial
 from operator import attrgetter
 from operator import attrgetter
 from random import randint
 from random import randint
@@ -11,6 +12,8 @@ from sqlalchemy.types import String, Integer
 
 
 Base = declarative_base()
 Base = declarative_base()
 
 
+if sys.version_info[0] == 3:
+  xrange = range
 
 
 def getQueryNum(queryString):
 def getQueryNum(queryString):
   try:
   try:
@@ -70,7 +73,7 @@ class CherryPyBenchmark(object):
 
 
     rp = partial(randint, 1, 10000)
     rp = partial(randint, 1, 10000)
     get = cherrypy.request.db.query(World).get
     get = cherrypy.request.db.query(World).get
-    worlds = [get(rp()).serialize() for _ in range(num_queries)]
+    worlds = [get(rp()).serialize() for _ in xrange(num_queries)]
     return worlds
     return worlds
 
 
   @cherrypy.expose
   @cherrypy.expose
@@ -85,7 +88,7 @@ class CherryPyBenchmark(object):
 
 
     worlds = []
     worlds = []
     rp = partial(randint, 1, 10000)
     rp = partial(randint, 1, 10000)
-    ids = [rp() for _ in range(num_queries)]
+    ids = [rp() for _ in xrange(num_queries)]
     ids.sort() # To avoid deadlock
     ids.sort() # To avoid deadlock
     for id in ids:
     for id in ids:
       world = cherrypy.request.db.query(World).get(id)
       world = cherrypy.request.db.query(World).get(id)