youtube-dl

commit ee8dda41aebf64ad5250347dbea38c901fd054c7
parent 01ba178097d08b1337f9343029ee4eedb1b512a7
Author: Petr Půlpán <Pulpan3@gmail.com>
Date:   Sun, 29 Jun 2014 08:21:23 +0200

[Toypics] support https urls

Diffstat:
M
youtube_dl/extractor/toypics.py
 | 
7
+++++--

1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/youtube_dl/extractor/toypics.py b/youtube_dl/extractor/toypics.py
@@ -1,10 +1,13 @@
+# -*- coding:utf-8 -*-
+from __future__ import unicode_literals
+
 from .common import InfoExtractor
 import re
 
 
 class ToypicsIE(InfoExtractor):
     IE_DESC = 'Toypics user profile'
-    _VALID_URL = r'http://videos\.toypics\.net/view/(?P<id>[0-9]+)/.*'
+    _VALID_URL = r'https?://videos\.toypics\.net/view/(?P<id>[0-9]+)/.*'
     _TEST = {
         'url': 'http://videos.toypics.net/view/514/chancebulged,-2-1/',
         'md5': '16e806ad6d6f58079d210fe30985e08b',
@@ -61,7 +64,7 @@ class ToypicsUserIE(InfoExtractor):
                 note='Downloading page %d/%d' % (n, page_count))
             urls.extend(
                 re.findall(
-                    r'<p class="video-entry-title">\n\s*<a href="(http://videos.toypics.net/view/[^"]+)">',
+                    r'<p class="video-entry-title">\s+<a href="(https?://videos.toypics.net/view/[^"]+)">',
                     lpage))
 
         return {