schmittlauch/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Rename util.u to util.compat_str

Browse source
This commit is contained in:
Philipp Hagemeister 2012-11-27 23:29:18 +01:00
parent c116339ddb
commit 96731798db
3 changed files with 61 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

4
youtube_dl/FileDownloader.py
View file

@ -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):