浏览代码

[downloader/common] Use `compat_str` with the error in `try_rename` (appeared in #2389)

Otherwise on python 2.x we get `UnicodeDecodeError` because it may contain non ascii characters.
Jaime Marquínez Ferrándiz 11 年之前
父节点
当前提交
e3ced9ed61
共有 1 个文件被更改,包括 3 次插入2 次删除
  1. 3 2
      youtube_dl/downloader/common.py

+ 3 - 2
youtube_dl/downloader/common.py

@@ -4,9 +4,10 @@ import sys
 import time
 
 from ..utils import (
+    compat_str,
     encodeFilename,
-    timeconvert,
     format_bytes,
+    timeconvert,
 )
 
 
@@ -173,7 +174,7 @@ class FileDownloader(object):
                 return
             os.rename(encodeFilename(old_filename), encodeFilename(new_filename))
         except (IOError, OSError) as err:
-            self.report_error(u'unable to rename file: %s' % str(err))
+            self.report_error(u'unable to rename file: %s' % compat_str(err))
 
     def try_utime(self, filename, last_modified_hdr):
         """Try to set the last-modified time of the given file."""