diff options
| author | snermolaev <snermolaev@yandex-team.com> | 2025-04-15 08:08:40 +0300 |
|---|---|---|
| committer | snermolaev <snermolaev@yandex-team.com> | 2025-04-15 08:21:15 +0300 |
| commit | 0ca7cfb39890921e0fc5a77e2972842717989f96 (patch) | |
| tree | 90f759fbc021bbdbf3430593ff34bf8d082429de /contrib/tools | |
| parent | 0e221bf1e6683a34b2ce4cd10a015b0669c836be (diff) | |
| download | ydb-0ca7cfb39890921e0fc5a77e2972842717989f96.tar.gz | |
Revert "Subinterpretor compatible __res module" rXXXXXX
commit_hash:1d9f5675b9d3ddaa44db4472376a06ad3e811e2d
Diffstat (limited to 'contrib/tools')
| -rw-r--r-- | contrib/tools/python3/Python/_warnings.c | 4 | ||||
| -rw-r--r-- | contrib/tools/python3/Python/import.c | 2 | ||||
| -rw-r--r-- | contrib/tools/python3/patches/cut-backtrace.patch | 2 | ||||
| -rw-r--r-- | contrib/tools/python3/patches/cut-warnings-trace.patch | 13 |
4 files changed, 2 insertions, 19 deletions
diff --git a/contrib/tools/python3/Python/_warnings.c b/contrib/tools/python3/Python/_warnings.c index f0ab47efb64..1f91edbf5cb 100644 --- a/contrib/tools/python3/Python/_warnings.c +++ b/contrib/tools/python3/Python/_warnings.c @@ -791,10 +791,6 @@ is_internal_filename(PyObject *filename) } } - if (_PyUnicode_EqualToASCIIString(filename, "library/python/runtime_py3/__res.py")) { - return true; - } - return false; } diff --git a/contrib/tools/python3/Python/import.c b/contrib/tools/python3/Python/import.c index 1b550d0451c..daac00593d7 100644 --- a/contrib/tools/python3/Python/import.c +++ b/contrib/tools/python3/Python/import.c @@ -2523,7 +2523,7 @@ remove_importlib_frames(PyThreadState *tstate) { const char *importlib_filename = "<frozen importlib._bootstrap>"; const char *external_filename = "<frozen importlib._bootstrap_external>"; - const char *importer_filename = "library/python/runtime_py3/__res.py"; + const char *importer_filename = "library/python/runtime_py3/importer.pxi"; const char *remove_frames = "_call_with_frames_removed"; int always_trim = 0; int in_importlib = 0; diff --git a/contrib/tools/python3/patches/cut-backtrace.patch b/contrib/tools/python3/patches/cut-backtrace.patch index 3d734f05cdc..538ce57d9cb 100644 --- a/contrib/tools/python3/patches/cut-backtrace.patch +++ b/contrib/tools/python3/patches/cut-backtrace.patch @@ -16,7 +16,7 @@ revision: 5216645 { const char *importlib_filename = "<frozen importlib._bootstrap>"; const char *external_filename = "<frozen importlib._bootstrap_external>"; -+ const char *importer_filename = "library/python/runtime_py3/__res.py"; ++ const char *importer_filename = "library/python/runtime_py3/importer.pxi"; const char *remove_frames = "_call_with_frames_removed"; int always_trim = 0; int in_importlib = 0; diff --git a/contrib/tools/python3/patches/cut-warnings-trace.patch b/contrib/tools/python3/patches/cut-warnings-trace.patch deleted file mode 100644 index 3366ae97ee7..00000000000 --- a/contrib/tools/python3/patches/cut-warnings-trace.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- contrib/tools/python3/Python/_warnings.c (index) -+++ contrib/tools/python3/Python/_warnings.c (working tree) -@@ -791,6 +791,10 @@ is_internal_filename(PyObject *filename) - } - } - -+ if (_PyUnicode_EqualToASCIIString(filename, "library/python/runtime_py3/__res.py")) { -+ return true; -+ } -+ - return false; - } - |