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

Improve some unicode regular expressions

Browse source
This commit is contained in:
Ricardo Garcia 2008-07-22 09:53:05 +02:00 • committed by Ricardo Garcia
parent 22899cea59
commit f97c8db74e
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
youtube-dl
View file

@ -155,7 +155,7 @@ class FileDownloader(object):
def fixed_template(self): def fixed_template(self):
"""Checks if the output template is fixed.""" """Checks if the output template is fixed."""
return (re.search(ur'%\(.+?\)s', self._params['outtmpl']) is None) return (re.search(ur'(?u)%\(.+?\)s', self._params['outtmpl']) is None)
def download(self, url_list): def download(self, url_list):
"""Download a given list of URLs.""" """Download a given list of URLs."""
@ -419,11 +419,11 @@ class YoutubeIE(InfoExtractor):
self.to_stderr('ERROR: Unable to extract video title') self.to_stderr('ERROR: Unable to extract video title')
return [None] return [None]
video_title = mobj.group(1).decode('utf-8') video_title = mobj.group(1).decode('utf-8')
video_title = re.sub(u'&(.+?);', lambda x: unichr(htmlentitydefs.name2codepoint[x.group(1)]), video_title) video_title = re.sub(ur'(?u)&(.+?);', lambda x: unichr(htmlentitydefs.name2codepoint[x.group(1)]), video_title)
# simplified title # simplified title
simple_title = re.sub(u'([^%s]+)' % simple_title_chars, u'_', video_title) simple_title = re.sub(ur'(?u)([^%s]+)' % simple_title_chars, ur'_', video_title)
simple_title = simple_title.strip(u'_') simple_title = simple_title.strip(ur'_')
# Return information # Return information
return [{ return [{