Merge tag 'upstream/2017.03.26'

[youtubedl] / youtube_dl / postprocessor / execafterdownload.py

diff --git a/youtube_dl/postprocessor/execafterdownload.py b/youtube_dl/postprocessor/execafterdownload.py
index 75c0f7bbe86ef8e19f41fd61e1bbd58678474d8a..90630c2d7391de9fd288662c8f207433702f8c99 100644 (file)
--- a/youtube_dl/postprocessor/execafterdownload.py
+++ b/youtube_dl/postprocessor/execafterdownload.py
@@ -3,13 +3,13 @@ from __future__ import unicode_literals
 import subprocess
 
 from .common import PostProcessor
 import subprocess
 
 from .common import PostProcessor

-from ..compat import shlex_quote
+from ..compat import compat_shlex_quote

 from ..utils import PostProcessingError
 
 
 class ExecAfterDownloadPP(PostProcessor):
 from ..utils import PostProcessingError
 
 
 class ExecAfterDownloadPP(PostProcessor):

-    def __init__(self, downloader=None, verboseOutput=None, exec_cmd=None):
-        self.verboseOutput = verboseOutput
+    def __init__(self, downloader, exec_cmd):
+        super(ExecAfterDownloadPP, self).__init__(downloader)

         self.exec_cmd = exec_cmd
 
     def run(self, information):
         self.exec_cmd = exec_cmd
 
     def run(self, information):


@@ -17,12 +17,12 @@ class ExecAfterDownloadPP(PostProcessor):
         if '{}' not in cmd:
             cmd += ' {}'
 
         if '{}' not in cmd:
             cmd += ' {}'
 

-        cmd = cmd.replace('{}', shlex_quote(information['filepath']))
+        cmd = cmd.replace('{}', compat_shlex_quote(information['filepath']))

 
 

-        self._downloader.to_screen("[exec] Executing command: %s" % cmd)
+        self._downloader.to_screen('[exec] Executing command: %s' % cmd)

         retCode = subprocess.call(cmd, shell=True)
         if retCode != 0:
             raise PostProcessingError(
                 'Command returned error code %d' % retCode)
 
         retCode = subprocess.call(cmd, shell=True)
         if retCode != 0:
             raise PostProcessingError(
                 'Command returned error code %d' % retCode)
 

-        return None, information  # by default, keep file and do nothing
+        return [], information