diff options
author | Steve Dower <steve.dower@python.org> | 2023-05-22 10:40:30 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-22 10:40:30 (GMT) |
commit | d1645ce4f1075d0a6ce051aa10f54f35489aa605 (patch) | |
tree | 1abe6a543f295ae97dfad284b783cdfa05016528 | |
parent | 98016f7c92aa4c1232c68bac1ed6646db31782ec (diff) | |
download | cpython-d1645ce4f1075d0a6ce051aa10f54f35489aa605.zip cpython-d1645ce4f1075d0a6ce051aa10f54f35489aa605.tar.gz cpython-d1645ce4f1075d0a6ce051aa10f54f35489aa605.tar.bz2 |
[3.9] gh-103935: Use `io.open_code()` when executing code in trace and profile modules (GH-103947) (#103953)
Co-authored-by: Tian Gao <gaogaotiantian@hotmail.com>
-rwxr-xr-x | Lib/cProfile.py | 3 | ||||
-rwxr-xr-x | Lib/profile.py | 3 | ||||
-rwxr-xr-x | Lib/trace.py | 3 | ||||
-rw-r--r-- | Misc/NEWS.d/next/Library/2023-04-27-20-03-08.gh-issue-103935.Uaf2M0.rst | 1 |
4 files changed, 7 insertions, 3 deletions
diff --git a/Lib/cProfile.py b/Lib/cProfile.py index 22a7d0a..9ae1fb8 100755 --- a/Lib/cProfile.py +++ b/Lib/cProfile.py @@ -7,6 +7,7 @@ __all__ = ["run", "runctx", "Profile"] import _lsprof +import io import profile as _pyprofile # ____________________________________________________________ @@ -167,7 +168,7 @@ def main(): else: progname = args[0] sys.path.insert(0, os.path.dirname(progname)) - with open(progname, 'rb') as fp: + with io.open_code(progname) as fp: code = compile(fp.read(), progname, 'exec') globs = { '__file__': progname, diff --git a/Lib/profile.py b/Lib/profile.py index d8599fb..90c4e4c 100755 --- a/Lib/profile.py +++ b/Lib/profile.py @@ -24,6 +24,7 @@ # governing permissions and limitations under the License. +import io import sys import time import marshal @@ -587,7 +588,7 @@ def main(): else: progname = args[0] sys.path.insert(0, os.path.dirname(progname)) - with open(progname, 'rb') as fp: + with io.open_code(progname) as fp: code = compile(fp.read(), progname, 'exec') globs = { '__file__': progname, diff --git a/Lib/trace.py b/Lib/trace.py index c505d8b..5e1f9cc 100755 --- a/Lib/trace.py +++ b/Lib/trace.py @@ -49,6 +49,7 @@ Sample use, programmatically """ __all__ = ['Trace', 'CoverageResults'] +import io import linecache import os import sys @@ -716,7 +717,7 @@ def main(): sys.argv = [opts.progname, *opts.arguments] sys.path[0] = os.path.dirname(opts.progname) - with open(opts.progname, 'rb') as fp: + with io.open_code(opts.progname) as fp: code = compile(fp.read(), opts.progname, 'exec') # try to emulate __main__ namespace as much as possible globs = { diff --git a/Misc/NEWS.d/next/Library/2023-04-27-20-03-08.gh-issue-103935.Uaf2M0.rst b/Misc/NEWS.d/next/Library/2023-04-27-20-03-08.gh-issue-103935.Uaf2M0.rst new file mode 100644 index 0000000..71b2d87 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2023-04-27-20-03-08.gh-issue-103935.Uaf2M0.rst @@ -0,0 +1 @@ +Use :func:`io.open_code` for files to be executed instead of raw :func:`open` |