Skip to content

bpo-30439: Add a basic high-level interpreters module. #1803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ericsnowcurrently wants to merge 20 commits into from
Closed

bpo-30439: Add a basic high-level interpreters module. #1803

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
7cc14ad
Add the _interpreters module to the stdlib.
ericsnowcurrently Dec 14, 2016
84920ad
Add create() and destroy().
ericsnowcurrently Dec 29, 2016
89f16ee
Finish nearly all the create/destroy tests.
ericsnowcurrently Jan 1, 2017
189a2fd
Add run_string().
ericsnowcurrently Dec 29, 2016
e144c96
Get tricky tests working.
ericsnowcurrently Jan 2, 2017
f3c7194
Add a test for a still running interpreter when main exits.
ericsnowcurrently Jan 2, 2017
2b7b6c7
Add run_string_unrestricted().
ericsnowcurrently Jan 4, 2017
8368582
Exit out of the child process.
ericsnowcurrently Jan 4, 2017
9669ca7
Resolve several TODOs.
ericsnowcurrently Jan 4, 2017
79edd9c
Set up the execution namespace before switching threads.
ericsnowcurrently Jan 4, 2017
17b0e28
Run in a copy of __main__.
ericsnowcurrently Jan 4, 2017
7d8f744
Close stdin and stdout after the proc finishes.
ericsnowcurrently Jan 4, 2017
80ab76a
Clean up a test.
ericsnowcurrently Jan 4, 2017
7afda96
Chain exceptions during cleanup.
ericsnowcurrently Jan 4, 2017
4e07f7a
Finish the module docs.
ericsnowcurrently Jan 4, 2017
060a720
Fix docs.
ericsnowcurrently May 23, 2017
a85df93
Add get_current() and enumerate().
ericsnowcurrently Dec 29, 2016
f605ae7
Add is_running().
ericsnowcurrently Dec 29, 2016
9704487
Add get_main().
ericsnowcurrently Jan 4, 2017
7dadbe5
Add the interpreters module.
ericsnowcurrently Jan 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Set up the execution namespace before switching threads.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed May 23, 2017
commit 79edd9c7d05ec0e53dbdfed7e32333ccf2b95901
66 changes: 38 additions & 28 deletions Modules/_interpretersmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,52 +89,62 @@ _ensure_not_running(PyInterpreterState *interp)
return 0;
}

static PyObject *
_run_string(PyInterpreterState *interp, const char *codestr, PyObject *updates)
static int
_run_string(PyInterpreterState *interp, const char *codestr, PyObject *ns)
{
if (_ensure_not_running(interp) < 0)
return NULL;

// Switch to interpreter.
PyThreadState *tstate = PyInterpreterState_ThreadHead(interp);
PyThreadState *save_tstate = PyThreadState_Swap(tstate);

// Run the string (see PyRun_SimpleStringFlags).
PyObject *exc = NULL, *value = NULL, *tb = NULL;
PyObject *ns = NULL;
// XXX Force a fresh __main__ module?
PyObject *m = PyImport_AddModule("__main__");
if (m == NULL) {
PyErr_Fetch(&exc, &value, &tb);
goto done;
}
ns = PyModule_GetDict(m);
if (ns == NULL) {
PyErr_Fetch(&exc, &value, &tb);
goto done;
}
if (updates != NULL && PyDict_Merge(ns, updates, 0) < 0) {
PyErr_Fetch(&exc, &value, &tb);
goto done;
}
PyObject *result = PyRun_StringFlags(codestr, Py_file_input, ns, ns, NULL);
if (result == NULL) {
ns = NULL;
// Get the exception from the subinterpreter.
PyErr_Fetch(&exc, &value, &tb);
goto done;
} else {
Py_DECREF(result); // We throw away the result.
}
Py_DECREF(result); // We throw away the result.
Py_INCREF(ns); // It is a borrowed reference.

done:
// Switch back.
if (save_tstate != NULL)
PyThreadState_Swap(save_tstate);

// Propagate any exception out to the caller.
PyErr_Restore(exc, value, tb);

return result == NULL ? -1 : 0;
}

static PyObject *
_run_string_in_main(PyInterpreterState *interp, const char *codestr,
PyObject *updates)
{
if (_ensure_not_running(interp) < 0)
return NULL;

// Get the namespace in which to execute.
// XXX Force a fresh __main__ module?
PyObject *m = PyMapping_GetItemString(interp->modules, "__main__");
if (m == NULL)
return NULL;
PyObject *orig = PyModule_GetDict(m); // borrowed
Py_DECREF(m);
if (orig == NULL)
return NULL;
PyObject *ns = PyDict_Copy(orig);
if (ns == NULL)
return NULL;
if (updates != NULL && PyDict_Merge(ns, updates, 0) < 0) {
Py_DECREF(ns);
return NULL;
}

if (_run_string(interp, codestr, ns) < 0) {
Py_DECREF(ns);
return NULL;
}

return ns;
}

Expand Down Expand Up @@ -277,7 +287,7 @@ interp_run_string(PyObject *self, PyObject *args)
}

// Run the code in the interpreter.
PyObject *ns = _run_string(interp, codestr, NULL);
PyObject *ns = _run_string_in_main(interp, codestr, NULL);
if (ns == NULL)
return NULL;
else
Expand Down Expand Up @@ -328,7 +338,7 @@ interp_run_string_unrestricted(PyObject *self, PyObject *args)
}

// Run the code in the interpreter.
return _run_string(interp, codestr, ns);
return _run_string_in_main(interp, codestr, ns);
}

PyDoc_STRVAR(run_string_unrestricted_doc,
Expand Down