github-com-ytdl-org/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-01-07 17:16:08 +00:00
Code Issues Releases Wiki Activity

Provide compatibility check_output for 2.6 (Fixes #2926)

Browse source
This commit is contained in:
Philipp Hagemeister 2014-05-16 12:03:59 +02:00
parent 01ed5c9be3
commit 0a871f6880
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
youtube_dl/postprocessor/xattrpp.py
View file

@ -6,6 +6,7 @@ from .common import PostProcessor
from ..utils import ( from ..utils import (
check_executable, check_executable,
hyphenate_date, hyphenate_date,
subprocess_check_output
) )
@ -57,7 +58,7 @@ class XAttrMetadataPP(PostProcessor):
elif user_has_xattr: elif user_has_xattr:
cmd = ['xattr', '-w', key, value, path] cmd = ['xattr', '-w', key, value, path]
subprocess.check_output(cmd) subprocess_check_output(cmd)
else: else:
# On Unix, and can't find pyxattr, setfattr, or xattr. # On Unix, and can't find pyxattr, setfattr, or xattr.

12
youtube_dl/utils.py
View file

@ -1429,3 +1429,15 @@ def qualities(quality_ids):
DEFAULT_OUTTMPL = '%(title)s-%(id)s.%(ext)s' DEFAULT_OUTTMPL = '%(title)s-%(id)s.%(ext)s'
try:
subprocess_check_output = subprocess.check_output
except AttributeError:
def subprocess_check_output(*args, **kwargs):
assert 'input' not in kwargs
p = subprocess.Popen(*args, stdout=subprocess.PIPE, **kwargs)
output, _ = p.communicate()
ret = p.poll()
if ret:
raise subprocess.CalledProcessError(ret, p.args, output=output)
return output