Merge tag 'upstream/2014.10.30'

[youtubedl] / youtube_dl / extractor / vodlocker.py

diff --git a/youtube_dl/extractor/vodlocker.py b/youtube_dl/extractor/vodlocker.py
index 68c59364bc7f48e453b85e70ecc750b4418f0a75..affef650726d716b7e80aaab5c66dab3bc3ddc28 100644 (file)
--- a/youtube_dl/extractor/vodlocker.py
+++ b/youtube_dl/extractor/vodlocker.py
@@ -10,7 +10,7 @@ from ..utils import (
 
 
 class VodlockerIE(InfoExtractor):
 
 
 class VodlockerIE(InfoExtractor):

-    _VALID_URL = r'https?://(?:www\.)?vodlocker.com/(?P<id>[0-9a-zA-Z]+)(?:\..*?)?'
+    _VALID_URL = r'https?://(?:www\.)?vodlocker\.com/(?P<id>[0-9a-zA-Z]+)(?:\..*?)?'

 
     _TESTS = [{
         'url': 'http://vodlocker.com/e8wvyzz4sl42',
 
     _TESTS = [{
         'url': 'http://vodlocker.com/e8wvyzz4sl42',


@@ -44,7 +44,7 @@ class VodlockerIE(InfoExtractor):
                 req, video_id, 'Downloading video page')
 
         title = self._search_regex(
                 req, video_id, 'Downloading video page')
 
         title = self._search_regex(

-            r'id="file_title".*?>\s*(.*?)\s*<span', webpage, 'title')
+            r'id="file_title".*?>\s*(.*?)\s*<(?:br|span)', webpage, 'title')

         thumbnail = self._search_regex(
             r'image:\s*"(http[^\"]+)",', webpage, 'thumbnail')
         url = self._search_regex(
         thumbnail = self._search_regex(
             r'image:\s*"(http[^\"]+)",', webpage, 'thumbnail')
         url = self._search_regex(