Fix 2.6 compatibility with subprocess

We can add this back once we go 2.7-only.
beetbox · Dec 21, 2014 · 016c901 · 016c901
1 parent b151026
commit 016c901
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/beets/util/__init__.py b/beets/util/__init__.py
@@ -665,7 +665,6 @@ def command_output(cmd, shell=False):
         raise subprocess.CalledProcessError(
             returncode=proc.returncode,
             cmd=' '.join(cmd),
-            output=stderr
         )
     return stdout
 

diff --git a/beetsplug/convert.py b/beetsplug/convert.py
@@ -112,10 +112,9 @@ def encode(command, source, dest, pretend=False):
         # Something went wrong (probably Ctrl+C), remove temporary files
         log.info(u'Encoding {0} failed. Cleaning up...'
                  .format(util.displayable_path(source)))
-        log.debug(u'Command {0} exited with status {1}, output: {2}'.format(
+        log.debug(u'Command {0} exited with status {1}'.format(
             exc.cmd.decode('utf8', 'ignore'),
             exc.returncode,
-            exc.output.decode('utf8', 'ignore'),
         ))
         util.remove(dest)
         util.prune_dirs(os.path.dirname(dest))