aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Půlpán <Pulpan3@gmail.com>2014-06-29 08:21:23 +0200
committerPetr Půlpán <Pulpan3@gmail.com>2014-06-29 08:21:23 +0200
commitee8dda41aebf64ad5250347dbea38c901fd054c7 (patch)
tree256ed69a358a32bc4a38960d6aff59d0d422a9a2
parent01ba178097d08b1337f9343029ee4eedb1b512a7 (diff)
downloadyoutube-dl-ee8dda41aebf64ad5250347dbea38c901fd054c7.tar.xz
[Toypics] support https urls
-rw-r--r--youtube_dl/extractor/toypics.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/youtube_dl/extractor/toypics.py b/youtube_dl/extractor/toypics.py
index 34008afc6..0f389bd93 100644
--- 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 {