From: Jaime Marquínez Ferrándiz Date: Wed, 1 Jan 2014 11:42:59 +0000 (+0100) Subject: Merge pull request #2041 from dstftw/imdb-list X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=4fb757d1e0dd9c2b08921e88aa348b3a34e14937;hp=-c;p=youtube-dl Merge pull request #2041 from dstftw/imdb-list [imdb] Add support for IMDb list (#2033) --- 4fb757d1e0dd9c2b08921e88aa348b3a34e14937 diff --combined test/test_playlists.py index 1b7b4e3d8,81352de6b..9d522b357 --- a/test/test_playlists.py +++ b/test/test_playlists.py @@@ -28,7 -28,8 +28,8 @@@ from youtube_dl.extractor import BandcampAlbumIE, SmotriCommunityIE, SmotriUserIE, - IviCompilationIE + IviCompilationIE, - ImdbListIE ++ ImdbListIE, ) @@@ -187,6 -188,15 +188,15 @@@ class TestPlaylists(unittest.TestCase) self.assertEqual(result['id'], u'dezhurnyi_angel/season2') self.assertEqual(result['title'], u'Дежурный ангел (2010 - 2012) 2 сезон') self.assertTrue(len(result['entries']) >= 20) + + def test_imdb_list(self): + dl = FakeYDL() + ie = ImdbListIE(dl) + result = ie.extract('http://www.imdb.com/list/sMjedvGDd8U') + self.assertIsPlaylist(result) + self.assertEqual(result['id'], u'sMjedvGDd8U') + self.assertEqual(result['title'], u'Animated and Family Films') + self.assertTrue(len(result['entries']) >= 48) if __name__ == '__main__': diff --combined youtube_dl/extractor/__init__.py index 1e8fd1f8e,c96212760..5319a9292 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@@ -28,7 -28,6 +28,7 @@@ from .channel9 import Channel9I from .cinemassacre import CinemassacreIE from .clipfish import ClipfishIE from .clipsyndicate import ClipsyndicateIE +from .cmt import CMTIE from .cnn import CNNIE from .collegehumor import CollegeHumorIE from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE @@@ -80,7 -79,10 +80,10 @@@ from .hotnewhiphop import HotNewHipHopI from .howcast import HowcastIE from .hypem import HypemIE from .ign import IGNIE, OneUPIE - from .imdb import ImdbIE + from .imdb import ( + ImdbIE, + ImdbListIE + ) from .ina import InaIE from .infoq import InfoQIE from .instagram import InstagramIE