Merge remote-tracking branch 'tobidope/gameone'

[youtube-dl] / youtube_dl / extractor / toypics.py

diff --git a/youtube_dl/extractor/toypics.py b/youtube_dl/extractor/toypics.py
index 33a6988cacdc36a0c18ad89db80d50f21cd74219..0f389bd93a1f35eb35346f7ee99b0b91a9c9b876 100644 (file)
--- a/youtube_dl/extractor/toypics.py
+++ b/youtube_dl/extractor/toypics.py
@@ -1,11 +1,13 @@
+# -*- coding:utf-8 -*-
+from __future__ import unicode_literals
+
 from .common import InfoExtractor
-from math import ceil
 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',
@@ -62,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 {
@@ -70,7 +72,7 @@ class ToypicsUserIE(InfoExtractor):
             'id': username,
             'entries': [{
                 '_type': 'url',
-                'url': url,
+                'url': eurl,
                 'ie_key': 'Toypics',
-            } for url in urls]
+            } for eurl in urls]
         }