summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@redhat.com>2019-04-29 11:04:07 (GMT)
committerGitHub <noreply@github.com>2019-04-29 11:04:07 (GMT)
commit99fcc616d400cd31af0733c3f8cc93bcc1d32a44 (patch)
tree0081a47a3cae0a556affff285079a9361c5b8c45 /Modules
parentb36e5d627d4232a01850707eb78a5067f3fd77f4 (diff)
downloadcpython-99fcc616d400cd31af0733c3f8cc93bcc1d32a44.zip
cpython-99fcc616d400cd31af0733c3f8cc93bcc1d32a44.tar.gz
cpython-99fcc616d400cd31af0733c3f8cc93bcc1d32a44.tar.bz2
Revert "bpo-36356: Destroy the GIL at exit (GH-12453)" (GH613006)
This reverts commit b36e5d627d4232a01850707eb78a5067f3fd77f4.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/main.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/Modules/main.c b/Modules/main.c
index f77bbd2..68f0b99 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -1,7 +1,6 @@
/* Python interpreter main program */
#include "Python.h"
-#include "pycore_ceval.h" /* _PyEval_FiniThreads2() */
#include "pycore_coreconfig.h"
#include "pycore_pylifecycle.h"
#include "pycore_pymem.h"
@@ -526,15 +525,15 @@ done:
/* --- pymain_main() ---------------------------------------------- */
-/* Free global variables which cannot be freed in Py_Finalize():
- configuration options set before Py_Initialize() which should
- remain valid after Py_Finalize(), since
- Py_Initialize()-Py_Finalize() can be called multiple times. */
static void
pymain_free(void)
{
_PyImport_Fini2();
- _PyEval_FiniThreads2();
+
+ /* Free global variables which cannot be freed in Py_Finalize():
+ configuration options set before Py_Initialize() which should
+ remain valid after Py_Finalize(), since
+ Py_Initialize()-Py_Finalize() can be called multiple times. */
_PyPathConfig_ClearGlobal();
_Py_ClearStandardStreamEncoding();
_Py_ClearArgcArgv();