From ecff6a157e429ec41b6342f2be61f66ab129c245 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 4 Dec 2024 17:02:05 +0000 Subject: [PATCH] [CI] auto update yt_dlp to upstream commit cfa76f35d25eaf993437df8b833befbbf9255331 --- lib/yt_dlp/extractor/adn.py | 2 +- lib/yt_dlp/extractor/cultureunplugged.py | 6 ------ lib/yt_dlp/extractor/pixivsketch.py | 5 +++-- lib/yt_dlp/version.py | 6 +++--- lib/yt_dlp_version | 2 +- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/lib/yt_dlp/extractor/adn.py b/lib/yt_dlp/extractor/adn.py index 919e1d6af..7dff40556 100644 --- a/lib/yt_dlp/extractor/adn.py +++ b/lib/yt_dlp/extractor/adn.py @@ -232,7 +232,7 @@ def _real_extract(self, url): error = self._parse_json(e.cause.response.read(), video_id) message = error.get('message') - if e.cause.code == 403 and error.get('code') == 'player-bad-geolocation-country': + if e.cause.status == 403 and error.get('code') == 'player-bad-geolocation-country': self.raise_geo_restricted(msg=message) raise ExtractorError(message) else: diff --git a/lib/yt_dlp/extractor/cultureunplugged.py b/lib/yt_dlp/extractor/cultureunplugged.py index 8e6579c35..c7ccd2747 100644 --- a/lib/yt_dlp/extractor/cultureunplugged.py +++ b/lib/yt_dlp/extractor/cultureunplugged.py @@ -1,7 +1,4 @@ -import time - from .common import InfoExtractor -from ..networking import HEADRequest from ..utils import int_or_none @@ -31,9 +28,6 @@ def _real_extract(self, url): video_id = mobj.group('id') display_id = mobj.group('display_id') or video_id - # request setClientTimezone.php to get PHPSESSID cookie which is need to get valid json data in the next request - self._request_webpage(HEADRequest( - 'http://www.cultureunplugged.com/setClientTimezone.php?timeOffset=%d' % -(time.timezone / 3600)), display_id) movie_data = self._download_json( f'http://www.cultureunplugged.com/movie-data/cu-{video_id}.json', display_id) diff --git a/lib/yt_dlp/extractor/pixivsketch.py b/lib/yt_dlp/extractor/pixivsketch.py index 344cdb3d0..50b7af535 100644 --- a/lib/yt_dlp/extractor/pixivsketch.py +++ b/lib/yt_dlp/extractor/pixivsketch.py @@ -1,4 +1,5 @@ from .common import InfoExtractor +from ..networking.exceptions import HTTPError from ..utils import ( ExtractorError, traverse_obj, @@ -110,8 +111,8 @@ def _real_extract(self, url): if not traverse_obj(data, 'is_broadcasting'): try: self._call_api(user_id, 'users/current.json', url, 'Investigating reason for request failure') - except ExtractorError as ex: - if ex.cause and ex.cause.code == 401: + except ExtractorError as e: + if isinstance(e.cause, HTTPError) and e.cause.status == 401: self.raise_login_required(f'Please log in, or use direct link like https://sketch.pixiv.net/@{user_id}/1234567890', method='cookies') raise ExtractorError('This user is offline', expected=True) diff --git a/lib/yt_dlp/version.py b/lib/yt_dlp/version.py index f4b9400bc..b7d5c57bf 100644 --- a/lib/yt_dlp/version.py +++ b/lib/yt_dlp/version.py @@ -1,8 +1,8 @@ # Autogenerated by devscripts/update-version.py -__version__ = '2024.11.18' +__version__ = '2024.12.03' -RELEASE_GIT_HEAD = '7ea2787920cccc6b8ea30791993d114fbd564434' +RELEASE_GIT_HEAD = '2b67ac300ac8b44368fb121637d1743cea8c5b6b' VARIANT = None @@ -12,4 +12,4 @@ ORIGIN = 'yt-dlp/yt-dlp' -_pkg_version = '2024.11.18' +_pkg_version = '2024.12.03' diff --git a/lib/yt_dlp_version b/lib/yt_dlp_version index 36f44dbd5..ec3d20382 100644 --- a/lib/yt_dlp_version +++ b/lib/yt_dlp_version @@ -1 +1 @@ -c038a7b187ba24360f14134842a7a2cf897c33b1 \ No newline at end of file +cfa76f35d25eaf993437df8b833befbbf9255331 \ No newline at end of file