Author: Armin Rigo <[email protected]> Branch: r15-for-shadowstack Changeset: r65980:7ead82da0adb Date: 2013-08-06 19:08 +0200 http://bitbucket.org/pypy/pypy/changeset/7ead82da0adb/
Log: hg merge default diff --git a/pypy/module/cpyext/pystate.py b/pypy/module/cpyext/pystate.py --- a/pypy/module/cpyext/pystate.py +++ b/pypy/module/cpyext/pystate.py @@ -3,7 +3,6 @@ from pypy.module.cpyext.pyobject import PyObject, Py_DecRef, make_ref, from_ref from rpython.rtyper.lltypesystem import rffi, lltype from rpython.rlib import rthread -from pypy.module.thread import os_thread PyInterpreterStateStruct = lltype.ForwardReference() PyInterpreterState = lltype.Ptr(PyInterpreterStateStruct) @@ -45,7 +44,10 @@ @cpython_api([], lltype.Void) def PyEval_InitThreads(space): - os_thread.setup_threads(space) + if space.config.translation.thread: + from pypy.module.thread import os_thread + os_thread.setup_threads(space) + #else: nothing to do @cpython_api([], rffi.INT_real, error=CANNOT_FAIL) def PyEval_ThreadsInitialized(space): _______________________________________________ pypy-commit mailing list [email protected] http://mail.python.org/mailman/listinfo/pypy-commit
