desastre
/
youtube-dl
forked from minhngoc25a/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[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.
This commit is contained in:
Jaime Marquínez Ferrándiz 2014-04-04 14:59:11 +02:00
parent 5075d598bc
commit e3ced9ed61
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
youtube_dl/downloader/common.py
View File

@ -4,9 +4,10 @@ import sys
import time import time
from ..utils import ( from ..utils import (
compat_str,
encodeFilename, encodeFilename,
timeconvert,
format_bytes, format_bytes,
timeconvert,
) )
@ -173,7 +174,7 @@ class FileDownloader(object):
return return
os.rename(encodeFilename(old_filename), encodeFilename(new_filename)) os.rename(encodeFilename(old_filename), encodeFilename(new_filename))
except (IOError, OSError) as err: 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): def try_utime(self, filename, last_modified_hdr):
"""Try to set the last-modified time of the given file.""" """Try to set the last-modified time of the given file."""