logo

youtube-dl

[mirror] Download/Watch videos from video hosters
commit: e3ced9ed615f7aaeb2284a33dbdbc4e4b0b36833
parent 5075d598bc61b199e4a1e7484c765c3cd0c27c40
Author: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date:   Fri,  4 Apr 2014 14:59:11 +0200

[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.

Diffstat:

Myoutube_dl/downloader/common.py5+++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git 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."""