aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Python/import.c
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@python.org>2020-11-12 15:14:13 +0100
committerGitHub <noreply@github.com>2020-11-12 15:14:13 +0100
commitef75a625cdf8377d687a04948b4db9bc1917bf19 (patch)
treef9a979741790c9647b53e3f7c8f2c5fd66b6e56a /Python/import.c
parentd19fa7a337d829e3dab3e9f919f5dcf09cf6f6ba (diff)
downloadcpython-ef75a625cdf8377d687a04948b4db9bc1917bf19.tar.gz
cpython-ef75a625cdf8377d687a04948b4db9bc1917bf19.zip
bpo-42260: Initialize time and warnings earlier at startup (GH-23249)
* Call _PyTime_Init() and _PyWarnings_InitState() earlier during the Python initialization. * Inline _PyImportHooks_Init() into _PySys_InitCore(). * The _warnings initialization function no longer call _PyWarnings_InitState() to prevent resetting filters_version to 0. * _PyWarnings_InitState() now returns an int and no longer clear the state in case of error (it's done anyway at Python exit). * Rework init_importlib(), fix refleaks on errors.
Diffstat (limited to 'Python/import.c')
-rw-r--r--Python/import.c37
1 files changed, 0 insertions, 37 deletions
diff --git a/Python/import.c b/Python/import.c
index 77e6baef011..51630c3486a 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -52,43 +52,6 @@ module _imp
/* Initialize things */
PyStatus
-_PyImportHooks_Init(PyThreadState *tstate)
-{
- PyObject *v, *path_hooks = NULL;
- int err = 0;
-
- /* adding sys.path_hooks and sys.path_importer_cache */
- v = PyList_New(0);
- if (v == NULL)
- goto error;
- err = PySys_SetObject("meta_path", v);
- Py_DECREF(v);
- if (err)
- goto error;
- v = PyDict_New();
- if (v == NULL)
- goto error;
- err = PySys_SetObject("path_importer_cache", v);
- Py_DECREF(v);
- if (err)
- goto error;
- path_hooks = PyList_New(0);
- if (path_hooks == NULL)
- goto error;
- err = PySys_SetObject("path_hooks", path_hooks);
- if (err) {
- goto error;
- }
- Py_DECREF(path_hooks);
- return _PyStatus_OK();
-
- error:
- _PyErr_Print(tstate);
- return _PyStatus_ERR("initializing sys.meta_path, sys.path_hooks, "
- "or path_importer_cache failed");
-}
-
-PyStatus
_PyImportZip_Init(PyThreadState *tstate)
{
PyObject *path_hooks, *zipimport;