Browse Source

[downloader/common] Use decodeArgument

Sergey M․ 10 years ago
parent
commit
cd8a07a764
1 changed files with 5 additions and 8 deletions
  1. 5 8
      youtube_dl/downloader/common.py

+ 5 - 8
youtube_dl/downloader/common.py

@@ -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
 
 
+        str_args = [decodeArgument(a) for a in args]
+
         if exe is None:
         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:
         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))