[Python-checkins] r74777 - in python/branches/release31-maint: Lib/profile.py Misc/NEWS

Sun Sep 13 17:31:15 CEST 2009

Author: matthias.klose
Date: Sun Sep 13 17:31:14 2009
New Revision: 74777
Log:
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.
 ........
................
Modified:
 python/branches/release31-maint/Lib/profile.py
 python/branches/release31-maint/Misc/NEWS
Modified: python/branches/release31-maint/Lib/profile.py
==============================================================================

--- python/branches/release31-maint/Lib/profile.py	(original)
+++ python/branches/release31-maint/Lib/profile.py	Sun Sep 13 17:31:14 2009
@@ -605,9 +605,9 @@
 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:
Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Sun Sep 13 17:31:14 2009
@@ -21,6 +21,8 @@
 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
