summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Finney <ben+python@benfinney.id.au>2015-10-18 12:59:28 +1100
committerBen Finney <ben+python@benfinney.id.au>2015-10-18 12:59:28 +1100
commit72a789f5a7692b322947431d22fd71294e0fef15 (patch)
tree6b009cc92306f33bc9dbf528f2b94d3ef1acd652
parent192aae2ee24eeacce209b208916528086ab3a229 (diff)
downloadpython-coveragepy-72a789f5a7692b322947431d22fd71294e0fef15.tar.gz
Move program name attribute to the application class.
-rw-r--r--coverage/cmdline.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/coverage/cmdline.py b/coverage/cmdline.py
index 308dbac..97ea596 100644
--- a/coverage/cmdline.py
+++ b/coverage/cmdline.py
@@ -142,8 +142,6 @@ class CoverageOptionParser(optparse.OptionParser, object):
"""
- program_name = os.path.basename(sys.argv[0])
-
def __init__(self, *args, **kwargs):
super(CoverageOptionParser, self).__init__(
add_help_option=False, *args, **kwargs
@@ -382,6 +380,8 @@ OK, ERR, FAIL_UNDER = 0, 1, 2
class CoverageScript(object):
"""The command-line interface to coverage.py."""
+ program_name = os.path.basename(sys.argv[0])
+
def __init__(self, _covpkg=None, _run_python_file=None,
_run_python_module=None, _help_fn=None, _path_exists=None):
# _covpkg is for dependency injection, so we can test this code.
@@ -534,13 +534,13 @@ class CoverageScript(object):
if error:
print(error)
print("Use '%(program_name)s help' for help." % {
- 'program_name': parser.program_name})
+ 'program_name': self.program_name})
elif parser:
print(parser.format_help().strip())
else:
help_params = self.covpkg.__dict__
help_params.update({
- 'program_name': CoverageOptionParser.program_name})
+ 'program_name': self.program_name})
help_msg = textwrap.dedent(HELP_TOPICS.get(topic, '')).strip()
if help_msg:
print(help_msg % help_params)