summary refs log tree commit diff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2015-04-26 04:30:45 +0600
committerSergey M․ <dstftw@gmail.com>2015-04-26 04:30:45 +0600
commitcd8a07a7649cbd0feea476c89882c5c85130724f (patch)
tree10b8296a235bca6487bba233eea3a6d002dab4ce
parentaa49acd15a92faa5cfc1d2876821743f86440c13 (diff)
downloadyoutube-dl-cd8a07a7649cbd0feea476c89882c5c85130724f.tar.gz
youtube-dl-cd8a07a7649cbd0feea476c89882c5c85130724f.tar.xz
youtube-dl-cd8a07a7649cbd0feea476c89882c5c85130724f.zip
[downloader/common] Use decodeArgument
-rw-r--r--youtube_dl/downloader/common.py13
1 files changed, 5 insertions, 8 deletions
diff --git a/youtube_dl/downloader/common.py b/youtube_dl/downloader/common.py
index a0fc5ead0..97e755d4b 100644
--- a/youtube_dl/downloader/common.py
+++ b/youtube_dl/downloader/common.py
@@ -8,6 +8,7 @@ import time
 from ..compat import compat_str
 from ..utils import (
     encodeFilename,
+    decodeArgument,
     format_bytes,
     timeconvert,
 )
@@ -353,19 +354,15 @@ class FileDownloader(object):
         # 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))