diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py index fb53ca00d..392b1f92b 100644 --- a/youtube_dl/extractor/extractors.py +++ b/youtube_dl/extractor/extractors.py @@ -900,11 +900,6 @@ from .pornhub import ( PornHubPlaylistIE, PornHubUserVideosIE, ) -#from .pornhubpremium import ( -# PornHubPremiumIE, -# PornHubPremiumPlaylistIE, -# PornHubPremiumUserVideosIE, -#) from .pornotube import PornotubeIE from .pornovoisines import PornoVoisinesIE from .pornoxo import PornoXOIE diff --git a/youtube_dl/extractor/pornhub.py b/youtube_dl/extractor/pornhub.py index c83a1ee5c..b38b8c815 100644 --- a/youtube_dl/extractor/pornhub.py +++ b/youtube_dl/extractor/pornhub.py @@ -54,7 +54,7 @@ class PornHubIE(PornHubBaseIE): _VALID_URL = r'''(?x) https?:// (?: - (?:[^/]+\.)?(?P(pornhub|pornhubpremium)\.(?:com|net))/(?:(?:view_video\.php|video/show)\?viewkey=|embed/)| + (?:[^/]+\.)?(?P(?:pornhub|pornhubpremium)\.(?:com|net))/(?:(?:view_video\.php|video/show)\?viewkey=|embed/)| (?:www\.)?thumbzilla\.com/video/ ) (?P[\da-z]+) @@ -96,8 +96,6 @@ class PornHubIE(PornHubBaseIE): 'categories': list, }, 'params': { - 'username': "tdsist", - 'password': "ZtOUktu0QP", 'skip_download': True, }, }, { @@ -203,10 +201,8 @@ class PornHubIE(PornHubBaseIE): 'password': password, }) - self._TOKEN = login_form['token'] - response = self._download_json( - "https://www.pornhubpremium.com/front/authenticate", None, 'Logging in', + 'https://www.pornhubpremium.com/front/authenticate', None, 'Logging in', data=urlencode_postdata(login_form), headers={ 'Content-Type': 'application/x-www-form-urlencoded', 'Referer': self._LOGIN_URL,