From eaeeef9c1d1bedb76fea953c332ef84d53bffe2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs?= Date: Fri, 2 Dec 2022 05:21:10 +0800 Subject: update from upstream --- hypervideo_dl/extractor/mofosex.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'hypervideo_dl/extractor/mofosex.py') diff --git a/hypervideo_dl/extractor/mofosex.py b/hypervideo_dl/extractor/mofosex.py index 5234cac..9cb6980 100644 --- a/hypervideo_dl/extractor/mofosex.py +++ b/hypervideo_dl/extractor/mofosex.py @@ -1,7 +1,3 @@ -from __future__ import unicode_literals - -import re - from .common import InfoExtractor from ..utils import ( int_or_none, @@ -11,7 +7,7 @@ from ..utils import ( from .keezmovies import KeezMoviesIE -class MofosexIE(KeezMoviesIE): +class MofosexIE(KeezMoviesIE): # XXX: Do not subclass from concrete IE _VALID_URL = r'https?://(?:www\.)?mofosex\.com/videos/(?P\d+)/(?P[^/?#&.]+)\.html' _TESTS = [{ 'url': 'http://www.mofosex.com/videos/318131/amateur-teen-playing-and-masturbating-318131.html', @@ -61,17 +57,12 @@ class MofosexIE(KeezMoviesIE): class MofosexEmbedIE(InfoExtractor): _VALID_URL = r'https?://(?:www\.)?mofosex\.com/embed/?\?.*?\bvideoid=(?P\d+)' + _EMBED_REGEX = [r']+\bsrc=["\'](?P(?:https?:)?//(?:www\.)?mofosex\.com/embed/?\?.*?\bvideoid=\d+)'] _TESTS = [{ 'url': 'https://www.mofosex.com/embed/?videoid=318131&referrer=KM', 'only_matching': True, }] - @staticmethod - def _extract_urls(webpage): - return re.findall( - r']+\bsrc=["\']((?:https?:)?//(?:www\.)?mofosex\.com/embed/?\?.*?\bvideoid=\d+)', - webpage) - def _real_extract(self, url): video_id = self._match_id(url) return self.url_result( -- cgit v1.2.3