merged test improvments

4 files changed, 10 insertions, 10 deletions

diff --git a/src/distutils2/command/bdist_msi.py b/src/distutils2/command/bdist_msi.py
index b759a06..61968ad 100644
--- a/src/distutils2/command/bdist_msi.py
+++ b/src/distutils2/command/bdist_msi.py
@@ -148,7 +148,7 @@ class bdist_msi (Command):
             if not self.skip_build and self.distribution.has_ext_modules()\
                and self.target_version != short_version:
                 raise DistutilsOptionError, \
-                      "target version can only be %s, or the '--skip_build'" \
+                      "target version can only be %s, or the '--skip-build'" \
                       " option must be specified" % (short_version,)
         else:
             self.versions = list(self.all_versions)
diff --git a/src/distutils2/command/bdist_wininst.py b/src/distutils2/command/bdist_wininst.py
index 264f4fb..562c4ed 100644
--- a/src/distutils2/command/bdist_wininst.py
+++ b/src/distutils2/command/bdist_wininst.py
@@ -96,7 +96,7 @@ class bdist_wininst (Command):
             short_version = get_python_version()
             if self.target_version and self.target_version != short_version:
                 raise DistutilsOptionError, \
-                      "target version can only be %s, or the '--skip_build'" \
+                      "target version can only be %s, or the '--skip-build'" \
                       " option must be specified" % (short_version,)
             self.target_version = short_version
 
diff --git a/src/distutils2/command/build_ext.py b/src/distutils2/command/build_ext.py
index 29530eb..4fd35d3 100644
--- a/src/distutils2/command/build_ext.py
+++ b/src/distutils2/command/build_ext.py
@@ -101,7 +101,7 @@ class build_ext(Command):
         ('swig-cpp', None,
          "make SWIG create C++ files (default is C)"),
         ('swig-opts=', None,
-         "list of SWIG command line options"),
+         "list of SWIG command-line options"),
         ('swig=', None,
          "path to the SWIG executable"),
         ]
@@ -384,7 +384,7 @@ class build_ext(Command):
             self.compiler_obj.initialize(self.plat_name)
 
         # And make sure that any compile/link-related options (which might
-        # come from the command-line or from the setup script) are set in
+        # come from the command line or from the setup script) are set in
         # that CCompiler object -- that way, they automatically apply to
         # all compiling and linking done here.
         if self.include_dirs is not None:
@@ -471,7 +471,7 @@ class build_ext(Command):
         #     guess it's useful)
         # The environment variable should take precedence, and
         # any sensible compiler will give precedence to later
-        # command line args.  Hence we combine them in order:
+        # command-line args.  Hence we combine them in order:
         extra_args = ext.extra_compile_args or []
 
         macros = ext.define_macros[:]
diff --git a/src/distutils2/command/cmd.py b/src/distutils2/command/cmd.py
index 73ac9e1..a4e4b9b 100644
--- a/src/distutils2/command/cmd.py
+++ b/src/distutils2/command/cmd.py
@@ -97,7 +97,7 @@ class Command(object):
         # just to be safe.
         self.force = None
 
-        # The 'help' flag is just used for command-line parsing, so
+        # The 'help' flag is just used for command line parsing, so
         # none of that complicated bureaucracy is needed.
         self.help = 0
 
@@ -128,7 +128,7 @@ class Command(object):
     #   finalize_options()
     #     decide on the final values for all options; this is called
     #     after all possible intervention from the outside world
-    #     (command-line, option file, etc.) has been processed
+    #     (command line, option file, etc.) has been processed
     #   run()
     #     run the command: do whatever it is we're here to do,
     #     controlled by the command's various option values
@@ -137,7 +137,7 @@ class Command(object):
         """Set default values for all the options that this command
         supports.  Note that these defaults may be overridden by other
         commands, by the setup script, by config files, or by the
-        command-line.  Thus, this is not the place to code dependencies
+        command line.  Thus, this is not the place to code dependencies
         between options; generally, 'initialize_options()' implementations
         are just a bunch of "self.foo = None" assignments.
 
@@ -149,7 +149,7 @@ class Command(object):
     def finalize_options(self):
         """Set final values for all the options that this command supports.
         This is always called as late as possible, ie.  after any option
-        assignments from the command-line or from other commands have been
+        assignments from the command line or from other commands have been
         done.  Thus, this is the place to code option dependencies: if
         'foo' depends on 'bar', then it is safe to set 'foo' from 'bar' as
         long as 'foo' still has the same value it was assigned in
@@ -179,7 +179,7 @@ class Command(object):
         """A command's raison d'etre: carry out the action it exists to
         perform, controlled by the options initialized in
         'initialize_options()', customized by other commands, the setup
-        script, the command-line, and config files, and finalized in
+        script, the command line and config files, and finalized in
         'finalize_options()'.  All terminal output and filesystem
         interaction should be done by 'run()'.