Update upstream source from tag 'upstream/2019.07.02'

[youtubedl] / youtube_dl / postprocessor / execafterdownload.py

diff --git a/youtube_dl/postprocessor/execafterdownload.py b/youtube_dl/postprocessor/execafterdownload.py
index 13794b7ba8653b179a08a348744441ae5c296852..64dabe790bcb74e88b4959f3c20e0eb23a0bcf8c 100644 (file)
--- a/youtube_dl/postprocessor/execafterdownload.py
+++ b/youtube_dl/postprocessor/execafterdownload.py
@@ -3,8 +3,11 @@ from __future__ import unicode_literals
 import subprocess
 
 from .common import PostProcessor
 import subprocess
 
 from .common import PostProcessor

-from ..compat import shlex_quote
-from ..utils import PostProcessingError
+from ..compat import compat_shlex_quote
+from ..utils import (
+    encodeArgument,
+    PostProcessingError,
+)

 
 
 class ExecAfterDownloadPP(PostProcessor):
 
 
 class ExecAfterDownloadPP(PostProcessor):


@@ -17,10 +20,10 @@ 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)
-        retCode = subprocess.call(cmd, shell=True)
+        self._downloader.to_screen('[exec] Executing command: %s' % cmd)
+        retCode = subprocess.call(encodeArgument(cmd), shell=True)

         if retCode != 0:
             raise PostProcessingError(
                 'Command returned error code %d' % retCode)
         if retCode != 0:
             raise PostProcessingError(
                 'Command returned error code %d' % retCode)