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

[benjamin.peterson]

Author: benjamin.peterson
Date: Mon May 26 21:41:53 2008
New Revision: 63721

Log:
warn about some members of the commands module


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

Modified: python/trunk/Doc/library/commands.rst
==============================================================================
--- python/trunk/Doc/library/commands.rst	(original)
+++ python/trunk/Doc/library/commands.rst	Mon May 26 21:41:53 2008
@@ -42,7 +42,13 @@
 
    .. deprecated:: 2.6
       This function is nonobvious and useless, also the name is misleading in the
-      presence of :func:`getstatusoutput`.
+      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.
+
 
 Example::
 

Modified: python/trunk/Lib/commands.py
==============================================================================
--- python/trunk/Lib/commands.py	(original)
+++ python/trunk/Lib/commands.py	Mon May 26 21:41:53 2008
@@ -63,6 +63,8 @@
 # Make command argument from directory and pathname (prefix space, add quotes).
 #
 def mk2arg(head, x):
+    from warnings import warnpy3k
+    warnpy3k("In 3.x, mk2arg is removed.")
     import os
     return mkarg(os.path.join(head, x))
 
@@ -75,6 +77,8 @@
 # with backslash.
 #
 def mkarg(x):
+    from warnings import warnpy3k
+    warnpy3k("in 3.x, mkarg is remove.")
     if '\'' not in x:
         return ' \'' + x + '\''
     s = ' "'

Modified: python/trunk/Lib/test/test_py3kwarn.py
==============================================================================
--- python/trunk/Lib/test/test_py3kwarn.py	(original)
+++ python/trunk/Lib/test/test_py3kwarn.py	Mon May 26 21:41:53 2008
@@ -212,6 +212,15 @@
                 mod.walk(".", dumbo, None)
             self.assertEquals(str(w.message), msg)
 
+    def test_commands_members(self):
+        import commands
+        members = {"mk2arg" : 2, "mkarg" : 1, "getstatus" : 1}
+        for name, arg_count in members.items():
+            with catch_warning(record=False):
+                warnings.filterwarnings("error")
+                func = getattr(commands, name)
+                self.assertRaises(DeprecationWarning, func, *([None]*arg_count))
+
 
 def test_main():
     run_unittest(TestPy3KWarnings,