Merge tag 'upstream/2014.06.07'

[youtubedl] / youtube_dl / extractor / nba.py

diff --git a/youtube_dl/extractor/nba.py b/youtube_dl/extractor/nba.py
index 0f178905bfe0b049499dd58f71df42da1c419639..633b42f728489c6e9f9c61a98b8b0b4d38e57be1 100644 (file)
--- a/youtube_dl/extractor/nba.py
+++ b/youtube_dl/extractor/nba.py
@@ -1,48 +1,39 @@
+from __future__ import unicode_literals
+

 import re
 
 from .common import InfoExtractor
 import re
 
 from .common import InfoExtractor

-from ..utils import (
-    ExtractorError,
-)

 
 
 class NBAIE(InfoExtractor):
 
 
 class NBAIE(InfoExtractor):

-    _VALID_URL = r'^(?:https?://)?(?:watch\.|www\.)?nba\.com/(?:nba/)?video(/[^?]*?)(?:/index\.html)?(?:\?.*)?$'
+    _VALID_URL = r'https?://(?:watch\.|www\.)?nba\.com/(?:nba/)?video(?P<id>/[^?]*?)(?:/index\.html)?(?:\?.*)?$'

     _TEST = {
     _TEST = {

-        u'url': u'http://www.nba.com/video/games/nets/2012/12/04/0021200253-okc-bkn-recap.nba/index.html',
-        u'file': u'0021200253-okc-bkn-recap.nba.mp4',
-        u'md5': u'c0edcfc37607344e2ff8f13c378c88a4',
-        u'info_dict': {
-            u"description": u"Kevin Durant scores 32 points and dishes out six assists as the Thunder beat the Nets in Brooklyn.", 
-            u"title": u"Thunder vs. Nets"
-        }
+        'url': 'http://www.nba.com/video/games/nets/2012/12/04/0021200253-okc-bkn-recap.nba/index.html',
+        'md5': u'c0edcfc37607344e2ff8f13c378c88a4',
+        'info_dict': {
+            'id': '0021200253-okc-bkn-recap.nba',
+            'ext': 'mp4',
+            'description': 'Kevin Durant scores 32 points and dishes out six assists as the Thunder beat the Nets in Brooklyn.',
+            'title': 'Thunder vs. Nets',
+        },

     }
 
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)
     }
 
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)

-        if mobj is None:
-            raise ExtractorError(u'Invalid URL: %s' % url)
-
-        video_id = mobj.group(1)
+        video_id = mobj.group('id')

 
         webpage = self._download_webpage(url, video_id)
 
 
         webpage = self._download_webpage(url, video_id)
 

-        video_url = u'http://ht-mobile.cdn.turner.com/nba/big' + video_id + '_nba_1280x720.mp4'
+        video_url = 'http://ht-mobile.cdn.turner.com/nba/big' + video_id + '_nba_1280x720.mp4'

 
         shortened_video_id = video_id.rpartition('/')[2]
         title = self._og_search_title(webpage, default=shortened_video_id).replace('NBA.com: ', '')
 
 
         shortened_video_id = video_id.rpartition('/')[2]
         title = self._og_search_title(webpage, default=shortened_video_id).replace('NBA.com: ', '')
 

-        # It isn't there in the HTML it returns to us
-        # uploader_date = self._html_search_regex(r'<b>Date:</b> (.*?)</div>', webpage, 'upload_date', fatal=False)
-

         description = self._html_search_regex(r'<meta name="description" (?:content|value)="(.*?)" />', webpage, 'description', fatal=False)
 
         description = self._html_search_regex(r'<meta name="description" (?:content|value)="(.*?)" />', webpage, 'description', fatal=False)
 

-        info = {
+        return {

             'id': shortened_video_id,
             'url': video_url,
             'id': shortened_video_id,
             'url': video_url,

-            'ext': 'mp4',

             'title': title,
             'title': title,

-            # 'uploader_date': uploader_date,

             'description': description,
         }
             'description': description,
         }

-        return [info]