From 468c99257ca43401413366e7dc4544d5cca28a36 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Mon, 21 Nov 2011 21:51:24 +0100 Subject: [PATCH] Release 2011.11.21 --- LATEST_VERSION | 2 +- youtube-dl | 12 +++++++----- youtube_dl/__init__.py | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/LATEST_VERSION b/LATEST_VERSION index a68f991..b30ab00 100644 --- a/LATEST_VERSION +++ b/LATEST_VERSION @@ -1 +1 @@ -2011.10.19 +2011.11.21 diff --git a/youtube-dl b/youtube-dl index d4eadc9..9ed1621 100755 --- a/youtube-dl +++ b/youtube-dl @@ -17,7 +17,7 @@ __author__ = ( ) __license__ = 'Public Domain' -__version__ = '2011.10.19' +__version__ = '2011.11.21' UPDATE_URL = 'https://raw.github.com/rg3/youtube-dl/master/youtube-dl' @@ -278,7 +278,8 @@ def timeconvert(timestr): return timestamp def _simplify_title(title): - return re.sub(ur'[^\w\d_\-]+', u'_', title).strip(u'_') + expr = re.compile(ur'[^\w\d_\-]+', flags=re.UNICODE) + return expr.sub(u'_', title).strip(u'_') class DownloadError(Exception): """Download Error exception. @@ -2937,6 +2938,7 @@ class BlipTVIE(InfoExtractor): if urlh.headers.get('Content-Type', '').startswith('video/'): # Direct download basename = url.split('/')[-1] title,ext = os.path.splitext(basename) + title = title.decode('UTF-8') ext = ext.replace('.', '') self.report_direct_download(title) info = { @@ -3089,9 +3091,9 @@ class ComedyCentralIE(InfoExtractor): if mobj.group('shortname'): if mobj.group('shortname') in ('tds', 'thedailyshow'): - url = 'http://www.thedailyshow.com/full-episodes/' + url = u'http://www.thedailyshow.com/full-episodes/' else: - url = 'http://www.colbertnation.com/full-episodes/' + url = u'http://www.colbertnation.com/full-episodes/' mobj = re.match(self._VALID_URL, url) assert mobj is not None @@ -3177,7 +3179,7 @@ class ComedyCentralIE(InfoExtractor): self._downloader.increment_downloads() - effTitle = showId + '-' + epTitle + effTitle = showId + u'-' + epTitle info = { 'id': shortMediaId, 'url': video_url, diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 36520c5..9ed1621 100755 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -17,7 +17,7 @@ __author__ = ( ) __license__ = 'Public Domain' -__version__ = '2011.10.19' +__version__ = '2011.11.21' UPDATE_URL = 'https://raw.github.com/rg3/youtube-dl/master/youtube-dl' -- 1.8.3.1