Rename util.u to util.compat_str

[youtube-dl.git] / youtube_dl / FileDownloader.py

diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py
index 870c8227235c5a423768be8b13e92f7cb9cb2a7c..815b8129619aec4536b5e071a245f49e2658e4b6 100644 (file)
--- a/youtube_dl/FileDownloader.py
+++ b/youtube_dl/FileDownloader.py
@@ -332,7 +332,7 @@ class FileDownloader(object):
                        template_dict['autonumber'] = u'%05d' % self._num_downloads
 
                        template_dict = dict((key, u'NA' if val is None else val) for key, val in template_dict.items())
-                       template_dict = dict((k, sanitize_filename(u(v), self.params.get('restrictfilenames'))) for k,v in template_dict.items())
+                       template_dict = dict((k, sanitize_filename(compat_str(v), self.params.get('restrictfilenames'))) for k,v in template_dict.items())
 
                        filename = self.params['outtmpl'] % template_dict
                        return filename
@@ -403,7 +403,7 @@ class FileDownloader(object):
                        if dn != '' and not os.path.exists(dn): # dn is already encoded
                                os.makedirs(dn)
                except (OSError, IOError), err:
-                       self.trouble(u'ERROR: unable to create directory ' + u(err))
+                       self.trouble(u'ERROR: unable to create directory ' + compat_str(err))
                        return
 
                if self.params.get('writedescription', False):