summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorPhilipp Hagemeister <[email protected]>2014-03-27 02:30:00 +0100
committerPhilipp Hagemeister <[email protected]>2014-03-27 02:30:00 +0100
commite9c076c31753d97de574d43c19feef069571bd3a (patch)
treec83f7eea8b4360d912c4ab908cac2bfc6fee64ab
parent6c072e7d2521821f692102fdfa4a431cf1a076ae (diff)
downloadyoutube-dl-e9c076c31753d97de574d43c19feef069571bd3a.tar.gz
youtube-dl-e9c076c31753d97de574d43c19feef069571bd3a.zip
[clipsyndicate] Modernize
-rw-r--r--youtube_dl/extractor/clipsyndicate.py23
1 files changed, 13 insertions, 10 deletions
diff --git a/youtube_dl/extractor/clipsyndicate.py b/youtube_dl/extractor/clipsyndicate.py
index 9ab6a4ab6..02a1667fa 100644
--- a/youtube_dl/extractor/clipsyndicate.py
+++ b/youtube_dl/extractor/clipsyndicate.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
import re
from .common import InfoExtractor
@@ -11,13 +13,14 @@ class ClipsyndicateIE(InfoExtractor):
_VALID_URL = r'http://www\.clipsyndicate\.com/video/play(list/\d+)?/(?P<id>\d+)'
_TEST = {
- u'url': u'http://www.clipsyndicate.com/video/play/4629301/brick_briscoe',
- u'md5': u'4d7d549451bad625e0ff3d7bd56d776c',
- u'info_dict': {
- u'id': u'4629301',
- u'ext': u'mp4',
- u'title': u'Brick Briscoe',
- u'duration': 612,
+ 'url': 'http://www.clipsyndicate.com/video/play/4629301/brick_briscoe',
+ 'md5': '4d7d549451bad625e0ff3d7bd56d776c',
+ 'info_dict': {
+ 'id': '4629301',
+ 'ext': 'mp4',
+ 'title': 'Brick Briscoe',
+ 'duration': 612,
+ 'thumbnail': 're:^https?://.+\.jpg',
},
}
@@ -26,13 +29,13 @@ class ClipsyndicateIE(InfoExtractor):
video_id = mobj.group('id')
js_player = self._download_webpage(
'http://eplayer.clipsyndicate.com/embed/player.js?va_id=%s' % video_id,
- video_id, u'Downlaoding player')
+ video_id, 'Downlaoding player')
# it includes a required token
- flvars = self._search_regex(r'flvars: "(.*?)"', js_player, u'flvars')
+ flvars = self._search_regex(r'flvars: "(.*?)"', js_player, 'flvars')
pdoc = self._download_xml(
'http://eplayer.clipsyndicate.com/osmf/playlist?%s' % flvars,
- video_id, u'Downloading video info',
+ video_id, 'Downloading video info',
transform_source=fix_xml_ampersands)
track_doc = pdoc.find('trackList/track')