Author: mattip
Branch:
Changeset: r276:bdd2f0fc83b3
Date: 2014-09-23 21:28 +0300
http://bitbucket.org/pypy/benchmarks/changeset/bdd2f0fc83b3/
Log: fix for win32
diff --git a/benchmarks.py b/benchmarks.py
--- a/benchmarks.py
+++ b/benchmarks.py
@@ -91,7 +91,7 @@
else:
iteration_scaling = 1.0
_register_new_bm_twisted(name, 'twisted_' + name,
- globals(), bm_env={'PYTHONPATH': ':'.join(TWISTED)},
+ globals(), bm_env={'PYTHONPATH':
os.pathsep.join(TWISTED)},
iteration_scaling=iteration_scaling)
_register_new_bm('spitfire', 'spitfire', globals(),
diff --git a/own/pyflate-fast.py b/own/pyflate-fast.py
--- a/own/pyflate-fast.py
+++ b/own/pyflate-fast.py
@@ -645,7 +645,7 @@
def _main():
filename = os.path.join(os.path.dirname(__file__), "interpreter.tar.bz2")
- input = open(filename)
+ input = open(filename, 'rb')
field = RBitfield(input)
magic = field.readbits(16)
diff --git a/unladen_swallow/perf.py b/unladen_swallow/perf.py
--- a/unladen_swallow/perf.py
+++ b/unladen_swallow/perf.py
@@ -969,7 +969,7 @@
def MeasureRietveld(python, options):
- PYTHONPATH = ":".join([DJANGO_DIR,
+ PYTHONPATH = os.pathsep.join([DJANGO_DIR,
# These paths are lifted from
# lib/google_appengine.appcfg.py. Note that we use
# our own version of Django instead of Appengine's.
@@ -1406,7 +1406,7 @@
time it took to run the benchmark loop once; mem_usage is a list
of memory usage samples in kilobytes.
"""
- pypath = ":".join([Relative("lib/spambayes"), Relative("lib/lockfile")])
+ pypath = os.pathsep.join([Relative("lib/spambayes"),
Relative("lib/lockfile")])
bm_path = Relative("performance/bm_spambayes.py")
bm_env = {"PYTHONPATH": pypath}
return MeasureGeneric(python, options, bm_path, bm_env)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
