aboutsummaryrefslogtreecommitdiff
path: root/pypy/bin
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-09-08 23:00:13 +0000
committerBenjamin Peterson <benjamin@python.org>2010-09-08 23:00:13 +0000
commitf141a4da93a92b39fcc8411d7153f16511c9e4a6 (patch)
tree3631a76188202dbf09b369a1b401a39a1b10da24 /pypy/bin
parentsslerror is now nicely named (diff)
downloadpypy-f141a4da93a92b39fcc8411d7153f16511c9e4a6.tar.gz
pypy-f141a4da93a92b39fcc8411d7153f16511c9e4a6.tar.bz2
pypy-f141a4da93a92b39fcc8411d7153f16511c9e4a6.zip
merge from trunk
Diffstat (limited to 'pypy/bin')
-rwxr-xr-xpypy/bin/py.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/pypy/bin/py.py b/pypy/bin/py.py
index 490dab8d93..4e18a86059 100755
--- a/pypy/bin/py.py
+++ b/pypy/bin/py.py
@@ -76,6 +76,8 @@ def main_(argv=None):
config.objspace.suggest(allworkingmodules=False)
if config.objspace.allworkingmodules:
pypyoption.enable_allworkingmodules(config)
+ if config.objspace.usemodules.thread:
+ config.translation.thread = True
# create the object space