From 96731798dbdd5a8878ac5cf29b69c6c7c821311b Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Tue, 27 Nov 2012 23:29:18 +0100 Subject: Rename util.u to util.compat_str --- youtube_dl/FileDownloader.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'youtube_dl/FileDownloader.py') diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py index 870c82272..815b81296 100644 --- 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): -- cgit v1.2.3