aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/tools/python3/src/Python
diff options
context:
space:
mode:
authorAlexSm <alex@ydb.tech>2024-01-04 15:09:05 +0100
committerGitHub <noreply@github.com>2024-01-04 15:09:05 +0100
commitdab291146f6cd7d35684e3a1150e5bb1c412982c (patch)
tree36ef35f6cacb6432845a4a33f940c95871036b32 /contrib/tools/python3/src/Python
parent63660ad5e7512029fd0218e7a636580695a24e1f (diff)
downloadydb-dab291146f6cd7d35684e3a1150e5bb1c412982c.tar.gz
Library import 5, delete go dependencies (#832)
* Library import 5, delete go dependencies * Fix yt client
Diffstat (limited to 'contrib/tools/python3/src/Python')
-rw-r--r--contrib/tools/python3/src/Python/errors.c5
-rw-r--r--contrib/tools/python3/src/Python/frozenmain.c85
2 files changed, 5 insertions, 85 deletions
diff --git a/contrib/tools/python3/src/Python/errors.c b/contrib/tools/python3/src/Python/errors.c
index 8e150c3d008..2dd5a87920a 100644
--- a/contrib/tools/python3/src/Python/errors.c
+++ b/contrib/tools/python3/src/Python/errors.c
@@ -1161,6 +1161,11 @@ PyErr_NewException(const char *name, PyObject *base, PyObject *dict)
PyObject *bases = NULL;
PyObject *result = NULL;
+#if defined(__has_feature)
+# if __has_feature(memory_sanitizer)
+ __msan_unpoison_string(name);
+# endif
+#endif
const char *dot = strrchr(name, '.');
if (dot == NULL) {
_PyErr_SetString(tstate, PyExc_SystemError,
diff --git a/contrib/tools/python3/src/Python/frozenmain.c b/contrib/tools/python3/src/Python/frozenmain.c
deleted file mode 100644
index 8743e082b4f..00000000000
--- a/contrib/tools/python3/src/Python/frozenmain.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Python interpreter main program for frozen scripts */
-
-#include "Python.h"
-#include "pycore_runtime.h" // _PyRuntime_Initialize()
-#include <locale.h>
-
-#ifdef MS_WINDOWS
-extern void PyWinFreeze_ExeInit(void);
-extern void PyWinFreeze_ExeTerm(void);
-extern int PyInitFrozenExtensions(void);
-#endif
-
-/* Main program */
-
-int
-Py_FrozenMain(int argc, char **argv)
-{
- PyStatus status = _PyRuntime_Initialize();
- if (PyStatus_Exception(status)) {
- Py_ExitStatusException(status);
- }
-
- PyConfig config;
- PyConfig_InitPythonConfig(&config);
- // Suppress errors from getpath.c
- config.pathconfig_warnings = 0;
- // Don't parse command line options like -E
- config.parse_argv = 0;
-
- status = PyConfig_SetBytesArgv(&config, argc, argv);
- if (PyStatus_Exception(status)) {
- PyConfig_Clear(&config);
- Py_ExitStatusException(status);
- }
-
- const char *p;
- int inspect = 0;
- if ((p = Py_GETENV("PYTHONINSPECT")) && *p != '\0') {
- inspect = 1;
- }
-
-#ifdef MS_WINDOWS
- PyInitFrozenExtensions();
-#endif /* MS_WINDOWS */
-
- status = Py_InitializeFromConfig(&config);
- PyConfig_Clear(&config);
- if (PyStatus_Exception(status)) {
- Py_ExitStatusException(status);
- }
-
-#ifdef MS_WINDOWS
- PyWinFreeze_ExeInit();
-#endif
-
- if (Py_VerboseFlag) {
- fprintf(stderr, "Python %s\n%s\n",
- Py_GetVersion(), Py_GetCopyright());
- }
-
- int sts = 1;
- int n = PyImport_ImportFrozenModule("__main__");
- if (n == 0) {
- Py_FatalError("the __main__ module is not frozen");
- }
- if (n < 0) {
- PyErr_Print();
- sts = 1;
- }
- else {
- sts = 0;
- }
-
- if (inspect && isatty((int)fileno(stdin))) {
- sts = PyRun_AnyFile(stdin, "<stdin>") != 0;
- }
-
-#ifdef MS_WINDOWS
- PyWinFreeze_ExeTerm();
-#endif
- if (Py_FinalizeEx() < 0) {
- sts = 120;
- }
- return sts;
-}