summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@redhat.com>2018-08-01 16:18:07 (GMT)
committerGitHub <noreply@github.com>2018-08-01 16:18:07 (GMT)
commit80b762f010097ab8137782e5fbdc89c5c620ed4e (patch)
tree153bd836a83680ade86f0fd00b07f8dfcb71a03e /Include
parent6c785c0ebdadc84d80a53d896c38fd7ada8ae1f6 (diff)
downloadcpython-80b762f010097ab8137782e5fbdc89c5c620ed4e.zip
cpython-80b762f010097ab8137782e5fbdc89c5c620ed4e.tar.gz
cpython-80b762f010097ab8137782e5fbdc89c5c620ed4e.tar.bz2
bpo-31650: Remove _Py_CheckHashBasedPycsMode global config var (GH-8608)
bpo-31650, bpo-34170: Replace _Py_CheckHashBasedPycsMode with _PyCoreConfig._check_hash_pycs_mode. Modify PyInit__imp() and zipimport to get the parameter from the current interpreter core configuration. Remove Include/internal/import.h file.
Diffstat (limited to 'Include')
-rw-r--r--Include/coreconfig.h3
-rw-r--r--Include/internal/import.h6
2 files changed, 2 insertions, 7 deletions
diff --git a/Include/coreconfig.h b/Include/coreconfig.h
index 4401729..b279907 100644
--- a/Include/coreconfig.h
+++ b/Include/coreconfig.h
@@ -241,7 +241,7 @@ typedef struct {
valid
Set by the --check-hash-based-pycs command line option.
- If set to NULL (default), inherit _Py_CheckHashBasedPycsMode value.
+ The default value is "default".
See PEP 552 "Deterministic pycs" for more details. */
const char *_check_hash_pycs_mode;
@@ -286,6 +286,7 @@ typedef struct {
.buffered_stdio = -1, \
_PyCoreConfig_WINDOWS_INIT \
._install_importlib = 1, \
+ ._check_hash_pycs_mode = "default", \
._frozen = -1}
/* Note: _PyCoreConfig_INIT sets other fields to 0/NULL */
diff --git a/Include/internal/import.h b/Include/internal/import.h
deleted file mode 100644
index 4746e75..0000000
--- a/Include/internal/import.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef Py_INTERNAL_IMPORT_H
-#define Py_INTERNAL_IMPORT_H
-
-extern const char *_Py_CheckHashBasedPycsMode;
-
-#endif