Imported Upstream version 2015.11.27.1

[youtubedl] / youtube_dl / postprocessor / execafterdownload.py

diff --git a/youtube_dl/postprocessor/execafterdownload.py b/youtube_dl/postprocessor/execafterdownload.py
index 08419a3d4b6990c83cd0d0c844a61c2abe5c2f0e..13794b7ba8653b179a08a348744441ae5c296852 100644 (file)
--- a/youtube_dl/postprocessor/execafterdownload.py
+++ b/youtube_dl/postprocessor/execafterdownload.py
@@ -3,20 +3,18 @@ from __future__ import unicode_literals
 import subprocess
 
 from .common import PostProcessor
 import subprocess
 
 from .common import PostProcessor

-from ..utils import (
-    shlex_quote,
-    PostProcessingError,
-)
+from ..compat import shlex_quote
+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):
         cmd = self.exec_cmd
         self.exec_cmd = exec_cmd
 
     def run(self, information):
         cmd = self.exec_cmd

-        if not '{}' in cmd:
+        if '{}' not in cmd:

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


@@ -27,5 +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