Rapsys Git
/
youtubedl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prepare to release.
[youtubedl]
/
youtube_dl
/
extractor
/
toypics.py
diff --git
a/youtube_dl/extractor/toypics.py
b/youtube_dl/extractor/toypics.py
index 0f389bd93a1f35eb35346f7ee99b0b91a9c9b876..938e05076313cb5b3d3284083d2cc7e699241d21 100644
(file)
--- a/
youtube_dl/extractor/toypics.py
+++ b/
youtube_dl/extractor/toypics.py
@@
-1,4
+1,4
@@
-#
-*- coding:utf-8 -*-
+#
coding: utf-8
from __future__ import unicode_literals
from .common import InfoExtractor
from __future__ import unicode_literals
from .common import InfoExtractor
@@
-41,7
+41,14
@@
class ToypicsIE(InfoExtractor):
class ToypicsUserIE(InfoExtractor):
IE_DESC = 'Toypics user profile'
class ToypicsUserIE(InfoExtractor):
IE_DESC = 'Toypics user profile'
- _VALID_URL = r'http://videos\.toypics\.net/(?P<username>[^/?]+)(?:$|[?#])'
+ _VALID_URL = r'https?://videos\.toypics\.net/(?P<username>[^/?]+)(?:$|[?#])'
+ _TEST = {
+ 'url': 'http://videos.toypics.net/Mikey',
+ 'info_dict': {
+ 'id': 'Mikey',
+ },
+ 'playlist_mincount': 19,
+ }
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)