Use iterpipes for 2.6 subprocess compatibility

michaeljoseph · Oct 17, 2013 · 349be50 · 349be50
1 parent 4c9b7f5
commit 349be50
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/changes/shell.py b/changes/shell.py
@@ -1,15 +1,16 @@
-import subprocess
 import logging
 
+import iterpipes
+
 log = logging.getLogger(__name__)
 
 
 def execute(command, dry_run=True):
     log.debug('executing %s', command)
     if not dry_run:
         try:
-            return subprocess.check_output(command.split(' ')).split('\n')
-        except subprocess.CalledProcessError, e:
+            return [result for result in iterpipes.linecmd(command)(None)]
+        except iterpipes.CalledProcessError, e:
             log.debug('return code: %s, output: %s', e.returncode, e.output)
             return False
     else:

diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,6 @@
 coverage < 4.0.0
 docopt < 1.0.0 
+iterpipes < 1.0.0
 flake8 < 3.0.0
 mock < 2.0.0
 nose < 2.0.0

diff --git a/setup.py b/setup.py
@@ -11,6 +11,7 @@
     packages=[changes.__name__],
     install_requires=[
         'docopt < 1.0.0',
+        'iterpipes < 1.0.0',
         'path.py < 5.0.0',
         'semantic_version < 3.0.0',
         'virtualenv < 2.0.0',