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

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):

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()

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'<meta name="title" content="([^"]*) - [^-]*"',
+            r'<meta name="title" content="([^"]*?) - [^-]*? - [^-]*?"',
             webpage, 'video title')
         description = self._html_search_regex(
             r'<meta name="description" content="([^"]*)"/>',

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'