[Python-checkins] r71904 - in python/trunk: Doc/library/commands.rst Lib/commands.py

[georg.brandl]

Author: georg.brandl
Date: Sat Apr 25 17:11:29 2009
New Revision: 71904

Log:
#5841: add deprecation py3k warning and notice in the docs for commands module.

Modified:
   python/trunk/Doc/library/commands.rst
   python/trunk/Lib/commands.py

Modified: python/trunk/Doc/library/commands.rst
==============================================================================
--- python/trunk/Doc/library/commands.rst	(original)
+++ python/trunk/Doc/library/commands.rst	Sat Apr 25 17:11:29 2009
@@ -5,6 +5,12 @@
 .. module:: commands
    :platform: Unix
    :synopsis: Utility functions for running external commands.
+   :deprecated:
+
+.. deprecated:: 2.6
+   The :mod:`commands` module has been removed in Python 3.0.  Use the
+   :mod:`subprocess` module instead.
+
 .. sectionauthor:: Sue Williams <sbw at provis.com>
 
 

Modified: python/trunk/Lib/commands.py
==============================================================================
--- python/trunk/Lib/commands.py	(original)
+++ python/trunk/Lib/commands.py	Sat Apr 25 17:11:29 2009
@@ -18,6 +18,10 @@
 
  [Note:  it would be nice to add functions to interpret the exit status.]
 """
+from warnings import warnpy3k
+warnpy3k("the commands module has been removed in Python 3.0; "
+         "use the subprocess module instead", stacklevel=2)
+del warnpy3k
 
 __all__ = ["getstatusoutput","getoutput","getstatus"]
 
@@ -63,8 +67,6 @@
 # Make command argument from directory and pathname (prefix space, add quotes).
 #
 def mk2arg(head, x):
-    from warnings import warnpy3k
-    warnpy3k("In 3.x, mk2arg has been removed.")
     import os
     return mkarg(os.path.join(head, x))
 
@@ -77,8 +79,6 @@
 # with backslash.
 #
 def mkarg(x):
-    from warnings import warnpy3k
-    warnpy3k("in 3.x, mkarg has been removed.")
     if '\'' not in x:
         return ' \'' + x + '\''
     s = ' "'