Skip to content

Commit

Permalink
[downloader/common] Use decodeArgument
Browse files Browse the repository at this point in the history
  • Loading branch information
dstftw committed Apr 25, 2015
1 parent aa49acd commit cd8a07a
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions youtube_dl/downloader/common.py
Expand Up @@ -8,6 +8,7 @@
from ..compat import compat_str
from ..utils import (
encodeFilename,
decodeArgument,
format_bytes,
timeconvert,
)
Expand Down Expand Up @@ -353,19 +354,15 @@ def add_progress_hook(self, ph):
# this interface
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):
return

str_args = [decodeArgument(a) for a in args]

if exe is None:
exe = os.path.basename(args[0])
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:
import pipes
shell_quote = lambda args: ' '.join(map(pipes.quote, str_args))
Expand Down

0 comments on commit cd8a07a

Please sign in to comment.