From 582357733efeb395eb8bd718e69ba73769aee3bf Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sun, 13 Sep 2009 15:12:47 +0000 Subject: Merged revisions 74773 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r74773 | matthias.klose | 2009-09-13 17:09:24 +0200 (So, 13 Sep 2009) | 2 lines Issue #6635: Fix profiler printing usage message. ........ --- Lib/profile.py | 4 ++-- Misc/NEWS | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Lib/profile.py b/Lib/profile.py index 27d68ba..3af8427 100755 --- a/Lib/profile.py +++ b/Lib/profile.py @@ -605,9 +605,9 @@ def main(): sys.exit(2) (options, args) = parser.parse_args() - sys.argv[:] = args - if (len(sys.argv) > 0): + if (len(args) > 0): + sys.argv[:] = args sys.path.insert(0, os.path.dirname(sys.argv[0])) run('execfile(%r)' % (sys.argv[0],), options.outfile, options.sort) else: diff --git a/Misc/NEWS b/Misc/NEWS index d81de70..5b22479 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -74,6 +74,8 @@ Core and Builtins Library ------- +- Issue #6635: Fix profiler printing usage message. + - Issue #6795: int(Decimal('nan')) now raises ValueError instead of returning NaN or raising InvalidContext. Also, fix infinite recursion in long(Decimal('nan')). -- cgit v0.12