https://github.com/python/cpython/commit/4c7bfdff90544deb5d2055fcbe4db4c2a231e95d
commit: 4c7bfdff90544deb5d2055fcbe4db4c2a231e95d
branch: main
author: Guido van Rossum <[email protected]>
committer: gvanrossum <[email protected]>
date: 2024-04-22T12:17:57-07:00
summary:
Remove more remnants of deepfreeze (#118159)
files:
A Include/incl.tar
M Include/internal/pycore_code.h
M Include/internal/pycore_pylifecycle.h
M Programs/_bootstrap_python.c
M Programs/_freeze_module.c
diff --git a/Include/incl.tar b/Include/incl.tar
new file mode 100644
index 00000000000000..fecc1fb5dec534
Binary files /dev/null and b/Include/incl.tar differ
diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
index 1ec0348d6e5e8b..8d832c59e36874 100644
--- a/Include/internal/pycore_code.h
+++ b/Include/internal/pycore_code.h
@@ -288,11 +288,6 @@ extern void _Py_Specialize_Send(PyObject *receiver,
_Py_CODEUNIT *instr);
extern void _Py_Specialize_ToBool(PyObject *value, _Py_CODEUNIT *instr);
extern void _Py_Specialize_ContainsOp(PyObject *value, _Py_CODEUNIT *instr);
-/* Finalizer function for static codeobjects used in deepfreeze.py */
-extern void _PyStaticCode_Fini(PyCodeObject *co);
-/* Function to intern strings of codeobjects and quicken the bytecode */
-extern int _PyStaticCode_Init(PyCodeObject *co);
-
#ifdef Py_STATS
#include "pycore_bitutils.h" // _Py_bit_length
diff --git a/Include/internal/pycore_pylifecycle.h
b/Include/internal/pycore_pylifecycle.h
index 47ff0806574ac0..f426ae0e103b9c 100644
--- a/Include/internal/pycore_pylifecycle.h
+++ b/Include/internal/pycore_pylifecycle.h
@@ -42,7 +42,6 @@ extern PyStatus _Py_HashRandomization_Init(const PyConfig *);
extern PyStatus _PyGC_Init(PyInterpreterState *interp);
extern PyStatus _PyAtExit_Init(PyInterpreterState *interp);
-extern int _Py_Deepfreeze_Init(void);
/* Various internal finalizers */
@@ -58,7 +57,6 @@ extern void _PyWarnings_Fini(PyInterpreterState *interp);
extern void _PyAST_Fini(PyInterpreterState *interp);
extern void _PyAtExit_Fini(PyInterpreterState *interp);
extern void _PyThread_FiniType(PyInterpreterState *interp);
-extern void _Py_Deepfreeze_Fini(void);
extern void _PyArg_Fini(void);
extern void _Py_FinalizeAllocatedBlocks(_PyRuntimeState *);
diff --git a/Programs/_bootstrap_python.c b/Programs/_bootstrap_python.c
index 34f79191b4e8d7..6443d814a22dab 100644
--- a/Programs/_bootstrap_python.c
+++ b/Programs/_bootstrap_python.c
@@ -15,17 +15,6 @@
#include "Python/frozen_modules/zipimport.h"
/* End includes */
-/* Empty initializer for deepfrozen modules */
-int _Py_Deepfreeze_Init(void)
-{
- return 0;
-}
-/* Empty finalizer for deepfrozen modules */
-void
-_Py_Deepfreeze_Fini(void)
-{
-}
-
/* Note that a negative size indicates a package. */
static const struct _frozen bootstrap_modules[] = {
diff --git a/Programs/_freeze_module.c b/Programs/_freeze_module.c
index 3de6c6816c1e61..2a462a42cdad7c 100644
--- a/Programs/_freeze_module.c
+++ b/Programs/_freeze_module.c
@@ -22,17 +22,6 @@
# include <unistd.h>
#endif
-/* Empty initializer for deepfrozen modules */
-int _Py_Deepfreeze_Init(void)
-{
- return 0;
-}
-/* Empty finalizer for deepfrozen modules */
-void
-_Py_Deepfreeze_Fini(void)
-{
-}
-
/* To avoid a circular dependency on frozen.o, we create our own structure
of frozen modules instead, left deliberately blank so as to avoid
unintentional import of a stale version of _frozen_importlib. */
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]