projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9e105a8
)
[downloader/external] Use encodeArgument
author
Sergey M․
<dstftw@gmail.com>
Sat, 25 Apr 2015 22:33:43 +0000
(
04:33
+0600)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 25 Apr 2015 22:33:43 +0000
(
04:33
+0600)
youtube_dl/downloader/external.py
patch
|
blob
|
history
diff --git
a/youtube_dl/downloader/external.py
b/youtube_dl/downloader/external.py
index 1673b2382af545e1ec8f4ef81bc8656555e388fb..7ca2d314348400fc6ba3095e23d69e1c925ad7dd 100644
(file)
--- a/
youtube_dl/downloader/external.py
+++ b/
youtube_dl/downloader/external.py
@@
-2,11
+2,11
@@
from __future__ import unicode_literals
import os.path
import subprocess
import os.path
import subprocess
-import sys
from .common import FileDownloader
from ..utils import (
encodeFilename,
from .common import FileDownloader
from ..utils import (
encodeFilename,
+ encodeArgument,
)
)
@@
-60,17
+60,9
@@
class ExternalFD(FileDownloader):
def _call_downloader(self, tmpfilename, info_dict):
""" Either overwrite this or implement _make_cmd """
def _call_downloader(self, tmpfilename, info_dict):
""" Either overwrite this or implement _make_cmd """
- cmd = self._make_cmd(tmpfilename, info_dict)
-
- if sys.platform == 'win32' and sys.version_info < (3, 0):
- # 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)
+ cmd = [encodeArgument(a) for a in self._make_cmd(tmpfilename, info_dict)]
+
+ self._debug_cmd(cmd)
p = subprocess.Popen(
cmd, stderr=subprocess.PIPE)
p = subprocess.Popen(
cmd, stderr=subprocess.PIPE)