projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[SpankBang] Use python2.6 compatible string formatting spec
[youtube-dl]
/
youtube_dl
/
extractor
/
playvid.py
diff --git
a/youtube_dl/extractor/playvid.py
b/youtube_dl/extractor/playvid.py
index cd3905acb0fcd0ef9fe08beec2bda41fd2f94f70..c3e667e9e72ea0aaf6e5db731f630816e6a2861d 100644
(file)
--- a/
youtube_dl/extractor/playvid.py
+++ b/
youtube_dl/extractor/playvid.py
@@
-3,31
+3,31
@@
from __future__ import unicode_literals
import re
from .common import InfoExtractor
import re
from .common import InfoExtractor
+from ..compat import (
+ compat_urllib_parse,
+)
from ..utils import (
from ..utils import (
- ExtractorError,
clean_html,
clean_html,
-
compat_urllib_parse
,
+
ExtractorError
,
)
class PlayvidIE(InfoExtractor):
)
class PlayvidIE(InfoExtractor):
- _VALID_URL = r'
^
https?://www\.playvid\.com/watch(\?v=|/)(?P<id>.+?)(?:#|$)'
+ _VALID_URL = r'https?://www\.playvid\.com/watch(\?v=|/)(?P<id>.+?)(?:#|$)'
_TEST = {
_TEST = {
- 'url': 'http://www.playvid.com/watch/
agbDDi7WZTV
',
- 'md5': '
44930f8afa616efdf9482daf4fe53e1e
',
+ 'url': 'http://www.playvid.com/watch/
RnmBNgtrrJu
',
+ 'md5': '
ffa2f6b2119af359f544388d8c01eb6c
',
'info_dict': {
'info_dict': {
- 'id': '
agbDDi7WZTV
',
+ 'id': '
RnmBNgtrrJu
',
'ext': 'mp4',
'ext': 'mp4',
- 'title': '
Michelle Lewin in Miami Beach
',
- 'duration':
240
,
+ 'title': '
md5:9256d01c6317e3f703848b5906880dc8
',
+ 'duration':
82
,
'age_limit': 18,
}
}
def _real_extract(self, url):
'age_limit': 18,
}
}
def _real_extract(self, url):
- mobj = re.match(self._VALID_URL, url)
- video_id = mobj.group('id')
-
+ video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
m_error = re.search(
webpage = self._download_webpage(url, video_id)
m_error = re.search(