diff options
| author | Victor Stinner <vstinner@python.org> | 2020-06-17 23:11:46 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-17 23:11:46 (GMT) |
| commit | 1bf7959dce0597e312c6f35476a7cc957fd0323c (patch) | |
| tree | 627f5b3021d83ee6f08f694618356b2341fdc3a9 | |
| parent | 4c18fc8f1def7030e5ec5d1ffb9355d7453dc408 (diff) | |
| download | cpython-1bf7959dce0597e312c6f35476a7cc957fd0323c.zip cpython-1bf7959dce0597e312c6f35476a7cc957fd0323c.tar.gz cpython-1bf7959dce0597e312c6f35476a7cc957fd0323c.tar.bz2 | |
bpo-41006: Remove init_sys_streams() hack (GH-20954)
The encodings.latin_1 module is no longer imported at startup. Now it
is only imported when it is the filesystem encoding or the stdio encoding.
| -rw-r--r-- | Misc/NEWS.d/next/Core and Builtins/2020-06-18-00-07-09.bpo-41006.H-wN-d.rst | 2 | ||||
| -rw-r--r-- | Python/pylifecycle.c | 13 |
2 files changed, 2 insertions, 13 deletions
diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-06-18-00-07-09.bpo-41006.H-wN-d.rst b/Misc/NEWS.d/next/Core and Builtins/2020-06-18-00-07-09.bpo-41006.H-wN-d.rst new file mode 100644 index 0000000..4593e6b --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2020-06-18-00-07-09.bpo-41006.H-wN-d.rst @@ -0,0 +1,2 @@ +The ``encodings.latin_1`` module is no longer imported at startup. Now it is +only imported when it is the filesystem encoding or the stdio encoding. diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index c754f21..87f25e6 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -1939,7 +1939,6 @@ static PyStatus init_sys_streams(PyThreadState *tstate) { PyObject *iomod = NULL; - PyObject *m; PyObject *std = NULL; int fd; PyObject * encoding_attr; @@ -1959,18 +1958,6 @@ init_sys_streams(PyThreadState *tstate) } #endif - /* Hack to avoid a nasty recursion issue when Python is invoked - in verbose mode: pre-import the Latin-1 and UTF-8 codecs */ - if ((m = PyImport_ImportModule("encodings.utf_8")) == NULL) { - goto error; - } - Py_DECREF(m); - - if (!(m = PyImport_ImportModule("encodings.latin_1"))) { - goto error; - } - Py_DECREF(m); - if (!(iomod = PyImport_ImportModule("io"))) { goto error; } |