Merge tag 'upstream/2014.10.30'

[youtubedl] / youtube_dl / postprocessor / xattrpp.py

diff --git a/youtube_dl/postprocessor/xattrpp.py b/youtube_dl/postprocessor/xattrpp.py
index 18979241cd9f0bb70cf2d8e9c00709ec43db1fea..f6940940b340dea5c23e5ce118b8fcc4d7ee8574 100644 (file)
--- a/youtube_dl/postprocessor/xattrpp.py
+++ b/youtube_dl/postprocessor/xattrpp.py
@@ -6,6 +6,7 @@ from .common import PostProcessor
 from ..utils import (
     check_executable,
     hyphenate_date,
 from ..utils import (
     check_executable,
     hyphenate_date,

+    subprocess_check_output

 )
 
 
 )
 
 


@@ -57,7 +58,7 @@ class XAttrMetadataPP(PostProcessor):
                         elif user_has_xattr:
                             cmd = ['xattr', '-w', key, value, path]
 
                         elif user_has_xattr:
                             cmd = ['xattr', '-w', key, value, path]
 

-                        subprocess.check_output(cmd)
+                        subprocess_check_output(cmd)

 
                 else:
                     # On Unix, and can't find pyxattr, setfattr, or xattr.
 
                 else:
                     # On Unix, and can't find pyxattr, setfattr, or xattr.