Skip to content

Commit

Permalink
[3.8] gh-103935: Use io.open_code() when executing code in trace an…
Browse files Browse the repository at this point in the history
…d profile modules (GH-103947) (#103954)

Co-authored-by: Tian Gao <[email protected]>
  • Loading branch information
zooba and gaogaotiantian authored May 22, 2023
1 parent 2062fce commit 9f89c47
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
3 changes: 2 additions & 1 deletion Lib/cProfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
__all__ = ["run", "runctx", "Profile"]

import _lsprof
import io
import profile as _pyprofile

# ____________________________________________________________
Expand Down Expand Up @@ -183,7 +184,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,
Expand Down
3 changes: 2 additions & 1 deletion Lib/profile.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
# governing permissions and limitations under the License.


import io
import sys
import time
import marshal
Expand Down Expand Up @@ -603,7 +604,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,
Expand Down
3 changes: 2 additions & 1 deletion Lib/trace.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
"""
__all__ = ['Trace', 'CoverageResults']

import io
import linecache
import os
import sys
Expand Down Expand Up @@ -732,7 +733,7 @@ def parse_ignore_dir(s):
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 = {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Use :func:`io.open_code` for files to be executed instead of raw :func:`open`

0 comments on commit 9f89c47

Please sign in to comment.