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

[matthias.klose]

Author: matthias.klose
Date: Sun Sep 13 17:12:47 2009
New Revision: 74774

Log:
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/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/profile.py
   python/branches/release26-maint/Misc/NEWS

Modified: python/branches/release26-maint/Lib/profile.py
==============================================================================
--- python/branches/release26-maint/Lib/profile.py	(original)
+++ python/branches/release26-maint/Lib/profile.py	Sun Sep 13 17:12:47 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]))
         run('execfile(%r)' % (sys.argv[0],), options.outfile, options.sort)
     else:

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Sun Sep 13 17:12:47 2009
@@ -74,6 +74,8 @@
 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')).