Move check_output implementation to future.backports.misc

Author: edschofield

future/backports/misc.py

@@ -9,6 +9,7 @@
 """
 
 from math import ceil as oldceil
+import subprocess
 
 from future.utils import iteritems, PY26
 
@@ -488,3 +489,17 @@ def __and__(self, other):
     OrderedDict = _OrderedDict
     Counter = _Counter
 
+
+# For Python 2.6 compatibility: see http://stackoverflow.com/questions/4814970/
+def check_output(*popenargs, **kwargs):
+    if 'stdout' in kwargs:
+        raise ValueError('stdout argument not allowed, it will be overridden.')
+    process = subprocess.Popen(stdout=subprocess.PIPE, *popenargs, **kwargs)
+    output, unused_err = process.communicate()
+    retcode = process.poll()
+    if retcode:
+        cmd = kwargs.get("args")
+        if cmd is None:
+            cmd = popenargs[0]
+        raise subprocess.CalledProcessError(retcode, cmd)
+    return output

future/moves/subprocess.py

@@ -8,15 +8,4 @@
     from commands import getoutput, getstatusoutput
 
 if PY26:
-    def check_output(*popenargs, **kwargs):
-        if 'stdout' in kwargs:
-            raise ValueError('stdout argument not allowed, it will be overridden.')
-        process = Popen(stdout=PIPE, *popenargs, **kwargs)
-        output, unused_err = process.communicate()
-        retcode = process.poll()
-        if retcode:
-            cmd = kwargs.get("args")
-            if cmd is None:
-                cmd = popenargs[0]
-            raise CalledProcessError(retcode, cmd)
-        return output
+    from future.backports.misc import check_output

future/standard_library/__init__.py

@@ -197,6 +197,7 @@
          ('base64', 'decodebytes','base64', 'decodestring'),
          ('subprocess', 'getoutput', 'commands', 'getoutput'),
          ('subprocess', 'getstatusoutput', 'commands', 'getstatusoutput'),
+         ('subprocess', 'check_output', 'future.backports.misc', 'check_output'),
          ('math', 'ceil', 'future.backports.misc', 'ceil'),
          ('collections', 'OrderedDict', 'future.backports.misc', 'OrderedDict'),
          ('collections', 'Counter', 'future.backports.misc', 'Counter'),
@@ -297,11 +298,6 @@ def _find_and_load_module(self, name, path=None):
                 flog.debug('What to do here?')
 
         name = bits[0]
-        # We no longer use the fake module six.moves:
-        # if name == 'moves':
-        #     # imp.find_module doesn't find this fake module
-        #     from future.utils.six import moves
-        #     return moves
         module_info = imp.find_module(name, path)
         return imp.load_module(name, *module_info)
 
@@ -316,7 +312,7 @@ class hooks(object):
     >>> from future import standard_library
     >>> with standard_library.hooks():
     ...     import http.client
-    >>> import requests     # incompatible with ``future``'s standard library hooks
+    >>> import requests
 
     For this to work, http.client will be scrubbed from sys.modules after the
     'with' block. That way the modules imported in the 'with' block will

future/tests/base.py

@@ -2,7 +2,6 @@
 import tempfile
 import unittest
 import sys
-import subprocess
 import re
 import warnings
 import io
@@ -13,12 +12,7 @@
     import unittest2 as unittest
 
 from future.utils import bind_method, PY26, PY3, PY2
-
-
-# For Python 2.6 compatibility: see http://stackoverflow.com/questions/4814970/
-if "check_output" not in dir(subprocess): # duck punch it in!
-    from future.moves.subprocess import check_output
-    subprocess.check_output = check_output
+from future.moves.subprocess import check_output, STDOUT
 
 
 def reformat_code(code):
@@ -282,15 +276,15 @@ def _futurize_test_script(self, filename='mytestscript.py', stages=(1, 2),
                 params.append('--conservative')
             # No extra params needed
 
-        output = subprocess.check_output([sys.executable, script] + params +
+        output = check_output([sys.executable, script] + params +
                                          ['-w', self.tempdir + filename],
-                                         stderr=subprocess.STDOUT)
+                                         stderr=STDOUT)
         return output
 
     def _run_test_script(self, filename='mytestscript.py',
                          interpreter=sys.executable):
         env = {'PYTHONPATH': os.getcwd()}
-        return subprocess.check_output([interpreter, self.tempdir + filename],
+        return check_output([interpreter, self.tempdir + filename],
                                        env=env)