Commit 860b54b1 authored by Brian Kearns's avatar Brian Kearns

port a few small no-op cleanups from py3k

parent 22a465d4
......@@ -6,7 +6,7 @@
# When all tests work, this branch will be merged
# and the branch stage 2 is started, where we remove this patch.
import sys
if hasattr(sys, "maxsize"):
if hasattr(sys, "maxint") and hasattr(sys, "maxsize"):
if sys.maxint != sys.maxsize:
sys.maxint = sys.maxsize
import warnings
......
......@@ -23,7 +23,7 @@ def braindead_deindent(self):
py.code.Source.deindent = braindead_deindent
def pytest_report_header():
return "pytest-%s from %s" %(pytest.__version__, pytest.__file__)
return "pytest-%s from %s" % (pytest.__version__, pytest.__file__)
def pytest_addhooks(pluginmanager):
from rpython.conftest import LeakFinder
......
......@@ -120,8 +120,7 @@ def print_info(*args):
except AttributeError:
print >> sys.stderr, 'no translation information found'
else:
optitems = options.items()
optitems.sort()
optitems = sorted(options.items())
current = []
for key, value in optitems:
group = key.split('.')
......@@ -151,8 +150,7 @@ def _print_jit_help():
except ImportError:
print >> sys.stderr, "No jit support in %s" % (sys.executable,)
return
items = pypyjit.defaults.items()
items.sort()
items = sorted(pypyjit.defaults.items())
print 'Advanced JIT options: a comma-separated list of OPTION=VALUE:'
for key, value in items:
print
......
......@@ -23,7 +23,7 @@ __all__ = ['main']
# When all tests work, this branch will be merged
# and the branch stage 2 is started, where we remove this patch.
import sys
if hasattr(sys, "maxsize"):
if hasattr(sys, "maxint") and hasattr(sys, "maxsize"):
if sys.maxint != sys.maxsize:
sys.maxint = sys.maxsize
import warnings
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment