aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2014-04-04 14:59:11 +0200
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2014-04-04 14:59:11 +0200
commite3ced9ed615f7aaeb2284a33dbdbc4e4b0b36833 (patch)
tree2e60969f09d92a66cb2e160f50091d28c5fad913
parent5075d598bc61b199e4a1e7484c765c3cd0c27c40 (diff)
[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.
-rw-r--r--youtube_dl/downloader/common.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/youtube_dl/downloader/common.py b/youtube_dl/downloader/common.py
index 5a068aa8b..917f3450e 100644
--- a/youtube_dl/downloader/common.py
+++ b/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."""