mirror of
https://github.com/ytdl-org/youtube-dl
synced 2024-09-06 12:15:11 +02:00
[downloader/external] Use encodeArgument
This commit is contained in:
parent
9e105a858c
commit
74f8654a53
@ -2,11 +2,11 @@ from __future__ import unicode_literals
|
|||||||
|
|
||||||
import os.path
|
import os.path
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
|
||||||
|
|
||||||
from .common import FileDownloader
|
from .common import FileDownloader
|
||||||
from ..utils import (
|
from ..utils import (
|
||||||
encodeFilename,
|
encodeFilename,
|
||||||
|
encodeArgument,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@ -60,17 +60,9 @@ class ExternalFD(FileDownloader):
|
|||||||
|
|
||||||
def _call_downloader(self, tmpfilename, info_dict):
|
def _call_downloader(self, tmpfilename, info_dict):
|
||||||
""" Either overwrite this or implement _make_cmd """
|
""" Either overwrite this or implement _make_cmd """
|
||||||
cmd = self._make_cmd(tmpfilename, info_dict)
|
cmd = [encodeArgument(a) for a in self._make_cmd(tmpfilename, info_dict)]
|
||||||
|
|
||||||
if sys.platform == 'win32' and sys.version_info < (3, 0):
|
self._debug_cmd(cmd)
|
||||||
# Windows subprocess module does not actually support Unicode
|
|
||||||
# on Python 2.x
|
|
||||||
# See http://stackoverflow.com/a/9951851/35070
|
|
||||||
subprocess_encoding = sys.getfilesystemencoding()
|
|
||||||
cmd = [a.encode(subprocess_encoding, 'ignore') for a in cmd]
|
|
||||||
else:
|
|
||||||
subprocess_encoding = None
|
|
||||||
self._debug_cmd(cmd, subprocess_encoding)
|
|
||||||
|
|
||||||
p = subprocess.Popen(
|
p = subprocess.Popen(
|
||||||
cmd, stderr=subprocess.PIPE)
|
cmd, stderr=subprocess.PIPE)
|
||||||
|
Loading…
Reference in New Issue
Block a user