jriou/yt-mp3-ui
1
0
Fork 0
Code Activity

[compat, networking] Deprecate old functions (#2861)

Browse source 
Authored by: coletdjnz, pukkandan
This commit is contained in:
coletdjnz 2023-07-09 13:23:02 +05:30 • committed by pukkandan
commit 3d2623a898
No known key found for this signature in database
GPG key ID: 7EEE9E1E817D0A39
176 changed files with 706 additions and 728 deletions
Download patch file Download diff file Expand all files Collapse all files

11
yt_dlp/extractor/pornhub.py
View file

@ -3,11 +3,12 @@ import itertools
import math
import operator
import re
import urllib.request
from .common import InfoExtractor
from .openload import PhantomJSwrapper
from ..compat import compat_HTTPError, compat_str
from ..compat import compat_str
from ..networking import Request
from ..networking.exceptions import HTTPError
from ..utils import (
NO_DEFAULT,
ExtractorError,
@ -46,8 +47,8 @@ class PornHubBaseIE(InfoExtractor):
r'document\.cookie\s*=\s*["\']RNKEY=',
r'document\.location\.reload\(true\)')):
url_or_request = args[0]
url = (url_or_request.get_full_url()
if isinstance(url_or_request, urllib.request.Request)
url = (url_or_request.url
if isinstance(url_or_request, Request)
else url_or_request)
phantom = PhantomJSwrapper(self, required_version='2.0')
phantom.get(url, html=webpage)
@ -602,7 +603,7 @@ class PornHubPagedPlaylistBaseIE(PornHubPlaylistBaseIE):
base_url, item_id, note, query={'page': num})
def is_404(e):
return isinstance(e.cause, compat_HTTPError) and e.cause.code == 404
return isinstance(e.cause, HTTPError) and e.cause.status == 404
base_url = url
has_page = page is not None