Changeset 391 for python/trunk/Lib/commands.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/commands.py (modified) (3 diffs)

python/trunk/Lib/commands.py

@@ -19 +19 @@
  [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"]
@@ -64 +68 @@
 #
 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))
@@ -78 +80 @@
 #
 def mkarg(x):
-    from warnings import warnpy3k
-    warnpy3k("in 3.x, mkarg has been removed.")
     if '\'' not in x:
         return ' \'' + x + '\''