take Brett's advice on a few warnings

diff --git a/Doc/library/commands.rst b/Doc/library/commands.rst
index c3f771085e0193d318a76d7cf1e698537938276f..a221fb550a6c5cd00b85ef3bc87e3e2afa7bb051 100644 (file)
--- a/Doc/library/commands.rst
+++ b/Doc/library/commands.rst
@@ -16,6 +16,12 @@ The :mod:`subprocess` module provides more powerful facilities for spawning new
 processes and retrieving their results.  Using the :mod:`subprocess` module is
 preferable to using the :mod:`commands` module.
 
+.. warning::
+
+   In 3.x, :func:`getstatus` and two undocumented functions (:func:`mk2arg` and
+   :func:`mkarg`) have been removed.  Also, :func:`getstatusoutput` and
+   :func:`getoutput` have been moved to the :mod:`subprocess` module.
+
 The :mod:`commands` module defines the following functions:
 
 
@@ -42,12 +48,7 @@ The :mod:`commands` module defines the following functions:
 
    .. deprecated:: 2.6
       This function is nonobvious and useless, also the name is misleading in the
-      presence of :func:`getstatusoutput`.  It is removed in 3.x.
-
-.. warning::
-
-   Two undocumented functions in this module, :func:`mk2arg` and :func:`mkargs`
-   are removed in 3.x.
+      presence of :func:`getstatusoutput`.
 
 
 Example::

diff --git a/Lib/commands.py b/Lib/commands.py
index b4e1d3c0f6ad24daaccf0784f8ecadebc8a39a30..287aa27f4dd3d1fb10a5daae57df0600c3d0743a 100644 (file)
--- a/Lib/commands.py
+++ b/Lib/commands.py
@@ -64,7 +64,7 @@ def getstatusoutput(cmd):
 #
 def mk2arg(head, x):
     from warnings import warnpy3k
-    warnpy3k("In 3.x, mk2arg is removed.")
+    warnpy3k("In 3.x, mk2arg has been removed.")
     import os
     return mkarg(os.path.join(head, x))
 
@@ -78,7 +78,7 @@ def mk2arg(head, x):
 #
 def mkarg(x):
     from warnings import warnpy3k
-    warnpy3k("in 3.x, mkarg is remove.")
+    warnpy3k("in 3.x, mkarg has been removed.")
     if '\'' not in x:
         return ' \'' + x + '\''
     s = ' "'