debian/NEWS: Document that the --max-quality option is gone.

[youtubedl] / youtube_dl / extractor / imdb.py

diff --git a/youtube_dl/extractor/imdb.py b/youtube_dl/extractor/imdb.py
index 4536db3bfca1e1244e70089bea30de9687d923f0..f29df36b5bf6bd7e732ad84cbfd7d3eeb412f5ff 100644 (file)
--- a/youtube_dl/extractor/imdb.py
+++ b/youtube_dl/extractor/imdb.py
@@ -4,9 +4,8 @@ import re
 import json
 
 from .common import InfoExtractor
 import json
 
 from .common import InfoExtractor

-from ..utils import (
+from ..compat import (

     compat_urlparse,
     compat_urlparse,

-    get_element_by_attribute,

 )
 
 
 )
 
 


@@ -17,7 +16,6 @@ class ImdbIE(InfoExtractor):
 
     _TEST = {
         'url': 'http://www.imdb.com/video/imdb/vi2524815897',
 
     _TEST = {
         'url': 'http://www.imdb.com/video/imdb/vi2524815897',

-        'md5': '9f34fa777ade3a6e57a054fdbcb3a068',

         'info_dict': {
             'id': '2524815897',
             'ext': 'mp4',
         'info_dict': {
             'id': '2524815897',
             'ext': 'mp4',


@@ -27,10 +25,11 @@ class ImdbIE(InfoExtractor):
     }
 
     def _real_extract(self, url):
     }
 
     def _real_extract(self, url):

-        mobj = re.match(self._VALID_URL, url)
-        video_id = mobj.group('id')
+        video_id = self._match_id(url)

         webpage = self._download_webpage('http://www.imdb.com/video/imdb/vi%s' % video_id, video_id)
         webpage = self._download_webpage('http://www.imdb.com/video/imdb/vi%s' % video_id, video_id)

-        descr = get_element_by_attribute('itemprop', 'description', webpage)
+        descr = self._html_search_regex(
+            r'(?s)<span itemprop="description">(.*?)</span>',
+            webpage, 'description', fatal=False)

         available_formats = re.findall(
             r'case \'(?P<f_id>.*?)\' :$\s+url = \'(?P<path>.*?)\'', webpage,
             flags=re.MULTILINE)
         available_formats = re.findall(
             r'case \'(?P<f_id>.*?)\' :$\s+url = \'(?P<path>.*?)\'', webpage,
             flags=re.MULTILINE)


@@ -71,11 +70,9 @@ class ImdbListIE(InfoExtractor):
         },
         'playlist_count': 7,
     }
         },
         'playlist_count': 7,
     }

-    
-    def _real_extract(self, url):
-        mobj = re.match(self._VALID_URL, url)
-        list_id = mobj.group('id')

 
 

+    def _real_extract(self, url):
+        list_id = self._match_id(url)

         webpage = self._download_webpage(url, list_id)
         entries = [
             self.url_result('http://www.imdb.com' + m, 'Imdb')
         webpage = self._download_webpage(url, list_id)
         entries = [
             self.url_result('http://www.imdb.com' + m, 'Imdb')