diff options
| author | Matthias Klose <doko@ubuntu.com> | 2009-09-13 15:31:14 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@ubuntu.com> | 2009-09-13 15:31:14 +0000 |
| commit | b11174364e180c72567c907601629ece701ccee6 (patch) | |
| tree | 77ba84839d86807a30c0d7cec75e6034fc997102 | |
| parent | d43378046d5e96fd431353ac488b1cdece7f9d65 (diff) | |
| download | cpython-git-b11174364e180c72567c907601629ece701ccee6.tar.gz | |
Merged revisions 74775 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r74775 | matthias.klose | 2009-09-13 17:18:53 +0200 (So, 13 Sep 2009) | 9 lines
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.
........
................
| -rwxr-xr-x | Lib/profile.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Lib/profile.py b/Lib/profile.py index cdc247911b..d969246475 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])) fp = open(sys.argv[0]) try: @@ -21,6 +21,8 @@ Core and Builtins Library ------- +- Issue #6635: Fix profiler printing usage message. + - Issue #6888: pdb's alias command was broken when no arguments were given. - Issue #6795: int(Decimal('nan')) now raises ValueError instead of |