From: Matthias Klose <doko@ubuntu.com>
Date: Sun, 13 Sep 2009 15:12:47 +0000 (+0000)
Subject: Merged revisions 74773 via svnmerge from
X-Git-Tag: v2.6.3rc1~69
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=582357733efeb395eb8bd718e69ba73769aee3bf;p=python

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.
........
---

diff --git a/Lib/profile.py b/Lib/profile.py
index 27d68ba483..3af84278bf 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 d81de70998..5b2247997b 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')).