aboutsummaryrefslogtreecommitdiffstats
path: root/youtube_dl/extractor/addanime.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-11-26 12:40:05 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-11-26 12:40:05 +0100
commite0938e773170938eb93c8f159b7c41b7a046b1c8 (patch)
tree632f30dc8006e816ebfd4736d4874a5956dcf7de /youtube_dl/extractor/addanime.py
parentb72823a0a4bb78ed52845e505736bd15db1f3553 (diff)
downloadyoutube-dl-e0938e773170938eb93c8f159b7c41b7a046b1c8.zip
youtube-dl-e0938e773170938eb93c8f159b7c41b7a046b1c8.tar.gz
youtube-dl-e0938e773170938eb93c8f159b7c41b7a046b1c8.tar.bz2
[addanime] Modernize
Diffstat (limited to 'youtube_dl/extractor/addanime.py')
-rw-r--r--youtube_dl/extractor/addanime.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/youtube_dl/extractor/addanime.py b/youtube_dl/extractor/addanime.py
index 11f149f..203936e 100644
--- a/youtube_dl/extractor/addanime.py
+++ b/youtube_dl/extractor/addanime.py
@@ -15,8 +15,7 @@ from ..utils import (
class AddAnimeIE(InfoExtractor):
-
- _VALID_URL = r'^http://(?:\w+\.)?add-anime\.net/watch_video\.php\?(?:.*?)v=(?P<video_id>[\w_]+)(?:.*)'
+ _VALID_URL = r'^http://(?:\w+\.)?add-anime\.net/watch_video\.php\?(?:.*?)v=(?P<id>[\w_]+)(?:.*)'
_TEST = {
'url': 'http://www.add-anime.net/watch_video.php?v=24MR3YO5SAS9',
'md5': '72954ea10bc979ab5e2eb288b21425a0',
@@ -29,9 +28,9 @@ class AddAnimeIE(InfoExtractor):
}
def _real_extract(self, url):
+ video_id = self._match_id(url)
+
try:
- mobj = re.match(self._VALID_URL, url)
- video_id = mobj.group('video_id')
webpage = self._download_webpage(url, video_id)
except ExtractorError as ee:
if not isinstance(ee.cause, compat_HTTPError) or \
@@ -49,7 +48,7 @@ class AddAnimeIE(InfoExtractor):
r'a\.value = ([0-9]+)[+]([0-9]+)[*]([0-9]+);',
redir_webpage)
if av is None:
- raise ExtractorError(u'Cannot find redirect math task')
+ raise ExtractorError('Cannot find redirect math task')
av_res = int(av.group(1)) + int(av.group(2)) * int(av.group(3))
parsed_url = compat_urllib_parse_urlparse(url)