mirrors/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-23 06:42:21 +00:00
Code Issues Projects Releases Wiki Activity

[downloader/common] Use decodeArgument

Browse Source
This commit is contained in:
Sergey M․ 2015-04-26 04:30:45 +06:00
parent aa49acd15a
commit cd8a07a764
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
youtube_dl/downloader/common.py
View File

@ -8,6 +8,7 @@ import time
from ..compat import compat_str from ..compat import compat_str
from ..utils import ( from ..utils import (
encodeFilename, encodeFilename,
decodeArgument,
format_bytes, format_bytes,
timeconvert, timeconvert,
) )
@ -353,19 +354,15 @@ class FileDownloader(object):
# this interface # this interface
self._progress_hooks.append(ph) self._progress_hooks.append(ph)
def _debug_cmd(self, args, subprocess_encoding, exe=None): def _debug_cmd(self, args, exe=None):
if not self.params.get('verbose', False): if not self.params.get('verbose', False):
return return
if exe is None: str_args = [decodeArgument(a) for a in args]
exe = os.path.basename(args[0])
if exe is None:
exe = os.path.basename(str_args[0])
if subprocess_encoding:
str_args = [
a.decode(subprocess_encoding) if isinstance(a, bytes) else a
for a in args]
else:
str_args = args
try: try:
import pipes import pipes
shell_quote = lambda args: ' '.join(map(pipes.quote, str_args)) shell_quote = lambda args: ' '.join(map(pipes.quote, str_args))