mirror of
				https://gitlab.com/ytdl-org/youtube-dl.git
				synced 2025-11-04 08:07:06 -05:00 
			
		
		
		
	[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:
		@@ -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."""
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user