Merge tag 'upstream/2014.07.11'

[youtubedl] / youtube_dl / downloader / common.py

diff --git a/youtube_dl/downloader/common.py b/youtube_dl/downloader/common.py
index 10143d56a201ca9d7b9b919ab38880adea0c1cf6..917f3450e63c62b95551081109c5d3f55f49aeba 100644 (file)
--- a/youtube_dl/downloader/common.py
+++ b/youtube_dl/downloader/common.py
@@ -4,9 +4,10 @@ import sys
 import time
 
 from ..utils import (
 import time
 
 from ..utils import (

+    compat_str,

     encodeFilename,
     encodeFilename,

-    timeconvert,

     format_bytes,
     format_bytes,

+    timeconvert,

 )
 
 
 )
 
 


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


@@ -314,4 +315,3 @@ class FileDownloader(object):
         if the download is successful.
         """
         self._progress_hooks.append(ph)
         if the download is successful.
         """
         self._progress_hooks.append(ph)

-