Merge branch 'master' of github.com:rg3/youtube-dl

diff --git a/test/test_write_annotations.py b/test/test_write_annotations.py
index 6f08808cd8877423c8277f935e2f8ed2d837ad78..35defb8953402a74ff71b7a9a14cec105a5f1703 100644 (file)
--- 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 c1753b5bb199aa0d90ae61402ba2621f662c2adc..4b7a7847bd3a33a9a2bff3e99f9f4cff0de7eebf 100644 (file)
--- 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 cd3e203e6049fc666de496ab69c7c223a012954c..81fa35c4bd297f6b6a4b5fa44ed1b98998393ab6 100644 (file)
--- 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 7d335d444e5231df69e1282490dd3d2212411f93..43953bfdd566c2a17b58c124f92ad7dab5c2312b 100644 (file)
--- 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'