X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=youtube_dl%2Fextractor%2Fthescene.py;h=ce1326c03643186b4e1eb58905ef8f9c868588f6;hb=8939f784d92a8267f5bb1967e7953c2952ca243c;hp=08d666eaf9300e119c84ae619ad06870c21dff9e;hpb=7da2c87119db8beda1bdc979fad38c08fc1252e9;p=youtube-dl

diff --git a/youtube_dl/extractor/thescene.py b/youtube_dl/extractor/thescene.py
index 08d666eaf..ce1326c03 100644
--- a/youtube_dl/extractor/thescene.py
+++ b/youtube_dl/extractor/thescene.py
@@ -2,12 +2,12 @@ from __future__ import unicode_literals
 
 from .common import InfoExtractor
 
-from ..compat import compat_urllib_parse
+from ..compat import compat_urlparse
 from ..utils import qualities
 
 
 class TheSceneIE(InfoExtractor):
-    _VALID_URL = r'https://thescene\.com/watch/[^/]+/(?P<id>[^/#?]+)'
+    _VALID_URL = r'https?://thescene\.com/watch/[^/]+/(?P<id>[^/#?]+)'
 
     _TEST = {
         'url': 'https://thescene.com/watch/vogue/narciso-rodriguez-spring-2013-ready-to-wear',
@@ -21,17 +21,21 @@ class TheSceneIE(InfoExtractor):
 
     def _real_extract(self, url):
         display_id = self._match_id(url)
+
         webpage = self._download_webpage(url, display_id)
-        player_url = compat_urllib_parse.urljoin(
+
+        player_url = compat_urlparse.urljoin(
             url,
             self._html_search_regex(
                 r'id=\'js-player-script\'[^>]+src=\'(.+?)\'', webpage, 'player url'))
 
-        self.to_screen(player_url)
-        player = self._download_webpage(player_url, player_url)
-        info = self._parse_json(self._search_regex(r'(?m)var\s+video\s+=\s+({.+?});$', player, 'info json'), display_id)
+        player = self._download_webpage(player_url, display_id)
+        info = self._parse_json(
+            self._search_regex(
+                r'(?m)var\s+video\s+=\s+({.+?});$', player, 'info json'),
+            display_id)
 
-        qualities_order = qualities(['low', 'high'])
+        qualities_order = qualities(('low', 'high'))
         formats = [{
             'format_id': '{0}-{1}'.format(f['type'].split('/')[0], f['quality']),
             'url': f['src'],
@@ -41,8 +45,8 @@ class TheSceneIE(InfoExtractor):
 
         return {
             'id': info['id'],
+            'display_id': display_id,
             'title': info['title'],
             'formats': formats,
             'thumbnail': info.get('poster_frame'),
-            'display_id': display_id,
         }