mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-01 04:42:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

bpo-32852: Fix trace changing sys.argv to tuple. (GH-5692)

Browse source 
(cherry picked from commit 9f4223261f)

Co-authored-by: Kyle Altendorf <sda@fstab.net>
This commit is contained in:
Miss Islington (bot) 2018-02-16 22:53:24 -08:00 • committed by GitHub
parent 025544a855
commit afb5e55836
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/test/test_trace.py
View file

@ -387,5 +387,15 @@ class TestCommandLine(unittest.TestCase):
status, stdout, stderr = assert_python_ok('-m', 'trace', '-l', TESTFN) status, stdout, stderr = assert_python_ok('-m', 'trace', '-l', TESTFN)
self.assertIn(b'functions called:', stdout) self.assertIn(b'functions called:', stdout)
def test_sys_argv_list(self):
with open(TESTFN, 'w') as fd:
self.addCleanup(unlink, TESTFN)
fd.write("import sys\n")
fd.write("print(type(sys.argv))\n")
status, direct_stdout, stderr = assert_python_ok(TESTFN)
status, trace_stdout, stderr = assert_python_ok('-m', 'trace', '-l', TESTFN)
self.assertIn(direct_stdout.strip(), trace_stdout)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()

2
Lib/trace.py
View file

@ -705,7 +705,7 @@ def main():
if opts.filename is None: if opts.filename is None:
parser.error('filename is missing: required with the main options') parser.error('filename is missing: required with the main options')
sys.argv = opts.filename, *opts.arguments sys.argv = [opts.filename, *opts.arguments]
sys.path[0] = os.path.dirname(opts.filename) sys.path[0] = os.path.dirname(opts.filename)
t = Trace(opts.count, opts.trace, countfuncs=opts.listfuncs, t = Trace(opts.count, opts.trace, countfuncs=opts.listfuncs,

1
Misc/NEWS.d/next/Library/2018-02-15-12-04-29.bpo-32852.HDqIxM.rst Normal file
View file

@ -0,0 +1 @@
Make sure sys.argv remains as a list when running trace.