Skip to content

Merge upstream master (yt-dlp/yt-dlp) into fork - #1

Merged
aalsuwaidi merged 1433 commits into
masterfrom
copilot/update-fork-with-master
Aug 21, 2026
Merged

aalsuwaidi merged 1433 commits into
masterfrom
copilot/update-fork-with-master

Conversation

Copilot AI commented Aug 21, 2026

Copy link
Copy Markdown

Syncs the fork with the latest upstream yt-dlp/yt-dlp master (1,432 commits). Two merge conflicts were resolved to preserve the fork's referrer-parsing feature alongside new upstream code.

Changes

yt_dlp/utils/_utils.py

  • Kept the fork's get_referrer_url() while adopting upstream's new _ProgressState enum directly after it (additive only, 65 insertions).

yt_dlp/extractor/common.py

  • _parse_html5_media_entries: combined the fork's policy-based Referer header with upstream's new _headers propagation:
referrer = get_referrer_url(base_url, f["url"], referrer_policy)
if referrer:
    f.setdefault('http_headers', {})['Referer'] = referrer
if _headers:
    f['http_headers'].update(_headers)

Fork is now 0 commits behind upstream; the referrer feature and its tests are intact.

0x∅ and others added 30 commits February 4, 2026 20:49
Closes yt-dlp#13656
Authored by: doe1080, gravesducking

Co-authored-by: gravesducking <219445875+gravesducking@users.noreply.github.com>
Authored by: hunter-gatherer8
)

Closes yt-dlp#8382, Closes yt-dlp#8790, Closes yt-dlp#15850
Authored by: bashonly, makew0rld, 0xvd

Co-authored-by: makeworld <makeworld@protonmail.com>
Co-authored-by: 0xvd <0xvd12@gmail.com>
http.cookies.Morsel was patched in Python 3.14.3 and 3.13.12
to raise a CookieError if the cookie name, value or any attribute
of its input contains a control character.

yt_dlp.cookies.LenientSimpleCookie now preemptively discards
any cookies containing control characters, which is consistent
with its more lenient parsing.

Ref: python/cpython#143919

Closes yt-dlp#15849
Authored by: bashonly, syphyr

Co-authored-by: syphyr <syphyr@gmail.com>
Closes yt-dlp#10148
Authored by: CanOfSocks, bashonly

Co-authored-by: bashonly <88596187+bashonly@users.noreply.github.com>
bashonly and others added 24 commits August 17, 2026 07:37
* Add tomlkit 0.15.1
* Bump charset-normalizer 3.4.9 => 3.5.0
* Bump hatchling 1.31.0 => 1.32.0
* Bump platformdirs 4.11.1 => 4.11.2
* Bump pre-commit 4.6.1 => 4.6.2
* Bump pyinstaller 6.22.1 => 6.22.0
* Bump pyinstaller[win32] 6.22.1 => 6.22.0
* Bump pyinstaller[win_amd64] 6.22.1 => 6.22.0
* Bump pyinstaller[win_arm64] 6.22.1 => 6.22.0
* Bump python-discovery 1.5.1 => 1.5.2
* Bump virtualenv 21.7.3 => 21.7.4

Authored by: dlp-bot
Partially revert fdcc954

Authored by: bashonly
Closes yt-dlp#17356
Authored by: InvalidUsernameException
Closes yt-dlp#13155
Authored by: bbilly1, bashonly

Co-authored-by: bashonly <88596187+bashonly@users.noreply.github.com>
Thanks to @chloricacid

Authored by: bashonly
Created by: bashonly

:ci skip all
…rk-with-master

# Conflicts:
#	yt_dlp/extractor/common.py
#	yt_dlp/utils/_utils.py

Co-authored-by: aalsuwaidi <4988413+aalsuwaidi@users.noreply.github.com>
@aalsuwaidi
aalsuwaidi marked this pull request as ready for review August 21, 2026 10:57
@aalsuwaidi
aalsuwaidi merged commit 31ab03e into master Aug 21, 2026
30 of 31 checks passed
@aalsuwaidi
aalsuwaidi deleted the copilot/update-fork-with-master branch August 21, 2026 11:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.