summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Klose <doko@ubuntu.com>2009-09-13 15:09:24 (GMT)
committerMatthias Klose <doko@ubuntu.com>2009-09-13 15:09:24 (GMT)
commit924eab64a36735bbec080f5f0dc02bb3a773284d (patch)
tree7820eb12a93677594dba7eda3f4ec0443d3f0587
parent1f4fc097f600cf0c0408afd88a9d0a9bff9d9212 (diff)
downloadcpython-924eab64a36735bbec080f5f0dc02bb3a773284d.zip
cpython-924eab64a36735bbec080f5f0dc02bb3a773284d.tar.gz
cpython-924eab64a36735bbec080f5f0dc02bb3a773284d.tar.bz2
Issue #6635: Fix profiler printing usage message.
-rwxr-xr-xLib/profile.py4
-rw-r--r--Misc/NEWS2
2 files changed, 4 insertions, 2 deletions
diff --git a/Lib/profile.py b/Lib/profile.py
index 27d68ba..3af8427 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 734bddf..555d96e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -366,6 +366,8 @@ Core and Builtins
Library
-------
+- Issue #6635: Fix profiler printing usage message.
+
- Issue #6856: Add a filter keyword argument to TarFile.add().
- Issue #6163: Fixed HP-UX runtime library dir options in