diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2013-10-15 12:05:24 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2013-10-15 12:05:24 +0200 |
| commit | 10eaae48ffe1042d9c5f77fd563832bf795ad647 (patch) | |
| tree | 44f1dba50c0774b3e1de94b26d21bffeb451deaa | |
| parent | 9d4660cab15f374176f87d3f747a559142e4af9b (diff) | |
| parent | 9d74e308f7caa7f649809366ebcdb5a7caf560b9 (diff) | |
| download | youtube-dl-10eaae48ffe1042d9c5f77fd563832bf795ad647.tar.gz youtube-dl-10eaae48ffe1042d9c5f77fd563832bf795ad647.tar.xz youtube-dl-10eaae48ffe1042d9c5f77fd563832bf795ad647.zip | |
Merge branch 'master' of github.com:rg3/youtube-dl
| -rw-r--r-- | test/test_write_annotations.py | 1 | ||||
| -rw-r--r-- | test/test_youtube_lists.py | 2 | ||||
| -rw-r--r-- | youtube_dl/extractor/sztvhu.py | 2 | ||||
| -rw-r--r-- | youtube_dl/extractor/websurg.py | 3 |
4 files changed, 4 insertions, 4 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 xml.etree.ElementTree 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 @@ class TestYoutubeLists(unittest.TestCase): 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() 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 @@ class SztvHuIE(InfoExtractor): video_file = self._search_regex( r'file: "...:(.*?)",', webpage, 'video file') title = self._html_search_regex( - r'<meta name="title" content="([^"]*) - [^-]*"', + r'<meta name="title" content="([^"]*?) - [^-]*? - [^-]*?"', webpage, 'video title') description = self._html_search_regex( r'<meta name="description" content="([^"]*)"/>', 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' |