aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/tools/python3/Lib/runpy.py
diff options
context:
space:
mode:
authorshadchin <shadchin@yandex-team.com>2024-09-17 19:54:19 +0300
committershadchin <shadchin@yandex-team.com>2024-09-17 20:04:48 +0300
commitad73802f079a708231d906dd7273a632db735851 (patch)
treed8b2b9f0b31430e69b777af21f63b432f4b92cc4 /contrib/tools/python3/Lib/runpy.py
parent7c4e4744ae44dd94daa179458190817615f9e8a1 (diff)
downloadydb-ad73802f079a708231d906dd7273a632db735851.tar.gz
Update Python 3 to 3.12.6
commit_hash:43ed87a61b9efe3a87682fda1f0bff6f7b422cc9
Diffstat (limited to 'contrib/tools/python3/Lib/runpy.py')
-rw-r--r--contrib/tools/python3/Lib/runpy.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/contrib/tools/python3/Lib/runpy.py b/contrib/tools/python3/Lib/runpy.py
index 42f896c9cd5..ef54d3282ee 100644
--- a/contrib/tools/python3/Lib/runpy.py
+++ b/contrib/tools/python3/Lib/runpy.py
@@ -247,17 +247,17 @@ def _get_main_module_details(error=ImportError):
sys.modules[main_name] = saved_main
-def _get_code_from_file(run_name, fname):
+def _get_code_from_file(fname):
# Check for a compiled file first
from pkgutil import read_code
- decoded_path = os.path.abspath(os.fsdecode(fname))
- with io.open_code(decoded_path) as f:
+ code_path = os.path.abspath(fname)
+ with io.open_code(code_path) as f:
code = read_code(f)
if code is None:
# That didn't work, so try it as normal source code
- with io.open_code(decoded_path) as f:
+ with io.open_code(code_path) as f:
code = compile(f.read(), fname, 'exec')
- return code, fname
+ return code
def run_path(path_name, init_globals=None, run_name=None):
"""Execute code located at the specified filesystem location.
@@ -279,12 +279,13 @@ def run_path(path_name, init_globals=None, run_name=None):
pkg_name = run_name.rpartition(".")[0]
from pkgutil import get_importer
importer = get_importer(path_name)
+ path_name = os.fsdecode(path_name)
if isinstance(importer, type(None)):
# Not a valid sys.path entry, so run the code directly
# execfile() doesn't help as we want to allow compiled files
- code, fname = _get_code_from_file(run_name, path_name)
+ code = _get_code_from_file(path_name)
return _run_module_code(code, init_globals, run_name,
- pkg_name=pkg_name, script_name=fname)
+ pkg_name=pkg_name, script_name=path_name)
else:
# Finder is defined for path, so add it to
# the start of sys.path