commit 6e249060cf2225fd4dc2c72c99bb1ab70ce40079
parent fbcd7b5f83699cd74a5eb3a47d75e331a8f8fb50
Author: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 17 Jan 2014 03:32:02 +0100
[condenast] Use unicode_literals
Diffstat:
1 file changed, 25 insertions(+), 23 deletions(-)
diff --git a/youtube_dl/extractor/condenast.py b/youtube_dl/extractor/condenast.py
@@ -1,4 +1,5 @@
# coding: utf-8
+from __future__ import unicode_literals
import re
import json
@@ -20,30 +21,31 @@ class CondeNastIE(InfoExtractor):
# The keys are the supported sites and the values are the name to be shown
# to the user and in the extractor description.
- _SITES = {'wired': u'WIRED',
- 'gq': u'GQ',
- 'vogue': u'Vogue',
- 'glamour': u'Glamour',
- 'wmagazine': u'W Magazine',
- 'vanityfair': u'Vanity Fair',
- }
+ _SITES = {
+ 'wired': 'WIRED',
+ 'gq': 'GQ',
+ 'vogue': 'Vogue',
+ 'glamour': 'Glamour',
+ 'wmagazine': 'W Magazine',
+ 'vanityfair': 'Vanity Fair',
+ }
_VALID_URL = r'http://(video|www).(?P<site>%s).com/(?P<type>watch|series|video)/(?P<id>.+)' % '|'.join(_SITES.keys())
- IE_DESC = u'Condé Nast media group: %s' % ', '.join(sorted(_SITES.values()))
+ IE_DESC = 'Condé Nast media group: %s' % ', '.join(sorted(_SITES.values()))
_TEST = {
- u'url': u'http://video.wired.com/watch/3d-printed-speakers-lit-with-led',
- u'file': u'5171b343c2b4c00dd0c1ccb3.mp4',
- u'md5': u'1921f713ed48aabd715691f774c451f7',
- u'info_dict': {
- u'title': u'3D Printed Speakers Lit With LED',
- u'description': u'Check out these beautiful 3D printed LED speakers. You can\'t actually buy them, but LumiGeek is working on a board that will let you make you\'re own.',
+ 'url': 'http://video.wired.com/watch/3d-printed-speakers-lit-with-led',
+ 'file': '5171b343c2b4c00dd0c1ccb3.mp4',
+ 'md5': '1921f713ed48aabd715691f774c451f7',
+ 'info_dict': {
+ 'title': '3D Printed Speakers Lit With LED',
+ 'description': 'Check out these beautiful 3D printed LED speakers. You can\'t actually buy them, but LumiGeek is working on a board that will let you make you\'re own.',
}
}
def _extract_series(self, url, webpage):
title = self._html_search_regex(r'<div class="cne-series-info">.*?<h1>(.+?)</h1>',
- webpage, u'series title', flags=re.DOTALL)
+ webpage, 'series title', flags=re.DOTALL)
url_object = compat_urllib_parse_urlparse(url)
base_url = '%s://%s' % (url_object.scheme, url_object.netloc)
m_paths = re.finditer(r'<p class="cne-thumb-title">.*?<a href="(/watch/.+?)["\?]',
@@ -57,24 +59,24 @@ class CondeNastIE(InfoExtractor):
description = self._html_search_regex([r'<div class="cne-video-description">(.+?)</div>',
r'<div class="video-post-content">(.+?)</div>',
],
- webpage, u'description',
+ webpage, 'description',
fatal=False, flags=re.DOTALL)
params = self._search_regex(r'var params = {(.+?)}[;,]', webpage,
- u'player params', flags=re.DOTALL)
- video_id = self._search_regex(r'videoId: [\'"](.+?)[\'"]', params, u'video id')
- player_id = self._search_regex(r'playerId: [\'"](.+?)[\'"]', params, u'player id')
- target = self._search_regex(r'target: [\'"](.+?)[\'"]', params, u'target')
+ 'player params', flags=re.DOTALL)
+ video_id = self._search_regex(r'videoId: [\'"](.+?)[\'"]', params, 'video id')
+ player_id = self._search_regex(r'playerId: [\'"](.+?)[\'"]', params, 'player id')
+ target = self._search_regex(r'target: [\'"](.+?)[\'"]', params, 'target')
data = compat_urllib_parse.urlencode({'videoId': video_id,
'playerId': player_id,
'target': target,
})
base_info_url = self._search_regex(r'url = [\'"](.+?)[\'"][,;]',
- webpage, u'base info url',
+ webpage, 'base info url',
default='http://player.cnevids.com/player/loader.js?')
info_url = base_info_url + data
info_page = self._download_webpage(info_url, video_id,
- u'Downloading video info')
- video_info = self._search_regex(r'var video = ({.+?});', info_page, u'video info')
+ 'Downloading video info')
+ video_info = self._search_regex(r'var video = ({.+?});', info_page, 'video info')
video_info = json.loads(video_info)
def _formats_sort_key(f):
