Imported Upstream version 2015.06.04.1

[youtubedl] / youtube_dl / postprocessor / execafterdownload.py

diff --git a/youtube_dl/postprocessor/execafterdownload.py b/youtube_dl/postprocessor/execafterdownload.py
index 75c0f7bbe86ef8e19f41fd61e1bbd58678474d8a..13794b7ba8653b179a08a348744441ae5c296852 100644 (file)
--- a/youtube_dl/postprocessor/execafterdownload.py
+++ b/youtube_dl/postprocessor/execafterdownload.py
@@ -8,8 +8,8 @@ from ..utils import PostProcessingError
 
 
 class ExecAfterDownloadPP(PostProcessor):
 
 
 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):


@@ -25,4 +25,4 @@ class ExecAfterDownloadPP(PostProcessor):
             raise PostProcessingError(
                 'Command returned error code %d' % retCode)
 
             raise PostProcessingError(
                 'Command returned error code %d' % retCode)
 

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