Merged revisions 74775 via svnmerge from

matthias.klose · matthias.klose · commit 3e65a839b16f · 2009-09-13T15:31:14.000Z
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. ........ ................ git-svn-id: http://svn.python.org/projects/python/branches/release31-maint@74777 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git 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:
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -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
