Cleanups for style, docs, etc from #438

2 files changed, 14 insertions, 8 deletions

diff --git a/coverage/backward.py b/coverage/backward.py
index 7f571c07..81ca342f 100644
--- a/coverage/backward.py
+++ b/coverage/backward.py
@@ -49,6 +49,15 @@ try:
 except NameError:
     range = range
 
+# shlex.quote is new, but there's an undocumented implementation in "pipes",
+# who knew!?
+try:
+    from shlex import quote as shlex_quote
+except ImportError:
+    # Useful function, available under a different (undocumented) name
+    # in Python versions earlier than 3.3.
+    from pipes import quote as shlex_quote
+
 # A function to iterate listlessly over a dict's items.
 try:
     {}.iteritems
diff --git a/coverage/cmdline.py b/coverage/cmdline.py
index 97ea596c..5742e6a9 100644
--- a/coverage/cmdline.py
+++ b/coverage/cmdline.py
@@ -242,12 +242,11 @@ class CmdOptionParser(CoverageOptionParser):
         return (other == "<CmdOptionParser:%s>" % self.cmd)
 
     def get_prog_name(self):
+        """Override of an undocumented function in optparse.OptionParser."""
         program_name = super(CmdOptionParser, self).get_prog_name()
 
         # Include the sub-command for this parser as part of the command.
-        result = "%(command)s %(subcommand)s" % {
-                'command': program_name, 'subcommand': self.cmd}
-        return result
+        return "%(command)s %(subcommand)s" % {'command': program_name, 'subcommand': self.cmd}
 
 
 GLOBAL_ARGS = [
@@ -533,14 +532,12 @@ class CoverageScript(object):
         assert error or topic or parser
         if error:
             print(error)
-            print("Use '%(program_name)s help' for help." % {
-                    'program_name': self.program_name})
+            print("Use '%s help' for help." % (self.program_name,))
         elif parser:
             print(parser.format_help().strip())
         else:
-            help_params = self.covpkg.__dict__
-            help_params.update({
-                    'program_name': self.program_name})
+            help_params = dict(self.covpkg.__dict__)
+            help_params['program_name'] = self.program_name
             help_msg = textwrap.dedent(HELP_TOPICS.get(topic, '')).strip()
             if help_msg:
                 print(help_msg % help_params)