traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-38722: Runpy use io.open_code() (GH-17234) 

https://bugs.python.org/issue38722



Automerge-Triggered-By: @taleinat
This commit is contained in:
jsnklln 2019-11-18 14:11:13 -05:00 committed by Miss Islington (bot)
parent bcc1cc5cc3
commit e243bae999
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lib/runpy.py
View File

@ -13,6 +13,7 @@ importers when locating support scripts as well as when importing modules.
import sys import sys
import importlib.machinery # importlib first so we can test #15386 via -m import importlib.machinery # importlib first so we can test #15386 via -m
import importlib.util import importlib.util
import io
import types import types
from pkgutil import read_code, get_importer from pkgutil import read_code, get_importer
@ -228,11 +229,11 @@ def _get_main_module_details(error=ImportError):
def _get_code_from_file(run_name, fname): def _get_code_from_file(run_name, fname):
# Check for a compiled file first # Check for a compiled file first
with open(fname, "rb") as f: with io.open_code(fname) as f:
code = read_code(f) code = read_code(f)
if code is None: if code is None:
# That didn't work, so try it as normal source code # That didn't work, so try it as normal source code
with open(fname, "rb") as f: with io.open_code(fname) as f:
code = compile(f.read(), fname, 'exec') code = compile(f.read(), fname, 'exec')
return code, fname return code, fname

2
Misc/NEWS.d/next/Security/2019-11-18-16-17-56.bpo-38722.x3mECW.rst Normal file
View File

@ -0,0 +1,2 @@
:mod:`runpy` now uses :meth:`io.open_code` to open code files.
Patch by Jason Killen.