summaryrefslogtreecommitdiffstats
path: root/Python/import.c
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@python.org>2020-04-14 13:14:01 (GMT)
committerGitHub <noreply@github.com>2020-04-14 13:14:01 (GMT)
commit81a7be3fa22c983209cc0ffb3537b92b0370f83c (patch)
treec257d7143ecc60574353caa76fa2992a455ebb54 /Python/import.c
parent4a3fe0835310643193ea45529ab0fb45c5f8f2fd (diff)
downloadcpython-81a7be3fa22c983209cc0ffb3537b92b0370f83c.zip
cpython-81a7be3fa22c983209cc0ffb3537b92b0370f83c.tar.gz
cpython-81a7be3fa22c983209cc0ffb3537b92b0370f83c.tar.bz2
bpo-40268: Rename _PyInterpreterState_GET_UNSAFE() (GH-19509)
Rename _PyInterpreterState_GET_UNSAFE() to _PyInterpreterState_GET() for consistency with _PyThreadState_GET() and to have a shorter name (help to fit into 80 columns). Add also "assert(tstate != NULL);" to the function.
Diffstat (limited to 'Python/import.c')
-rw-r--r--Python/import.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Python/import.c b/Python/import.c
index 3bf8fe0..042691d 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -310,7 +310,7 @@ _PyImport_Fini2(void)
PyObject *
PyImport_GetModuleDict(void)
{
- PyInterpreterState *interp = _PyInterpreterState_GET_UNSAFE();
+ PyInterpreterState *interp = _PyInterpreterState_GET();
if (interp->modules == NULL) {
Py_FatalError("interpreter has no modules dictionary");
}
@@ -644,7 +644,7 @@ long
PyImport_GetMagicNumber(void)
{
long res;
- PyInterpreterState *interp = _PyInterpreterState_GET_UNSAFE();
+ PyInterpreterState *interp = _PyInterpreterState_GET();
PyObject *external, *pyc_magic;
external = PyObject_GetAttrString(interp->importlib, "_bootstrap_external");
@@ -980,7 +980,7 @@ PyImport_ExecCodeModuleWithPathnames(const char *name, PyObject *co,
goto error;
}
else if (cpathobj != NULL) {
- PyInterpreterState *interp = _PyInterpreterState_GET_UNSAFE();
+ PyInterpreterState *interp = _PyInterpreterState_GET();
_Py_IDENTIFIER(_get_sourcefile);
if (interp == NULL) {