Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r77646:b2c13b12dd20
Date: 2015-05-28 14:20 +0200
http://bitbucket.org/pypy/pypy/changeset/b2c13b12dd20/
Log: merge heads
diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoption.py
--- a/pypy/config/pypyoption.py
+++ b/pypy/config/pypyoption.py
@@ -321,7 +321,7 @@
def enable_allworkingmodules(config):
- modules = working_modules
+ modules = working_modules.copy()
if config.translation.sandbox:
modules = default_modules
# ignore names from 'essential_modules', notably 'exceptions', which
diff --git a/pypy/goal/targetpypystandalone.py
b/pypy/goal/targetpypystandalone.py
--- a/pypy/goal/targetpypystandalone.py
+++ b/pypy/goal/targetpypystandalone.py
@@ -276,6 +276,8 @@
config.objspace.usemodules.pypyjit = True
elif config.objspace.usemodules.pypyjit:
config.translation.jit = True
+ else:
+ config.objspace.usemodules._vmprof = False
if config.translation.sandbox:
config.objspace.lonepycfiles = False
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
