From 8381a92120c3826b471e6d2cc38045b5f3a9d15e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?= Date: Tue, 15 Oct 2013 08:12:30 +0200 Subject: [PATCH 1/3] [websurg] Skipt the test It needs login information. --- youtube_dl/extractor/websurg.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/youtube_dl/extractor/websurg.py b/youtube_dl/extractor/websurg.py index 7d335d444..43953bfdd 100644 --- a/youtube_dl/extractor/websurg.py +++ b/youtube_dl/extractor/websurg.py @@ -18,7 +18,8 @@ class WeBSurgIE(InfoExtractor): u'file': u'vd01en4012.mp4', u'params': { u'skip_download': True, - } + }, + u'skip': u'Requires login information', } _LOGIN_URL = 'http://www.websurg.com/inc/login/login_div.ajax.php?login=1' From e772692ffd727631e65be90948b7e8c422738a7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?= Date: Tue, 15 Oct 2013 08:22:20 +0200 Subject: [PATCH 2/3] Fix an import in the tests and the Youtube Shows test --- test/test_write_annotations.py | 1 - test/test_youtube_lists.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/test/test_write_annotations.py b/test/test_write_annotations.py index 6f08808cd..35defb895 100644 --- a/test/test_write_annotations.py +++ b/test/test_write_annotations.py @@ -17,7 +17,6 @@ import youtube_dl.YoutubeDL import youtube_dl.extractor -from youtube_dl.utils import True class YoutubeDL(youtube_dl.YoutubeDL): diff --git a/test/test_youtube_lists.py b/test/test_youtube_lists.py index c1753b5bb..4b7a7847b 100644 --- a/test/test_youtube_lists.py +++ b/test/test_youtube_lists.py @@ -106,7 +106,7 @@ def test_youtube_show(self): dl = FakeYDL() ie = YoutubeShowIE(dl) result = ie.extract('http://www.youtube.com/show/airdisasters') - self.assertTrue(len(result) >= 4) + self.assertTrue(len(result) >= 3) if __name__ == '__main__': unittest.main() From 9d74e308f7caa7f649809366ebcdb5a7caf560b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?= Date: Tue, 15 Oct 2013 08:22:59 +0200 Subject: [PATCH 3/3] [sztvhu] Fix the title extraction --- youtube_dl/extractor/sztvhu.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/sztvhu.py b/youtube_dl/extractor/sztvhu.py index cd3e203e6..81fa35c4b 100644 --- a/youtube_dl/extractor/sztvhu.py +++ b/youtube_dl/extractor/sztvhu.py @@ -25,7 +25,7 @@ def _real_extract(self, url): video_file = self._search_regex( r'file: "...:(.*?)",', webpage, 'video file') title = self._html_search_regex( - r'',