Merge tag 'upstream/2016.06.25'

[youtubedl] / youtube_dl / extractor / slutload.py

diff --git a/youtube_dl/extractor/slutload.py b/youtube_dl/extractor/slutload.py
index ecc0abfdacf4353035d27f5c451f35341837c70e..7efb29f653b76b25c26d91aac16c6985255ee1d0 100644 (file)
--- a/youtube_dl/extractor/slutload.py
+++ b/youtube_dl/extractor/slutload.py
@@ -3,9 +3,6 @@ from __future__ import unicode_literals
 import re
 
 from .common import InfoExtractor
 import re
 
 from .common import InfoExtractor

-from ..utils import (
-    ExtractorError,
-)

 
 
 class SlutloadIE(InfoExtractor):
 
 
 class SlutloadIE(InfoExtractor):


@@ -16,8 +13,8 @@ class SlutloadIE(InfoExtractor):
         'info_dict': {
             'id': 'TD73btpBqSxc',
             'ext': 'mp4',
         'info_dict': {
             'id': 'TD73btpBqSxc',
             'ext': 'mp4',

-            "title": "virginie baisee en cam",
-            "age_limit": 18,
+            'title': 'virginie baisee en cam',
+            'age_limit': 18,

             'thumbnail': 're:https?://.*?\.jpg'
         }
     }
             'thumbnail': 're:https?://.*?\.jpg'
         }
     }


@@ -29,7 +26,7 @@ class SlutloadIE(InfoExtractor):
         webpage = self._download_webpage(url, video_id)
 
         video_title = self._html_search_regex(r'<h1><strong>([^<]+)</strong>',
         webpage = self._download_webpage(url, video_id)
 
         video_title = self._html_search_regex(r'<h1><strong>([^<]+)</strong>',

-            webpage, 'title').strip()
+                                              webpage, 'title').strip()

 
         video_url = self._html_search_regex(
             r'(?s)<div id="vidPlayer"\s+data-url="([^"]+)"',
 
         video_url = self._html_search_regex(
             r'(?s)<div id="vidPlayer"\s+data-url="([^"]+)"',