.github/ISSUE_TEMPLATE/1_broken_site.yml

@@ -2,11 +2,13 @@ name: Broken site support
 description: Report issue with yt-dlp on a supported site
 labels: [triage, site-bug]
 body:
-  - type: markdown
+  - type: checkboxes
     attributes:
-      value: |
-        > [!IMPORTANT]
-        > Not providing the required (*) information or removing the template will result in your issue being closed and ignored.
+      label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
+      description: Fill all fields even if you think it is irrelevant for the issue
+      options:
+        - label: I understand that I will be **blocked** if I *intentionally* remove or skip any mandatory\* field
+          required: true
   - type: checkboxes
     id: checklist
     attributes:
@@ -22,7 +24,9 @@ body:
           required: true
         - label: I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/yt-dlp/yt-dlp/wiki/FAQ#video-url-contains-an-ampersand--and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)
           required: true
-        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766), [the FAQ](https://github.com/yt-dlp/yt-dlp/wiki/FAQ), and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%3Aissue%20-label%3Aspam%20%20) for similar issues **including closed ones**. DO NOT post duplicates
+        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+          required: true
+        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
         - label: I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and I'm willing to share it if required
   - type: input
@@ -43,8 +47,6 @@ body:
     id: verbose
     attributes:
       label: Provide verbose output that clearly demonstrates the problem
-      description: |
-        This is mandatory unless absolutely impossible to provide. If you are unable to provide the output, please explain why.
       options:
         - label: Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)
           required: true
@@ -61,15 +63,14 @@ body:
       placeholder: |
         [debug] Command-line config: ['-vU', 'https://www.youtube.com/watch?v=BaW_jenozKc']
         [debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-        [debug] yt-dlp version nightly@... from yt-dlp/yt-dlp-nightly-builds [1a176d874] (win_exe)
-        [debug] Python 3.10.11 (CPython AMD64 64bit) - Windows-10-10.0.20348-SP0 (OpenSSL 1.1.1t  7 Feb 2023)
-        [debug] exe versions: ffmpeg 7.0.2 (setts), ffprobe 7.0.2
-        [debug] Optional libraries: Cryptodome-3.21.0, brotli-1.1.0, certifi-2024.08.30, curl_cffi-0.5.10, mutagen-1.47.0, requests-2.32.3, sqlite3-3.40.1, urllib3-2.2.3, websockets-13.1
+        [debug] yt-dlp version nightly@... from yt-dlp/yt-dlp [b634ba742] (win_exe)
+        [debug] Python 3.8.10 (CPython 64bit) - Windows-10-10.0.22000-SP0
+        [debug] exe versions: ffmpeg N-106550-g072101bd52-20220410 (fdk,setts), ffprobe N-106624-g391ce570c8-20220415, phantomjs 2.1.1
+        [debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3
         [debug] Proxy map: {}
-        [debug] Request Handlers: urllib, requests, websockets, curl_cffi
-        [debug] Loaded 1838 extractors
-        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-        Latest version: nightly@... from yt-dlp/yt-dlp-nightly-builds
+        [debug] Request Handlers: urllib, requests
+        [debug] Loaded 1893 extractors
+        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp-nightly-builds/releases/latest
         yt-dlp is up to date (nightly@... from yt-dlp/yt-dlp-nightly-builds)
         [youtube] Extracting URL: https://www.youtube.com/watch?v=BaW_jenozKc
         <more lines>

.github/ISSUE_TEMPLATE/2_site_support_request.yml

@@ -2,11 +2,13 @@ name: Site support request
 description: Request support for a new site
 labels: [triage, site-request]
 body:
-  - type: markdown
+  - type: checkboxes
     attributes:
-      value: |
-        > [!IMPORTANT]
-        > Not providing the required (*) information or removing the template will result in your issue being closed and ignored.
+      label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
+      description: Fill all fields even if you think it is irrelevant for the issue
+      options:
+        - label: I understand that I will be **blocked** if I *intentionally* remove or skip any mandatory\* field
+          required: true
   - type: checkboxes
     id: checklist
     attributes:
@@ -22,7 +24,9 @@ body:
           required: true
         - label: I've checked that none of provided URLs [violate any copyrights](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-website-primarily-used-for-piracy) or contain any [DRM](https://en.wikipedia.org/wiki/Digital_rights_management) to the best of my knowledge
           required: true
-        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%3Aissue%20-label%3Aspam%20%20) for similar requests **including closed ones**. DO NOT post duplicates
+        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+          required: true
+        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
         - label: I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and am willing to share it if required
   - type: input
@@ -55,8 +59,6 @@ body:
     id: verbose
     attributes:
       label: Provide verbose output that clearly demonstrates the problem
-      description: |
-        This is mandatory unless absolutely impossible to provide. If you are unable to provide the output, please explain why.
       options:
         - label: Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)
           required: true
@@ -73,15 +75,14 @@ body:
       placeholder: |
         [debug] Command-line config: ['-vU', 'https://www.youtube.com/watch?v=BaW_jenozKc']
         [debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-        [debug] yt-dlp version nightly@... from yt-dlp/yt-dlp-nightly-builds [1a176d874] (win_exe)
-        [debug] Python 3.10.11 (CPython AMD64 64bit) - Windows-10-10.0.20348-SP0 (OpenSSL 1.1.1t  7 Feb 2023)
-        [debug] exe versions: ffmpeg 7.0.2 (setts), ffprobe 7.0.2
-        [debug] Optional libraries: Cryptodome-3.21.0, brotli-1.1.0, certifi-2024.08.30, curl_cffi-0.5.10, mutagen-1.47.0, requests-2.32.3, sqlite3-3.40.1, urllib3-2.2.3, websockets-13.1
+        [debug] yt-dlp version nightly@... from yt-dlp/yt-dlp [b634ba742] (win_exe)
+        [debug] Python 3.8.10 (CPython 64bit) - Windows-10-10.0.22000-SP0
+        [debug] exe versions: ffmpeg N-106550-g072101bd52-20220410 (fdk,setts), ffprobe N-106624-g391ce570c8-20220415, phantomjs 2.1.1
+        [debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3
         [debug] Proxy map: {}
-        [debug] Request Handlers: urllib, requests, websockets, curl_cffi
-        [debug] Loaded 1838 extractors
-        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-        Latest version: nightly@... from yt-dlp/yt-dlp-nightly-builds
+        [debug] Request Handlers: urllib, requests
+        [debug] Loaded 1893 extractors
+        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp-nightly-builds/releases/latest
         yt-dlp is up to date (nightly@... from yt-dlp/yt-dlp-nightly-builds)
         [youtube] Extracting URL: https://www.youtube.com/watch?v=BaW_jenozKc
         <more lines>

.github/ISSUE_TEMPLATE/3_site_feature_request.yml

@@ -1,12 +1,14 @@
 name: Site feature request
-description: Request new functionality for a site supported by yt-dlp
+description: Request a new functionality for a supported site
 labels: [triage, site-enhancement]
 body:
-  - type: markdown
+  - type: checkboxes
     attributes:
-      value: |
-        > [!IMPORTANT]
-        > Not providing the required (*) information or removing the template will result in your issue being closed and ignored.
+      label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
+      description: Fill all fields even if you think it is irrelevant for the issue
+      options:
+        - label: I understand that I will be **blocked** if I *intentionally* remove or skip any mandatory\* field
+          required: true
   - type: checkboxes
     id: checklist
     attributes:
@@ -20,7 +22,9 @@ body:
           required: true
         - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
           required: true
-        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%3Aissue%20-label%3Aspam%20%20) for similar requests **including closed ones**. DO NOT post duplicates
+        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+          required: true
+        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
         - label: I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and I'm willing to share it if required
   - type: input
@@ -51,8 +55,6 @@ body:
     id: verbose
     attributes:
       label: Provide verbose output that clearly demonstrates the problem
-      description: |
-        This is mandatory unless absolutely impossible to provide. If you are unable to provide the output, please explain why.
       options:
         - label: Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)
           required: true
@@ -69,15 +71,14 @@ body:
       placeholder: |
         [debug] Command-line config: ['-vU', 'https://www.youtube.com/watch?v=BaW_jenozKc']
         [debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-        [debug] yt-dlp version nightly@... from yt-dlp/yt-dlp-nightly-builds [1a176d874] (win_exe)
-        [debug] Python 3.10.11 (CPython AMD64 64bit) - Windows-10-10.0.20348-SP0 (OpenSSL 1.1.1t  7 Feb 2023)
-        [debug] exe versions: ffmpeg 7.0.2 (setts), ffprobe 7.0.2
-        [debug] Optional libraries: Cryptodome-3.21.0, brotli-1.1.0, certifi-2024.08.30, curl_cffi-0.5.10, mutagen-1.47.0, requests-2.32.3, sqlite3-3.40.1, urllib3-2.2.3, websockets-13.1
+        [debug] yt-dlp version nightly@... from yt-dlp/yt-dlp [b634ba742] (win_exe)
+        [debug] Python 3.8.10 (CPython 64bit) - Windows-10-10.0.22000-SP0
+        [debug] exe versions: ffmpeg N-106550-g072101bd52-20220410 (fdk,setts), ffprobe N-106624-g391ce570c8-20220415, phantomjs 2.1.1
+        [debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3
         [debug] Proxy map: {}
-        [debug] Request Handlers: urllib, requests, websockets, curl_cffi
-        [debug] Loaded 1838 extractors
-        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-        Latest version: nightly@... from yt-dlp/yt-dlp-nightly-builds
+        [debug] Request Handlers: urllib, requests
+        [debug] Loaded 1893 extractors
+        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp-nightly-builds/releases/latest
         yt-dlp is up to date (nightly@... from yt-dlp/yt-dlp-nightly-builds)
         [youtube] Extracting URL: https://www.youtube.com/watch?v=BaW_jenozKc
         <more lines>

.github/ISSUE_TEMPLATE/4_bug_report.yml

@@ -2,11 +2,13 @@ name: Core bug report
 description: Report a bug unrelated to any particular site or extractor
 labels: [triage, bug]
 body:
-  - type: markdown
+  - type: checkboxes
     attributes:
-      value: |
-        > [!IMPORTANT]
-        > Not providing the required (*) information or removing the template will result in your issue being closed and ignored.
+      label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
+      description: Fill all fields even if you think it is irrelevant for the issue
+      options:
+        - label: I understand that I will be **blocked** if I *intentionally* remove or skip any mandatory\* field
+          required: true
   - type: checkboxes
     id: checklist
     attributes:
@@ -18,7 +20,13 @@ body:
           required: true
         - label: I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
           required: true
-        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766), [the FAQ](https://github.com/yt-dlp/yt-dlp/wiki/FAQ), and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%3Aissue%20-label%3Aspam%20%20) for similar issues **including closed ones**. DO NOT post duplicates
+        - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
+          required: true
+        - label: I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/yt-dlp/yt-dlp/wiki/FAQ#video-url-contains-an-ampersand--and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)
+          required: true
+        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+          required: true
+        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
   - type: textarea
     id: description
@@ -32,8 +40,6 @@ body:
     id: verbose
     attributes:
       label: Provide verbose output that clearly demonstrates the problem
-      description: |
-        This is mandatory unless absolutely impossible to provide. If you are unable to provide the output, please explain why.
       options:
         - label: Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)
           required: true
@@ -50,15 +56,14 @@ body:
       placeholder: |
         [debug] Command-line config: ['-vU', 'https://www.youtube.com/watch?v=BaW_jenozKc']
         [debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-        [debug] yt-dlp version nightly@... from yt-dlp/yt-dlp-nightly-builds [1a176d874] (win_exe)
-        [debug] Python 3.10.11 (CPython AMD64 64bit) - Windows-10-10.0.20348-SP0 (OpenSSL 1.1.1t  7 Feb 2023)
-        [debug] exe versions: ffmpeg 7.0.2 (setts), ffprobe 7.0.2
-        [debug] Optional libraries: Cryptodome-3.21.0, brotli-1.1.0, certifi-2024.08.30, curl_cffi-0.5.10, mutagen-1.47.0, requests-2.32.3, sqlite3-3.40.1, urllib3-2.2.3, websockets-13.1
+        [debug] yt-dlp version nightly@... from yt-dlp/yt-dlp [b634ba742] (win_exe)
+        [debug] Python 3.8.10 (CPython 64bit) - Windows-10-10.0.22000-SP0
+        [debug] exe versions: ffmpeg N-106550-g072101bd52-20220410 (fdk,setts), ffprobe N-106624-g391ce570c8-20220415, phantomjs 2.1.1
+        [debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3
         [debug] Proxy map: {}
-        [debug] Request Handlers: urllib, requests, websockets, curl_cffi
-        [debug] Loaded 1838 extractors
-        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-        Latest version: nightly@... from yt-dlp/yt-dlp-nightly-builds
+        [debug] Request Handlers: urllib, requests
+        [debug] Loaded 1893 extractors
+        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp-nightly-builds/releases/latest
         yt-dlp is up to date (nightly@... from yt-dlp/yt-dlp-nightly-builds)
         [youtube] Extracting URL: https://www.youtube.com/watch?v=BaW_jenozKc
         <more lines>

.github/ISSUE_TEMPLATE/5_feature_request.yml

@@ -1,12 +1,14 @@
 name: Feature request
-description: Request a new feature unrelated to any particular site or extractor
+description: Request a new functionality unrelated to any particular site or extractor
 labels: [triage, enhancement]
 body:
-  - type: markdown
+  - type: checkboxes
     attributes:
-      value: |
-        > [!IMPORTANT]
-        > Not providing the required (*) information or removing the template will result in your issue being closed and ignored.
+      label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
+      description: Fill all fields even if you think it is irrelevant for the issue
+      options:
+        - label: I understand that I will be **blocked** if I *intentionally* remove or skip any mandatory\* field
+          required: true
   - type: checkboxes
     id: checklist
     attributes:
@@ -20,7 +22,9 @@ body:
           required: true
         - label: I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
           required: true
-        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%3Aissue%20-label%3Aspam%20%20) for similar requests **including closed ones**. DO NOT post duplicates
+        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+          required: true
+        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
   - type: textarea
     id: description
@@ -34,8 +38,6 @@ body:
     id: verbose
     attributes:
       label: Provide verbose output that clearly demonstrates the problem
-      description: |
-        This is mandatory unless absolutely impossible to provide. If you are unable to provide the output, please explain why.
       options:
         - label: Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)
         - label: "If using API, add `'verbose': True` to `YoutubeDL` params instead"
@@ -50,15 +52,14 @@ body:
       placeholder: |
         [debug] Command-line config: ['-vU', 'https://www.youtube.com/watch?v=BaW_jenozKc']
         [debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-        [debug] yt-dlp version nightly@... from yt-dlp/yt-dlp-nightly-builds [1a176d874] (win_exe)
-        [debug] Python 3.10.11 (CPython AMD64 64bit) - Windows-10-10.0.20348-SP0 (OpenSSL 1.1.1t  7 Feb 2023)
-        [debug] exe versions: ffmpeg 7.0.2 (setts), ffprobe 7.0.2
-        [debug] Optional libraries: Cryptodome-3.21.0, brotli-1.1.0, certifi-2024.08.30, curl_cffi-0.5.10, mutagen-1.47.0, requests-2.32.3, sqlite3-3.40.1, urllib3-2.2.3, websockets-13.1
+        [debug] yt-dlp version nightly@... from yt-dlp/yt-dlp [b634ba742] (win_exe)
+        [debug] Python 3.8.10 (CPython 64bit) - Windows-10-10.0.22000-SP0
+        [debug] exe versions: ffmpeg N-106550-g072101bd52-20220410 (fdk,setts), ffprobe N-106624-g391ce570c8-20220415, phantomjs 2.1.1
+        [debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3
         [debug] Proxy map: {}
-        [debug] Request Handlers: urllib, requests, websockets, curl_cffi
-        [debug] Loaded 1838 extractors
-        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-        Latest version: nightly@... from yt-dlp/yt-dlp-nightly-builds
+        [debug] Request Handlers: urllib, requests
+        [debug] Loaded 1893 extractors
+        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp-nightly-builds/releases/latest
         yt-dlp is up to date (nightly@... from yt-dlp/yt-dlp-nightly-builds)
         [youtube] Extracting URL: https://www.youtube.com/watch?v=BaW_jenozKc
         <more lines>

.github/ISSUE_TEMPLATE/6_question.yml

@@ -1,12 +1,14 @@
 name: Ask question
-description: Ask a question about using yt-dlp
+description: Ask yt-dlp related question
 labels: [question]
 body:
-  - type: markdown
+  - type: checkboxes
     attributes:
-      value: |
-        > [!IMPORTANT]
-        > Not providing the required (*) information or removing the template will result in your issue being closed and ignored.
+      label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
+      description: Fill all fields even if you think it is irrelevant for the issue
+      options:
+        - label: I understand that I will be **blocked** if I *intentionally* remove or skip any mandatory\* field
+          required: true
   - type: markdown
     attributes:
       value: |
@@ -26,7 +28,9 @@ body:
           required: true
         - label: I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
           required: true
-        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766), [the FAQ](https://github.com/yt-dlp/yt-dlp/wiki/FAQ), and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%3Aissue%20-label%3Aspam%20%20) for similar questions **including closed ones**. DO NOT post duplicates
+        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar questions **including closed ones**. DO NOT post duplicates
+          required: true
+        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
   - type: textarea
     id: question
@@ -40,8 +44,6 @@ body:
     id: verbose
     attributes:
       label: Provide verbose output that clearly demonstrates the problem
-      description: |
-        This is mandatory unless absolutely impossible to provide. If you are unable to provide the output, please explain why.
       options:
         - label: Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)
         - label: "If using API, add `'verbose': True` to `YoutubeDL` params instead"
@@ -56,15 +58,14 @@ body:
       placeholder: |
         [debug] Command-line config: ['-vU', 'https://www.youtube.com/watch?v=BaW_jenozKc']
         [debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-        [debug] yt-dlp version nightly@... from yt-dlp/yt-dlp-nightly-builds [1a176d874] (win_exe)
-        [debug] Python 3.10.11 (CPython AMD64 64bit) - Windows-10-10.0.20348-SP0 (OpenSSL 1.1.1t  7 Feb 2023)
-        [debug] exe versions: ffmpeg 7.0.2 (setts), ffprobe 7.0.2
-        [debug] Optional libraries: Cryptodome-3.21.0, brotli-1.1.0, certifi-2024.08.30, curl_cffi-0.5.10, mutagen-1.47.0, requests-2.32.3, sqlite3-3.40.1, urllib3-2.2.3, websockets-13.1
+        [debug] yt-dlp version nightly@... from yt-dlp/yt-dlp [b634ba742] (win_exe)
+        [debug] Python 3.8.10 (CPython 64bit) - Windows-10-10.0.22000-SP0
+        [debug] exe versions: ffmpeg N-106550-g072101bd52-20220410 (fdk,setts), ffprobe N-106624-g391ce570c8-20220415, phantomjs 2.1.1
+        [debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3
         [debug] Proxy map: {}
-        [debug] Request Handlers: urllib, requests, websockets, curl_cffi
-        [debug] Loaded 1838 extractors
-        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-        Latest version: nightly@... from yt-dlp/yt-dlp-nightly-builds
+        [debug] Request Handlers: urllib, requests
+        [debug] Loaded 1893 extractors
+        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp-nightly-builds/releases/latest
         yt-dlp is up to date (nightly@... from yt-dlp/yt-dlp-nightly-builds)
         [youtube] Extracting URL: https://www.youtube.com/watch?v=BaW_jenozKc
         <more lines>

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,8 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Get help on Discord
+  - name: Get help from the community on Discord
     url: https://discord.gg/H5MNcFW63r
-    about: Join the yt-dlp Discord server for support and discussion
+    about: Join the yt-dlp Discord for community-powered support!
+  - name: Matrix Bridge to the Discord server
+    url: https://matrix.to/#/#yt-dlp:matrix.org
+    about: For those who do not want to use Discord

.github/ISSUE_TEMPLATE_tmpl/1_broken_site.yml

@@ -18,7 +18,9 @@ body:
           required: true
         - label: I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/yt-dlp/yt-dlp/wiki/FAQ#video-url-contains-an-ampersand--and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)
           required: true
-        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766), [the FAQ](https://github.com/yt-dlp/yt-dlp/wiki/FAQ), and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%%3Aissue%%20-label%%3Aspam%%20%%20) for similar issues **including closed ones**. DO NOT post duplicates
+        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+          required: true
+        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
         - label: I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and I'm willing to share it if required
   - type: input

.github/ISSUE_TEMPLATE_tmpl/2_site_support_request.yml

@@ -18,7 +18,9 @@ body:
           required: true
         - label: I've checked that none of provided URLs [violate any copyrights](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-website-primarily-used-for-piracy) or contain any [DRM](https://en.wikipedia.org/wiki/Digital_rights_management) to the best of my knowledge
           required: true
-        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%%3Aissue%%20-label%%3Aspam%%20%%20) for similar requests **including closed ones**. DO NOT post duplicates
+        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+          required: true
+        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
         - label: I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and am willing to share it if required
   - type: input

.github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.yml

@@ -1,5 +1,5 @@
 name: Site feature request
-description: Request new functionality for a site supported by yt-dlp
+description: Request a new functionality for a supported site
 labels: [triage, site-enhancement]
 body:
   %(no_skip)s
@@ -16,7 +16,9 @@ body:
           required: true
         - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
           required: true
-        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%%3Aissue%%20-label%%3Aspam%%20%%20) for similar requests **including closed ones**. DO NOT post duplicates
+        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+          required: true
+        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
         - label: I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and I'm willing to share it if required
   - type: input

.github/ISSUE_TEMPLATE_tmpl/4_bug_report.yml

@@ -14,7 +14,13 @@ body:
           required: true
         - label: I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
           required: true
-        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766), [the FAQ](https://github.com/yt-dlp/yt-dlp/wiki/FAQ), and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%%3Aissue%%20-label%%3Aspam%%20%%20) for similar issues **including closed ones**. DO NOT post duplicates
+        - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
+          required: true
+        - label: I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/yt-dlp/yt-dlp/wiki/FAQ#video-url-contains-an-ampersand--and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)
+          required: true
+        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+          required: true
+        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
   - type: textarea
     id: description

.github/ISSUE_TEMPLATE_tmpl/5_feature_request.yml

@@ -1,5 +1,5 @@
 name: Feature request
-description: Request a new feature unrelated to any particular site or extractor
+description: Request a new functionality unrelated to any particular site or extractor
 labels: [triage, enhancement]
 body:
   %(no_skip)s
@@ -16,7 +16,9 @@ body:
           required: true
         - label: I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
           required: true
-        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%%3Aissue%%20-label%%3Aspam%%20%%20) for similar requests **including closed ones**. DO NOT post duplicates
+        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+          required: true
+        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
   - type: textarea
     id: description

.github/ISSUE_TEMPLATE_tmpl/6_question.yml

@@ -1,5 +1,5 @@
 name: Ask question
-description: Ask a question about using yt-dlp
+description: Ask yt-dlp related question
 labels: [question]
 body:
   %(no_skip)s
@@ -22,7 +22,9 @@ body:
           required: true
         - label: I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
           required: true
-        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766), [the FAQ](https://github.com/yt-dlp/yt-dlp/wiki/FAQ), and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%%3Aissue%%20-label%%3Aspam%%20%%20) for similar questions **including closed ones**. DO NOT post duplicates
+        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar questions **including closed ones**. DO NOT post duplicates
+          required: true
+        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
   - type: textarea
     id: question

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,17 +1,14 @@
-<!--
-    **IMPORTANT**: PRs without the template will be CLOSED
-    
-    Due to the high volume of pull requests, it may be a while before your PR is reviewed.
-    Please try to keep your pull request focused on a single bugfix or new feature.
-    Pull requests with a vast scope and/or very large diff will take much longer to review.
-    It is recommended for new contributors to stick to smaller pull requests, so you can receive much more immediate feedback as you familiarize yourself with the codebase.
-
-    PLEASE AVOID FORCE-PUSHING after opening a PR, as it makes reviewing more difficult.
--->
+**IMPORTANT**: PRs without the template will be CLOSED
 
 ### Description of your *pull request* and other information
 
-ADD DETAILED DESCRIPTION HERE
+<!--
+
+Explanation of your *pull request* in arbitrary form goes here. Please **make sure the description explains the purpose and effect** of your *pull request* and is worded well enough to be understood. Provide as much **context and examples** as possible
+
+-->
+
+ADD DESCRIPTION HERE
 
 Fixes #
 
@@ -19,22 +16,25 @@ Fixes #
 <details open><summary>Template</summary> <!-- OPEN is intentional -->
 
 <!--
-    # PLEASE FOLLOW THE GUIDE BELOW
 
-    - You will be asked some questions, please read them **carefully** and answer honestly
-    - Put an `x` into all the boxes `[ ]` relevant to your *pull request* (like [x])
-    - Use *Preview* tab to see what your *pull request* will actually look like
+# PLEASE FOLLOW THE GUIDE BELOW
+
+- You will be asked some questions, please read them **carefully** and answer honestly
+- Put an `x` into all the boxes `[ ]` relevant to your *pull request* (like [x])
+- Use *Preview* tab to see how your *pull request* will actually look like
+
 -->
 
 ### Before submitting a *pull request* make sure you have:
 - [ ] At least skimmed through [contributing guidelines](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#developer-instructions) including [yt-dlp coding conventions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#yt-dlp-coding-conventions)
 - [ ] [Searched](https://github.com/yt-dlp/yt-dlp/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests
+- [ ] Checked the code with [flake8](https://pypi.python.org/pypi/flake8) and [ran relevant tests](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#developer-instructions)
 
-### In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check those that apply and remove the others:
-- [ ] I am the original author of the code in this PR, and I am willing to release it under [Unlicense](http://unlicense.org/)
-- [ ] I am not the original author of the code in this PR, but it is in the public domain or released under [Unlicense](http://unlicense.org/) (provide reliable evidence)
+### In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check all of the following options that apply:
+- [ ] I am the original author of this code and I am willing to release it under [Unlicense](http://unlicense.org/)
+- [ ] I am not the original author of this code but it is in public domain or released under [Unlicense](http://unlicense.org/) (provide reliable evidence)
 
-### What is the purpose of your *pull request*? Check those that apply and remove the others:
+### What is the purpose of your *pull request*?
 - [ ] Fix or improvement to an extractor (Make sure to add/update tests)
 - [ ] New extractor ([Piracy websites will not be accepted](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-website-primarily-used-for-piracy))
 - [ ] Core bug fix/improvement

.github/workflows/build.yml

@@ -12,9 +12,6 @@ on:
       unix:
         default: true
         type: boolean
-      linux_static:
-        default: true
-        type: boolean
       linux_arm:
         default: true
         type: boolean
@@ -30,6 +27,9 @@ on:
       windows32:
         default: true
         type: boolean
+      meta_files:
+        default: true
+        type: boolean
       origin:
         required: false
         default: ''
@@ -52,11 +52,7 @@ on:
         default: stable
         type: string
       unix:
-        description: yt-dlp, yt-dlp.tar.gz
-        default: true
-        type: boolean
-      linux_static:
-        description: yt-dlp_linux
+        description: yt-dlp, yt-dlp.tar.gz, yt-dlp_linux, yt-dlp_linux.zip
         default: true
         type: boolean
       linux_arm:
@@ -72,13 +68,17 @@ on:
         default: true
         type: boolean
       windows:
-        description: yt-dlp.exe, yt-dlp_win.zip
+        description: yt-dlp.exe, yt-dlp_min.exe, yt-dlp_win.zip
         default: true
         type: boolean
       windows32:
         description: yt-dlp_x86.exe
         default: true
         type: boolean
+      meta_files:
+        description: SHA2-256SUMS, SHA2-512SUMS, _update_spec
+        default: true
+        type: boolean
       origin:
         description: Origin
         required: false
@@ -107,31 +107,60 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0  # Needed for changelog
       - uses: actions/setup-python@v5
         with:
           python-version: "3.10"
+      - uses: conda-incubator/setup-miniconda@v3
+        with:
+          miniforge-variant: Mambaforge
+          use-mamba: true
+          channels: conda-forge
+          auto-update-conda: true
+          activate-environment: ""
+          auto-activate-base: false
       - name: Install Requirements
         run: |
           sudo apt -y install zip pandoc man sed
+          cat > ./requirements.txt << EOF
+          python=3.10.*
+          brotli-python
+          EOF
+          python devscripts/install_deps.py --print \
+            --exclude brotli --exclude brotlicffi \
+            --include secretstorage --include pyinstaller >> ./requirements.txt
+          mamba create -n build --file ./requirements.txt
+
       - name: Prepare
         run: |
           python devscripts/update-version.py -c "${{ inputs.channel }}" -r "${{ needs.process.outputs.origin }}" "${{ inputs.version }}"
-          python devscripts/update_changelog.py -vv
           python devscripts/make_lazy_extractors.py
       - name: Build Unix platform-independent binary
         run: |
           make all tar
+      - name: Build Unix standalone binary
+        shell: bash -l {0}
+        run: |
+          unset LD_LIBRARY_PATH  # Harmful; set by setup-python
+          conda activate build
+          python -m bundle.pyinstaller --onedir
+          (cd ./dist/yt-dlp_linux && zip -r ../yt-dlp_linux.zip .)
+          python -m bundle.pyinstaller
+          mv ./dist/yt-dlp_linux ./yt-dlp_linux
+          mv ./dist/yt-dlp_linux.zip ./yt-dlp_linux.zip
+
       - name: Verify --update-to
         if: vars.UPDATE_TO_VERIFICATION
         run: |
-          chmod +x ./yt-dlp
-          cp ./yt-dlp ./yt-dlp_downgraded
-          version="$(./yt-dlp --version)"
-          ./yt-dlp_downgraded -v --update-to yt-dlp/yt-dlp@2023.03.04
-          downgraded_version="$(./yt-dlp_downgraded --version)"
-          [[ "$version" != "$downgraded_version" ]]
+          binaries=("yt-dlp" "yt-dlp_linux")
+          for binary in "${binaries[@]}"; do
+            chmod +x ./${binary}
+            cp ./${binary} ./${binary}_downgraded
+            version="$(./${binary} --version)"
+            ./${binary}_downgraded -v --update-to yt-dlp/yt-dlp@2023.03.04
+            downgraded_version="$(./${binary}_downgraded --version)"
+            [[ "$version" != "$downgraded_version" ]]
+          done
+
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
@@ -139,39 +168,8 @@ jobs:
           path: |
             yt-dlp
             yt-dlp.tar.gz
-          compression-level: 0
-
-  linux_static:
-    needs: process
-    if: inputs.linux_static
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Build static executable
-        env:
-          channel: ${{ inputs.channel }}
-          origin: ${{ needs.process.outputs.origin }}
-          version: ${{ inputs.version }}
-        run: |
-          mkdir ~/build
-          cd bundle/docker
-          docker compose up --build static
-          sudo chown "${USER}:docker" ~/build/yt-dlp_linux
-      - name: Verify --update-to
-        if: vars.UPDATE_TO_VERIFICATION
-        run: |
-          chmod +x ~/build/yt-dlp_linux
-          cp ~/build/yt-dlp_linux ~/build/yt-dlp_linux_downgraded
-          version="$(~/build/yt-dlp_linux --version)"
-          ~/build/yt-dlp_linux_downgraded -v --update-to yt-dlp/yt-dlp@2023.03.04
-          downgraded_version="$(~/build/yt-dlp_linux_downgraded --version)"
-          [[ "$version" != "$downgraded_version" ]]
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-bin-${{ github.job }}
-          path: |
-            ~/build/yt-dlp_linux
+            yt-dlp_linux
+            yt-dlp_linux.zip
           compression-level: 0
 
   linux_arm:
@@ -192,31 +190,29 @@ jobs:
         with:
           path: ./repo
       - name: Virtualized Install, Prepare & Build
-        uses: yt-dlp/run-on-arch-action@v3
+        uses: yt-dlp/run-on-arch-action@v2
         with:
           # Ref: https://github.com/uraimo/run-on-arch-action/issues/55
           env: |
             GITHUB_WORKFLOW: build
           githubToken: ${{ github.token }} # To cache image
           arch: ${{ matrix.architecture }}
-          distro: ubuntu20.04 # Standalone executable should be built on minimum supported OS
+          distro: ubuntu18.04 # Standalone executable should be built on minimum supported OS
           dockerRunArgs: --volume "${PWD}/repo:/repo"
           install: | # Installing Python 3.10 from the Deadsnakes repo raises errors
             apt update
-            apt -y install zlib1g-dev libffi-dev python3.9 python3.9-dev python3.9-distutils python3-pip \
-              python3-secretstorage  # Cannot build cryptography wheel in virtual armv7 environment
-            python3.9 -m pip install -U pip wheel 'setuptools>=71.0.2'
-            # XXX: Keep this in sync with pyproject.toml (it can't be accessed at this stage) and exclude secretstorage
-            python3.9 -m pip install -U Pyinstaller mutagen pycryptodomex brotli certifi cffi \
-              'requests>=2.32.2,<3' 'urllib3>=1.26.17,<3' 'websockets>=13.0'
+            apt -y install zlib1g-dev libffi-dev python3.8 python3.8-dev python3.8-distutils python3-pip
+            python3.8 -m pip install -U pip setuptools wheel
+            # Cannot access any files from the repo directory at this stage
+            python3.8 -m pip install -U Pyinstaller mutagen pycryptodomex websockets brotli certifi secretstorage cffi
 
           run: |
             cd repo
-            python3.9 devscripts/install_deps.py -o --include build
-            python3.9 devscripts/install_deps.py --include pyinstaller  # Cached versions may be out of date
-            python3.9 devscripts/update-version.py -c "${{ inputs.channel }}" -r "${{ needs.process.outputs.origin }}" "${{ inputs.version }}"
-            python3.9 devscripts/make_lazy_extractors.py
-            python3.9 -m bundle.pyinstaller
+            python3.8 devscripts/install_deps.py -o --include build
+            python3.8 devscripts/install_deps.py --include pyinstaller --include secretstorage  # Cached version may be out of date
+            python3.8 devscripts/update-version.py -c "${{ inputs.channel }}" -r "${{ needs.process.outputs.origin }}" "${{ inputs.version }}"
+            python3.8 devscripts/make_lazy_extractors.py
+            python3.8 -m bundle.pyinstaller
 
             if ${{ vars.UPDATE_TO_VERIFICATION && 'true' || 'false' }}; then
               arch="${{ (matrix.architecture == 'armv7' && 'armv7l') || matrix.architecture }}"
@@ -239,63 +235,18 @@ jobs:
   macos:
     needs: process
     if: inputs.macos
-    permissions:
-      contents: read
-      actions: write  # For cleaning up cache
-    runs-on: macos-13
+    runs-on: macos-11
 
     steps:
       - uses: actions/checkout@v4
       # NB: Building universal2 does not work with python from actions/setup-python
-
-      - name: Restore cached requirements
-        id: restore-cache
-        uses: actions/cache/restore@v4
-        env:
-          SEGMENT_DOWNLOAD_TIMEOUT_MINS: 1
-        with:
-          path: |
-            ~/yt-dlp-build-venv
-          key: cache-reqs-${{ github.job }}-${{ github.ref }}
-
       - name: Install Requirements
         run: |
           brew install coreutils
-          python3 -m venv ~/yt-dlp-build-venv
-          source ~/yt-dlp-build-venv/bin/activate
-          python3 devscripts/install_deps.py -o --include build
+          python3 devscripts/install_deps.py --user -o --include build
           python3 devscripts/install_deps.py --print --include pyinstaller > requirements.txt
           # We need to ignore wheels otherwise we break universal2 builds
-          python3 -m pip install -U --no-binary :all: -r requirements.txt
-          # We need to fuse our own universal2 wheels for curl_cffi
-          python3 -m pip install -U 'delocate==0.11.0'
-          mkdir curl_cffi_whls curl_cffi_universal2
-          python3 devscripts/install_deps.py --print -o --include curl-cffi > requirements.txt
-          for platform in "macosx_11_0_arm64" "macosx_11_0_x86_64"; do
-            python3 -m pip download \
-              --only-binary=:all: \
-              --platform "${platform}" \
-              -d curl_cffi_whls \
-              -r requirements.txt
-          done
-          ( # Overwrite x86_64-only libs with fat/universal2 libs or else Pyinstaller will do the opposite
-            # See https://github.com/yt-dlp/yt-dlp/pull/10069
-            cd curl_cffi_whls
-            mkdir -p curl_cffi/.dylibs
-            python_libdir=$(python3 -c 'import sys; from pathlib import Path; print(Path(sys.path[1]).parent)')
-            for dylib in lib{ssl,crypto}.3.dylib; do
-              cp "${python_libdir}/${dylib}" "curl_cffi/.dylibs/${dylib}"
-              for wheel in curl_cffi*macos*x86_64.whl; do
-                zip "${wheel}" "curl_cffi/.dylibs/${dylib}"
-              done
-            done
-          )
-          python3 -m delocate.cmd.delocate_fuse curl_cffi_whls/curl_cffi*.whl -w curl_cffi_universal2
-          python3 -m delocate.cmd.delocate_fuse curl_cffi_whls/cffi*.whl -w curl_cffi_universal2
-          for wheel in curl_cffi_universal2/*cffi*.whl; do
-            mv -n -- "${wheel}" "${wheel/x86_64/universal2}"
-          done
-          python3 -m pip install --force-reinstall -U curl_cffi_universal2/*cffi*.whl
+          python3 -m pip install -U --user --no-binary :all: -r requirements.txt
 
       - name: Prepare
         run: |
@@ -303,7 +254,6 @@ jobs:
           python3 devscripts/make_lazy_extractors.py
       - name: Build
         run: |
-          source ~/yt-dlp-build-venv/bin/activate
           python3 -m bundle.pyinstaller --target-architecture universal2 --onedir
           (cd ./dist/yt-dlp_macos && zip -r ../yt-dlp_macos.zip .)
           python3 -m bundle.pyinstaller --target-architecture universal2
@@ -327,25 +277,10 @@ jobs:
             dist/yt-dlp_macos.zip
           compression-level: 0
 
-      - name: Cleanup cache
-        if: steps.restore-cache.outputs.cache-hit == 'true'
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          cache_key: cache-reqs-${{ github.job }}-${{ github.ref }}
-        run: |
-          gh cache delete "${cache_key}"
-
-      - name: Cache requirements
-        uses: actions/cache/save@v4
-        with:
-          path: |
-            ~/yt-dlp-build-venv
-          key: cache-reqs-${{ github.job }}-${{ github.ref }}
-
   macos_legacy:
     needs: process
     if: inputs.macos_legacy
-    runs-on: macos-13
+    runs-on: macos-latest
 
     steps:
       - uses: actions/checkout@v4
@@ -358,7 +293,7 @@ jobs:
           # Hack to get the latest patch version. Uncomment if needed
           #brew install python@3.10
           #export PYTHON_VERSION=$( $(brew --prefix)/opt/python@3.10/bin/python3 --version | cut -d ' ' -f 2 )
-          curl "https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}-macos11.pkg" -o "python.pkg"
+          curl https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}-macos11.pkg -o "python.pkg"
           sudo installer -pkg python.pkg -target /
           python3 --version
       - name: Install Requirements
@@ -402,13 +337,13 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
-        with:
-          python-version: "3.10"
+        with: # 3.8 is used for Win7 support
+          python-version: "3.8"
       - name: Install Requirements
         run: | # Custom pyinstaller built with https://github.com/yt-dlp/pyinstaller-builds
           python devscripts/install_deps.py -o --include build
-          python devscripts/install_deps.py --include curl-cffi
-          python -m pip install -U "https://yt-dlp.github.io/Pyinstaller-Builds/x86_64/pyinstaller-6.13.0-py3-none-any.whl"
+          python devscripts/install_deps.py --include py2exe
+          python -m pip install -U "https://yt-dlp.github.io/Pyinstaller-Builds/x86_64/pyinstaller-5.8.0-py3-none-any.whl"
 
       - name: Prepare
         run: |
@@ -416,6 +351,8 @@ jobs:
           python devscripts/make_lazy_extractors.py
       - name: Build
         run: |
+          python -m bundle.py2exe
+          Move-Item ./dist/yt-dlp.exe ./dist/yt-dlp_min.exe
           python -m bundle.pyinstaller
           python -m bundle.pyinstaller --onedir
           Compress-Archive -Path ./dist/yt-dlp/* -DestinationPath ./dist/yt-dlp_win.zip
@@ -423,7 +360,7 @@ jobs:
       - name: Verify --update-to
         if: vars.UPDATE_TO_VERIFICATION
         run: |
-          foreach ($name in @("yt-dlp")) {
+          foreach ($name in @("yt-dlp","yt-dlp_min")) {
             Copy-Item "./dist/${name}.exe" "./dist/${name}_downgraded.exe"
             $version = & "./dist/${name}.exe" --version
             & "./dist/${name}_downgraded.exe" -v --update-to yt-dlp/yt-dlp@2023.03.04
@@ -439,6 +376,7 @@ jobs:
           name: build-bin-${{ github.job }}
           path: |
             dist/yt-dlp.exe
+            dist/yt-dlp_min.exe
             dist/yt-dlp_win.zip
           compression-level: 0
 
@@ -451,13 +389,13 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.8"
           architecture: "x86"
       - name: Install Requirements
         run: |
           python devscripts/install_deps.py -o --include build
           python devscripts/install_deps.py
-          python -m pip install -U "https://yt-dlp.github.io/Pyinstaller-Builds/i686/pyinstaller-6.13.0-py3-none-any.whl"
+          python -m pip install -U "https://yt-dlp.github.io/Pyinstaller-Builds/i686/pyinstaller-5.8.0-py3-none-any.whl"
 
       - name: Prepare
         run: |
@@ -489,11 +427,10 @@ jobs:
           compression-level: 0
 
   meta_files:
-    if: always() && !cancelled()
+    if: inputs.meta_files && always() && !cancelled()
     needs:
       - process
       - unix
-      - linux_static
       - linux_arm
       - macos
       - macos_legacy
@@ -501,8 +438,7 @@ jobs:
       - windows32
     runs-on: ubuntu-latest
     steps:
-      - name: Download artifacts
-        uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v4
         with:
           path: artifact
           pattern: build-bin-*
@@ -511,13 +447,8 @@ jobs:
       - name: Make SHA2-SUMS files
         run: |
           cd ./artifact/
-          # make sure SHA sums are also printed to stdout
-          sha256sum -- * | tee ../SHA2-256SUMS
-          sha512sum -- * | tee ../SHA2-512SUMS
-          # also print as permanent annotations to the summary page
-          while read -r shasum; do
-            echo "::notice title=${shasum##* }::sha256: ${shasum% *}"
-          done < ../SHA2-256SUMS
+          sha256sum * > ../SHA2-256SUMS
+          sha512sum * > ../SHA2-512SUMS
 
       - name: Make Update spec
         run: |
@@ -526,29 +457,13 @@ jobs:
           lock 2022.08.18.36 .+ Python 3\.6
           lock 2023.11.16 (?!win_x86_exe).+ Python 3\.7
           lock 2023.11.16 win_x86_exe .+ Windows-(?:Vista|2008Server)
-          lock 2024.10.22 py2exe .+
-          lock 2024.10.22 linux_(?:armv7l|aarch64)_exe .+-glibc2\.(?:[12]?\d|30)\b
-          lock 2024.10.22 (?!\w+_exe).+ Python 3\.8
-          lock 2024.10.22 win(?:_x86)?_exe Python 3\.[78].+ Windows-(?:7-|2008ServerR2)
           lockV2 yt-dlp/yt-dlp 2022.08.18.36 .+ Python 3\.6
           lockV2 yt-dlp/yt-dlp 2023.11.16 (?!win_x86_exe).+ Python 3\.7
           lockV2 yt-dlp/yt-dlp 2023.11.16 win_x86_exe .+ Windows-(?:Vista|2008Server)
-          lockV2 yt-dlp/yt-dlp 2024.10.22 py2exe .+
-          lockV2 yt-dlp/yt-dlp 2024.10.22 linux_(?:armv7l|aarch64)_exe .+-glibc2\.(?:[12]?\d|30)\b
-          lockV2 yt-dlp/yt-dlp 2024.10.22 (?!\w+_exe).+ Python 3\.8
-          lockV2 yt-dlp/yt-dlp 2024.10.22 win(?:_x86)?_exe Python 3\.[78].+ Windows-(?:7-|2008ServerR2)
           lockV2 yt-dlp/yt-dlp-nightly-builds 2023.11.15.232826 (?!win_x86_exe).+ Python 3\.7
           lockV2 yt-dlp/yt-dlp-nightly-builds 2023.11.15.232826 win_x86_exe .+ Windows-(?:Vista|2008Server)
-          lockV2 yt-dlp/yt-dlp-nightly-builds 2024.10.22.051025 py2exe .+
-          lockV2 yt-dlp/yt-dlp-nightly-builds 2024.10.22.051025 linux_(?:armv7l|aarch64)_exe .+-glibc2\.(?:[12]?\d|30)\b
-          lockV2 yt-dlp/yt-dlp-nightly-builds 2024.10.22.051025 (?!\w+_exe).+ Python 3\.8
-          lockV2 yt-dlp/yt-dlp-nightly-builds 2024.10.22.051025 win(?:_x86)?_exe Python 3\.[78].+ Windows-(?:7-|2008ServerR2)
           lockV2 yt-dlp/yt-dlp-master-builds 2023.11.15.232812 (?!win_x86_exe).+ Python 3\.7
           lockV2 yt-dlp/yt-dlp-master-builds 2023.11.15.232812 win_x86_exe .+ Windows-(?:Vista|2008Server)
-          lockV2 yt-dlp/yt-dlp-master-builds 2024.10.22.045052 py2exe .+
-          lockV2 yt-dlp/yt-dlp-master-builds 2024.10.22.060347 linux_(?:armv7l|aarch64)_exe .+-glibc2\.(?:[12]?\d|30)\b
-          lockV2 yt-dlp/yt-dlp-master-builds 2024.10.22.060347 (?!\w+_exe).+ Python 3\.8
-          lockV2 yt-dlp/yt-dlp-master-builds 2024.10.22.060347 win(?:_x86)?_exe Python 3\.[78].+ Windows-(?:7-|2008ServerR2)
           EOF
 
       - name: Sign checksum files

.github/workflows/codeql.yml

@@ -33,7 +33,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -47,7 +47,7 @@ jobs:
     # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -60,6 +60,6 @@ jobs:
     #     ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v2
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/core.yml

@@ -6,7 +6,7 @@ on:
       - devscripts/**
       - test/**
       - yt_dlp/**.py
-      - '!yt_dlp/extractor/**.py'
+      - '!yt_dlp/extractor/*.py'
       - yt_dlp/extractor/__init__.py
       - yt_dlp/extractor/common.py
       - yt_dlp/extractor/extractors.py
@@ -16,7 +16,7 @@ on:
       - devscripts/**
       - test/**
       - yt_dlp/**.py
-      - '!yt_dlp/extractor/**.py'
+      - '!yt_dlp/extractor/*.py'
       - yt_dlp/extractor/__init__.py
       - yt_dlp/extractor/common.py
       - yt_dlp/extractor/extractors.py
@@ -36,20 +36,16 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        # CPython 3.9 is in quick-test
-        python-version: ['3.10', '3.11', '3.12', '3.13', pypy-3.10]
+        # CPython 3.8 is in quick-test
+        python-version: ['3.9', '3.10', '3.11', '3.12', pypy-3.8, pypy-3.10]
         include:
         # atleast one of each CPython/PyPy tests must be in windows
         - os: windows-latest
-          python-version: '3.9'
-        - os: windows-latest
-          python-version: '3.10'
+          python-version: '3.8'
         - os: windows-latest
           python-version: '3.12'
         - os: windows-latest
-          python-version: '3.13'
-        - os: windows-latest
-          python-version: pypy-3.10
+          python-version: pypy-3.9
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
@@ -57,10 +53,9 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install test requirements
-      run: python3 ./devscripts/install_deps.py --include test --include curl-cffi
+      run: python3 ./devscripts/install_deps.py --include dev
     - name: Run tests
-      timeout-minutes: 15
       continue-on-error: False
       run: |
         python3 -m yt_dlp -v || true  # Print debug head
-        python3 ./devscripts/run_tests.py --pytest-args '--reruns 2 --reruns-delay 3.0' core
+        python3 ./devscripts/run_tests.py core

.github/workflows/download.yml

@@ -28,13 +28,13 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest]
-        python-version: ['3.10', '3.11', '3.12', '3.13', pypy-3.10]
+        python-version: ['3.10', '3.11', '3.12', pypy-3.8, pypy-3.10]
         include:
         # atleast one of each CPython/PyPy tests must be in windows
         - os: windows-latest
-          python-version: '3.9'
+          python-version: '3.8'
         - os: windows-latest
-          python-version: pypy-3.10
+          python-version: pypy-3.9
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}

.github/workflows/issue-lockdown.yml

@@ -1,21 +0,0 @@
-name: Issue Lockdown
-on:
-  issues:
-    types: [opened]
-
-permissions:
-  issues: write
-
-jobs:
-  lockdown:
-    name: Issue Lockdown
-    if: vars.ISSUE_LOCKDOWN
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Lock new issue"
-        env:
-          GH_TOKEN: ${{ github.token }}
-          ISSUE_NUMBER: ${{ github.event.issue.number }}
-          REPOSITORY: ${{ github.repository }}
-        run: |
-          gh issue lock "${ISSUE_NUMBER}" -R "${REPOSITORY}"

.github/workflows/quick-test.yml

@@ -10,33 +10,26 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python 3.9
+    - name: Set up Python 3.8
       uses: actions/setup-python@v5
       with:
-        python-version: '3.9'
+        python-version: '3.8'
     - name: Install test requirements
-      run: python3 ./devscripts/install_deps.py -o --include test
+      run: python3 ./devscripts/install_deps.py --include dev
     - name: Run tests
-      timeout-minutes: 15
       run: |
         python3 -m yt_dlp -v || true
-        python3 ./devscripts/run_tests.py --pytest-args '--reruns 2 --reruns-delay 3.0' core
-  check:
-    name: Code check
+        python3 ./devscripts/run_tests.py core
+  flake8:
+    name: Linter
     if: "!contains(github.event.head_commit.message, 'ci skip all')"
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-python@v5
-      with:
-        python-version: '3.9'
-    - name: Install dev dependencies
-      run: python3 ./devscripts/install_deps.py -o --include static-analysis
+    - name: Install flake8
+      run: python3 ./devscripts/install_deps.py -o --include dev
     - name: Make lazy extractors
       run: python3 ./devscripts/make_lazy_extractors.py
-    - name: Run ruff
-      run: ruff check --output-format github .
-    - name: Run autopep8
-      run: autopep8 --diff .
-    - name: Check file mode
-      run: git ls-files --format="%(objectmode) %(path)" yt_dlp/ | ( ! grep -v "^100644" )
+    - name: Run flake8
+      run: flake8 .

.github/workflows/release-master.yml

@@ -24,24 +24,6 @@ jobs:
       source: master
     permissions:
       contents: write
-      packages: write  # For package cache
-      actions: write  # For cleaning up cache
+      packages: write
       id-token: write  # mandatory for trusted publishing
     secrets: inherit
-
-  publish_pypi:
-    needs: [release]
-    if: vars.MASTER_PYPI_PROJECT != ''
-    runs-on: ubuntu-latest
-    permissions:
-      id-token: write  # mandatory for trusted publishing
-    steps:
-      - name: Download artifacts
-        uses: actions/download-artifact@v4
-        with:
-          path: dist
-          name: build-pypi
-      - name: Publish to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          verbose: true

.github/workflows/release-nightly.yml

@@ -37,24 +37,6 @@ jobs:
       source: nightly
     permissions:
       contents: write
-      packages: write  # For package cache
-      actions: write  # For cleaning up cache
+      packages: write
       id-token: write  # mandatory for trusted publishing
     secrets: inherit
-
-  publish_pypi:
-    needs: [release]
-    if: vars.NIGHTLY_PYPI_PROJECT != ''
-    runs-on: ubuntu-latest
-    permissions:
-      id-token: write  # mandatory for trusted publishing
-    steps:
-      - name: Download artifacts
-        uses: actions/download-artifact@v4
-        with:
-          path: dist
-          name: build-pypi
-      - name: Publish to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          verbose: true

.github/workflows/release.yml

@@ -2,6 +2,10 @@ name: Release
 on:
   workflow_call:
     inputs:
+      prerelease:
+        required: false
+        default: true
+        type: boolean
       source:
         required: false
         default: ''
@@ -14,10 +18,6 @@ on:
         required: false
         default: ''
         type: string
-      prerelease:
-        required: false
-        default: true
-        type: boolean
   workflow_dispatch:
     inputs:
       source:
@@ -189,8 +189,13 @@ jobs:
         if: |
           !inputs.prerelease && env.target_repo == github.repository
         run: |
-          python devscripts/update_changelog.py -vv
           make doc
+          sed '/### /Q' Changelog.md >> ./CHANGELOG
+          echo '### ${{ env.version }}' >> ./CHANGELOG
+          python ./devscripts/make_changelog.py -vv -c >> ./CHANGELOG
+          echo >> ./CHANGELOG
+          grep -Poz '(?s)### \d+\.\d+\.\d+.+' 'Changelog.md' | head -n -1 >> ./CHANGELOG
+          cat ./CHANGELOG > Changelog.md
 
       - name: Push to release
         id: push_release
@@ -204,7 +209,7 @@ jobs:
           git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git add -u
           git commit -m "Release ${{ env.version }}" \
-            -m "Created by: ${{ github.event.sender.login }}" -m ":ci skip all"
+            -m "Created by: ${{ github.event.sender.login }}" -m ":ci skip all :ci run dl"
           git push origin --force ${{ github.event.ref }}:release
 
       - name: Get target commitish
@@ -228,8 +233,7 @@ jobs:
       origin: ${{ needs.prepare.outputs.target_repo }}
     permissions:
       contents: read
-      packages: write  # For package cache
-      actions: write  # For cleaning up cache
+      packages: write # For package cache
     secrets:
       GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}
 
@@ -262,7 +266,6 @@ jobs:
           pypi_project: ${{ needs.prepare.outputs.pypi_project }}
         run: |
           python devscripts/update-version.py -c "${{ env.channel }}" -r "${{ env.target_repo }}" -s "${{ env.suffix }}" "${{ env.version }}"
-          python devscripts/update_changelog.py -vv
           python devscripts/make_lazy_extractors.py
           sed -i -E '0,/(name = ")[^"]+(")/s//\1${{ env.pypi_project }}\2/' pyproject.toml
 
@@ -278,17 +281,7 @@ jobs:
           make clean-cache
           python -m build --no-isolation .
 
-      - name: Upload artifacts
-        if: github.event_name != 'workflow_dispatch'
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-pypi
-          path: |
-            dist/*
-          compression-level: 0
-
       - name: Publish to PyPI
-        if: github.event_name == 'workflow_dispatch'
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           verbose: true
@@ -335,7 +328,7 @@ jobs:
               "(https://github.com/yt-dlp/yt-dlp-master-builds/releases/latest \"Master builds\")"' || '' }} > ./RELEASE_NOTES
           printf '\n\n' >> ./RELEASE_NOTES
           cat >> ./RELEASE_NOTES << EOF
-          #### A description of the various files is in the [README](https://github.com/${{ github.repository }}#release-files)
+          #### A description of the various files are in the [README](https://github.com/${{ github.repository }}#release-files)
           ---
           $(python ./devscripts/make_changelog.py -vv --collapsible)
           EOF

.github/workflows/sanitize-comment.yml

@@ -1,17 +0,0 @@
-name: Sanitize comment
-
-on:
-  issue_comment:
-    types: [created, edited]
-
-permissions:
-  issues: write
-
-jobs:
-  sanitize-comment:
-    name: Sanitize comment
-    if: vars.SANITIZE_COMMENT && !github.event.issue.pull_request
-    runs-on: ubuntu-latest
-    steps:
-      - name: Sanitize comment
-        uses: yt-dlp/sanitize-comment@v1

.github/workflows/signature-tests.yml

@@ -1,41 +0,0 @@
-name: Signature Tests
-on:
-  push:
-    paths:
-      - .github/workflows/signature-tests.yml
-      - test/test_youtube_signature.py
-      - yt_dlp/jsinterp.py
-  pull_request:
-    paths:
-      - .github/workflows/signature-tests.yml
-      - test/test_youtube_signature.py
-      - yt_dlp/jsinterp.py
-permissions:
-  contents: read
-
-concurrency:
-  group: signature-tests-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
-
-jobs:
-  tests:
-    name: Signature Tests
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, windows-latest]
-        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', pypy-3.10, pypy-3.11]
-    steps:
-    - uses: actions/checkout@v4
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install test requirements
-      run: python3 ./devscripts/install_deps.py --only-optional --include test
-    - name: Run tests
-      timeout-minutes: 15
-      run: |
-        python3 -m yt_dlp -v || true  # Print debug head
-        python3 ./devscripts/run_tests.py test/test_youtube_signature.py

.gitignore

@@ -51,6 +51,7 @@ cookies
 *.srt
 *.ssa
 *.swf
+*.swp
 *.tt
 *.ttml
 *.url
@@ -66,7 +67,7 @@ cookies
 # Python
 *.pyc
 *.pyo
-.*_cache
+.pytest_cache
 wine-py2exe/
 py2exe.log
 build/
@@ -92,7 +93,6 @@ updates_key.pem
 *.class
 *.isorted
 *.stackdump
-uv.lock
 
 # Generated
 AUTHORS
@@ -105,8 +105,6 @@ README.txt
 *.zsh
 *.spec
 test/testdata/sigs/player-*.js
-test/testdata/thumbnails/empty.webp
-test/testdata/thumbnails/foo\ %d\ bar/foo_%d.*
 
 # Binary
 /youtube-dl
@@ -121,7 +119,6 @@ yt-dlp.zip
 .vscode
 *.sublime-*
 *.code-workspace
-*.swp
 
 # Lazy extractors
 */extractor/lazy_extractors.py

.pre-commit-config.yaml

@@ -1,14 +0,0 @@
-repos:
-- repo: local
-  hooks:
-  - id: linter
-    name: Apply linter fixes
-    entry: ruff check --fix .
-    language: system
-    types: [python]
-    require_serial: true
-  - id: format
-    name: Apply formatting fixes
-    entry: autopep8 --in-place .
-    language: system
-    types: [python]

.pre-commit-hatch.yaml

@@ -1,9 +0,0 @@
-repos:
-- repo: local
-  hooks:
-  - id: fix
-    name: Apply code fixes
-    entry: hatch fmt
-    language: system
-    types: [python]
-    require_serial: true

CONTRIBUTING.md

@@ -37,18 +37,14 @@ Bugs and suggestions should be reported at: [yt-dlp/yt-dlp/issues](https://githu
 **Please include the full output of yt-dlp when run with `-vU`**, i.e. **add** `-vU` flag to **your command line**, copy the **whole** output and post it in the issue body wrapped in \`\`\` for better formatting. It should look similar to this:
 ```
 $ yt-dlp -vU <your command line>
-[debug] Command-line config: ['-vU', 'https://www.example.com/']
-[debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-[debug] yt-dlp version nightly@... from yt-dlp/yt-dlp-nightly-builds [1a176d874] (win_exe)
-[debug] Python 3.10.11 (CPython AMD64 64bit) - Windows-10-10.0.20348-SP0 (OpenSSL 1.1.1t  7 Feb 2023)
-[debug] exe versions: ffmpeg 7.0.2 (setts), ffprobe 7.0.2
-[debug] Optional libraries: Cryptodome-3.21.0, brotli-1.1.0, certifi-2024.08.30, curl_cffi-0.5.10, mutagen-1.47.0, requests-2.32.3, sqlite3-3.40.1, urllib3-2.2.3, websockets-13.1
+[debug] Command-line config: ['-v', 'demo.com']
+[debug] Encodings: locale UTF-8, fs utf-8, out utf-8, pref UTF-8
+[debug] yt-dlp version 2021.09.25 (zip)
+[debug] Python version 3.8.10 (CPython 64bit) - Linux-5.4.0-74-generic-x86_64-with-glibc2.29
+[debug] exe versions: ffmpeg 4.2.4, ffprobe 4.2.4
 [debug] Proxy map: {}
-[debug] Request Handlers: urllib, requests, websockets, curl_cffi
-[debug] Loaded 1838 extractors
-[debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-Latest version: nightly@... from yt-dlp/yt-dlp-nightly-builds
-yt-dlp is up to date (nightly@... from yt-dlp/yt-dlp-nightly-builds)
+Current Build Hash 25cc412d1d3c0725a1f2f5b7e4682f6fb40e6d15f7024e96f7afd572e9919535
+yt-dlp is up to date (2021.09.25)
 ...
 ```
 **Do not post screenshots of verbose logs; only plain text is acceptable.**
@@ -131,60 +127,25 @@ While these steps won't necessarily ensure that no misuse of the account takes p
 
 ### Is the website primarily used for piracy?
 
-We follow [youtube-dl's policy](https://github.com/ytdl-org/youtube-dl#can-you-add-support-for-this-anime-video-site-or-site-which-shows-current-movies-for-free) to not support services that is primarily used for infringing copyright. Additionally, it has been decided to not to support porn sites that specialize in fakes. We also cannot support any service that serves only [DRM protected content](https://en.wikipedia.org/wiki/Digital_rights_management).
+We follow [youtube-dl's policy](https://github.com/ytdl-org/youtube-dl#can-you-add-support-for-this-anime-video-site-or-site-which-shows-current-movies-for-free) to not support services that is primarily used for infringing copyright. Additionally, it has been decided to not to support porn sites that specialize in fakes. We also cannot support any service that serves only [DRM protected content](https://en.wikipedia.org/wiki/Digital_rights_management). 
 
 
 
 
 # DEVELOPER INSTRUCTIONS
 
-Most users do not need to build yt-dlp and can [download the builds](https://github.com/yt-dlp/yt-dlp/releases), get them via [the other installation methods](README.md#installation) or directly run it using `python -m yt_dlp`.
+Most users do not need to build yt-dlp and can [download the builds](https://github.com/yt-dlp/yt-dlp/releases) or get them via [the other installation methods](README.md#installation).
 
-`yt-dlp` uses [`hatch`](<https://hatch.pypa.io>) as a project management tool.
-You can easily install it using [`pipx`](<https://pipx.pypa.io>) via `pipx install hatch`, or else via `pip` or your package manager of choice. Make sure you are using at least version `1.10.0`, otherwise some functionality might not work as expected.
+To run yt-dlp as a developer, you don't need to build anything either. Simply execute
 
-If you plan on contributing to `yt-dlp`, best practice is to start by running the following command:
+    python3 -m yt_dlp
 
-```shell
-$ hatch run setup
-```
+To run all the available core tests, use:
 
-The above command will install a `pre-commit` hook so that required checks/fixes (linting, formatting) will run automatically before each commit. If any code needs to be linted or formatted, then the commit will be blocked and the necessary changes will be made; you should review all edits and re-commit the fixed version.
-
-After this you can use `hatch shell` to enable a virtual environment that has `yt-dlp` and its development dependencies installed.
-
-In addition, the following script commands can be used to run simple tasks such as linting or testing (without having to run `hatch shell` first):
-* `hatch fmt`: Automatically fix linter violations and apply required code formatting changes
-    * See `hatch fmt --help` for more info
-* `hatch test`: Run extractor or core tests
-    * See `hatch test --help` for more info
+    python3 devscripts/run_tests.py
 
 See item 6 of [new extractor tutorial](#adding-support-for-a-new-site) for how to run extractor specific test cases.
 
-While it is strongly recommended to use `hatch` for yt-dlp development, if you are unable to do so, alternatively you can manually create a virtual environment and use the following commands:
-
-```shell
-# To only install development dependencies:
-$ python -m devscripts.install_deps --include dev
-
-# Or, for an editable install plus dev dependencies:
-$ python -m pip install -e ".[default,dev]"
-
-# To setup the pre-commit hook:
-$ pre-commit install
-
-# To be used in place of `hatch test`:
-$ python -m devscripts.run_tests
-
-# To be used in place of `hatch fmt`:
-$ ruff check --fix .
-$ autopep8 --in-place .
-
-# To only check code instead of applying fixes:
-$ ruff check .
-$ autopep8 --diff .
-```
-
 If you want to create a build of yt-dlp yourself, you can follow the instructions [here](README.md#compile).
 
 
@@ -204,23 +165,19 @@ After you have ensured this site is distributing its content legally, you can fo
 1. [Fork this repository](https://github.com/yt-dlp/yt-dlp/fork)
 1. Check out the source code with:
 
-    ```shell
-    $ git clone git@github.com:YOUR_GITHUB_USERNAME/yt-dlp.git
-    ```
+        git clone git@github.com:YOUR_GITHUB_USERNAME/yt-dlp.git
 
 1. Start a new git branch with
 
-    ```shell
-    $ cd yt-dlp
-    $ git checkout -b yourextractor
-    ```
+        cd yt-dlp
+        git checkout -b yourextractor
 
 1. Start with this simple template and save it to `yt_dlp/extractor/yourextractor.py`:
 
     ```python
     from .common import InfoExtractor
-
-
+    
+    
     class YourExtractorIE(InfoExtractor):
         _VALID_URL = r'https?://(?:www\.)?yourextractor\.com/watch/(?P<id>[0-9]+)'
         _TESTS = [{
@@ -237,7 +194,7 @@ After you have ensured this site is distributing its content legally, you can fo
                 # * MD5 checksum; start the string with 'md5:', e.g.
                 #     'description': 'md5:098f6bcd4621d373cade4e832627b4f6',
                 # * A regular expression; start the string with 're:', e.g.
-                #     'thumbnail': r're:https?://.*\.jpg$',
+                #     'thumbnail': r're:^https?://.*\.jpg$',
                 # * A count of elements in a list; start the string with 'count:', e.g.
                 #     'tags': 'count:10',
                 # * Any Python type, e.g.
@@ -248,7 +205,7 @@ After you have ensured this site is distributing its content legally, you can fo
         def _real_extract(self, url):
             video_id = self._match_id(url)
             webpage = self._download_webpage(url, video_id)
-
+    
             # TODO more code goes here, for example ...
             title = self._html_search_regex(r'<h1>(.+?)</h1>', webpage, 'title')
 
@@ -260,27 +217,21 @@ After you have ensured this site is distributing its content legally, you can fo
                 # TODO more properties (see yt_dlp/extractor/common.py)
             }
     ```
-1. Add an import in [`yt_dlp/extractor/_extractors.py`](yt_dlp/extractor/_extractors.py). Note that the class name must end with `IE`. Also note that when adding a parenthesized import group, the last import in the group must have a trailing comma in order for this formatting to be respected by our code formatter.
-1. Run `hatch test YourExtractor`. This *may fail* at first, but you can continually re-run it until you're done. Upon failure, it will output the missing fields and/or correct values which you can copy. If you decide to add more than one test, the tests will then be named `YourExtractor`, `YourExtractor_1`, `YourExtractor_2`, etc. Note that tests with an `only_matching` key in the test's dict are not included in the count. You can also run all the tests in one go with `YourExtractor_all`
+1. Add an import in [`yt_dlp/extractor/_extractors.py`](yt_dlp/extractor/_extractors.py). Note that the class name must end with `IE`.
+1. Run `python3 devscripts/run_tests.py YourExtractor`. This *may fail* at first, but you can continually re-run it until you're done. Upon failure, it will output the missing fields and/or correct values which you can copy. If you decide to add more than one test, the tests will then be named `YourExtractor`, `YourExtractor_1`, `YourExtractor_2`, etc. Note that tests with an `only_matching` key in the test's dict are not included in the count. You can also run all the tests in one go with `YourExtractor_all`
 1. Make sure you have at least one test for your extractor. Even if all videos covered by the extractor are expected to be inaccessible for automated testing, tests should still be added with a `skip` parameter indicating why the particular test is disabled from running.
 1. Have a look at [`yt_dlp/extractor/common.py`](yt_dlp/extractor/common.py) for possible helper methods and a [detailed description of what your extractor should and may return](yt_dlp/extractor/common.py#L119-L440). Add tests and code for as many as you want.
-1. Make sure your code follows [yt-dlp coding conventions](#yt-dlp-coding-conventions), passes [ruff](https://docs.astral.sh/ruff/tutorial/#getting-started) code checks and is properly formatted:
+1. Make sure your code follows [yt-dlp coding conventions](#yt-dlp-coding-conventions) and check the code with [flake8](https://flake8.pycqa.org/en/latest/index.html#quickstart):
 
-    ```shell
-    $ hatch fmt --check
-    ```
+        $ flake8 yt_dlp/extractor/yourextractor.py
 
-    You can use `hatch fmt` to automatically fix problems. Rules that the linter/formatter enforces should not be disabled with `# noqa` unless a maintainer requests it. The only exception allowed is for old/printf-style string formatting in GraphQL query templates (use `# noqa: UP031`).
-
-1. Make sure your code works under all [Python](https://www.python.org/) versions supported by yt-dlp, namely CPython >=3.9 and PyPy >=3.10. Backward compatibility is not required for even older versions of Python.
+1. Make sure your code works under all [Python](https://www.python.org/) versions supported by yt-dlp, namely CPython and PyPy for Python 3.8 and above. Backward compatibility is not required for even older versions of Python.
 1. When the tests pass, [add](https://git-scm.com/docs/git-add) the new files, [commit](https://git-scm.com/docs/git-commit) them and [push](https://git-scm.com/docs/git-push) the result, like this:
 
-    ```shell
-    $ git add yt_dlp/extractor/_extractors.py
-    $ git add yt_dlp/extractor/yourextractor.py
-    $ git commit -m '[yourextractor] Add extractor'
-    $ git push origin yourextractor
-    ```
+        $ git add yt_dlp/extractor/_extractors.py
+        $ git add yt_dlp/extractor/yourextractor.py
+        $ git commit -m '[yourextractor] Add extractor'
+        $ git push origin yourextractor
 
 1. Finally, [create a pull request](https://help.github.com/articles/creating-a-pull-request). We'll then review and merge it.
 
@@ -306,9 +257,10 @@ Extractors are very fragile by nature since they depend on the layout of the sou
 For extraction to work yt-dlp relies on metadata your extractor extracts and provides to yt-dlp expressed by an [information dictionary](yt_dlp/extractor/common.py#L119-L440) or simply *info dict*. Only the following meta fields in the *info dict* are considered mandatory for a successful extraction process by yt-dlp:
 
  - `id` (media identifier)
+ - `title` (media title)
  - `url` (media download URL) or `formats`
 
-The aforementioned metadata fields are the critical data without which extraction does not make any sense. If any of them fail to be extracted, then the extractor is considered broken. All other metadata extraction should be completely non-fatal.
+The aforementioned metafields are the critical data that the extraction does not make any sense without and if any of them fail to be extracted then the extractor is considered completely broken. While all extractors must return a `title`, they must also allow it's extraction to be non-fatal.
 
 For pornographic sites, appropriate `age_limit` must also be returned.
 
@@ -323,7 +275,7 @@ Say you have some source dictionary `meta` that you've fetched as JSON with HTTP
 ```python
 meta = self._download_json(url, video_id)
 ```
-
+    
 Assume at this point `meta`'s layout is:
 
 ```python
@@ -753,7 +705,7 @@ Use `url_or_none` for safe URL processing.
 
 Use `traverse_obj` and `try_call` (superseeds `dict_get` and `try_get`) for safe metadata extraction from parsed JSON.
 
-Use `unified_strdate` for uniform `upload_date` or any `YYYYMMDD` meta field extraction, `unified_timestamp` for uniform `timestamp` extraction, `parse_filesize` for `filesize` extraction, `parse_count` for count meta fields extraction, `parse_resolution`, `parse_duration` for `duration` extraction, `parse_age_limit` for `age_limit` extraction.
+Use `unified_strdate` for uniform `upload_date` or any `YYYYMMDD` meta field extraction, `unified_timestamp` for uniform `timestamp` extraction, `parse_filesize` for `filesize` extraction, `parse_count` for count meta fields extraction, `parse_resolution`, `parse_duration` for `duration` extraction, `parse_age_limit` for `age_limit` extraction. 
 
 Explore [`yt_dlp/utils/`](yt_dlp/utils/) for more useful convenience functions.
 

CONTRIBUTORS

@@ -600,187 +600,3 @@ xpadev-net
 Xpl0itU
 YoshichikaAAA
 zhijinwuu
-alb
-hruzgar
-kasper93
-leoheitmannruiz
-luiso1979
-nipotan
-Offert4324
-sta1us
-Tomoka1
-trwstin
-alexhuot1
-clienthax
-DaPotato69
-emqi
-hugohaa
-imanoreotwe
-JakeFinley96
-lostfictions
-minamotorin
-ocococococ
-Podiumnoche
-RasmusAntons
-roeniss
-shoxie007
-Szpachlarz
-The-MAGI
-TuxCoder
-voidful
-vtexier
-WyohKnott
-trueauracoral
-ASertacAkkaya
-axpauls
-chilinux
-hafeoz
-JSubelj
-jucor
-megumintyan
-mgedmin
-Niluge-KiWi
-peisenwang
-TheZ3ro
-tippfehlr
-varunchopra
-DrakoCpp
-PatrykMis
-DinhHuy2010
-exterrestris
-harbhim
-LeSuisse
-DunnesH
-iancmy
-mokrueger
-luvyana
-szantnerb
-hugepower
-scribblemaniac
-Codenade
-Demon000
-Deukhoofd
-grqz
-hibes
-Khaoklong51
-kieraneglin
-lengzuo
-naglis
-ndyanx
-otovalek
-quad
-rakslice
-sahilsinghss73
-tony-hn
-xingchensong
-BallzCrasher
-coreywright
-eric321
-poyhen
-tetra-fox
-444995
-63427083
-allendema
-DarkZeros
-DTrombett
-imranh2
-KarboniteKream
-mikkovedru
-pktiuk
-rubyevadestaxes
-avagordon01
-CounterPillow
-JoseAngelB
-KBelmin
-kesor
-MellowKyler
-Wesley107772
-a13ssandr0
-ChocoLZS
-doe1080
-hugovdev
-jshumphrey
-julionc
-manavchaudhary1
-powergold1
-Sakura286
-SamDecrock
-stratus-ss
-subrat-lima
-gitninja1234
-jkruse
-xiaomac
-wesson09
-Crypto90
-MutantPiggieGolem1
-Sanceilaks
-Strkmn
-0x9fff00
-4ft35t
-7x11x13
-b5i
-cotko
-d3d9
-Dioarya
-finch71
-hexahigh
-InvalidUsernameException
-jixunmoe
-knackku
-krandor
-kvk-2015
-lonble
-msm595
-n10dollar
-NecroRomnt
-pjrobertson
-subsense
-test20140
-arantius
-entourage8
-lfavole
-mp3butcher
-slipinthedove
-YoshiTabletopGamer
-Arc8ne
-benfaerber
-chrisellsworth
-fries1234
-Kenshin9977
-MichaelDeBoey
-msikma
-pedro
-pferreir
-red-acid
-refack
-rysson
-somini
-thedenv
-vallovic
-arabcoders
-mireq
-mlabeeb03
-1271
-CasperMcFadden95
-Kicer86
-Kiritomo
-leeblackc
-meGAmeS1
-NeonMan
-pj47x
-troex
-WouterGordts
-baierjan
-GeoffreyFrogeye
-Pawka
-v3DJG6GL
-yozel
-brian6932
-iednod55
-maxbin123
-nullpos
-anlar
-eason1478
-ceandreasen
-chauhantirth
-helpimnotdrowning

Collaborators.md

@@ -61,10 +61,3 @@ You can also find lists of all [contributors of yt-dlp](CONTRIBUTORS) and [autho
 * Reworked internals like `traverse_obj`, various core refactors and bugs fixes
 * Implemented proper progress reporting for parallel downloads
 * Improved/fixed/added Bundestag, crunchyroll, pr0gramm, Twitter, WrestleUniverse etc
-
-
-## [sepro](https://github.com/seproDev)
-
-* UX improvements: Warn when ffmpeg is missing, warn when double-clicking exe
-* Code cleanup: Remove dead extractors, mark extractors as broken, enable/apply ruff rules
-* Improved/fixed/added ArdMediathek, DRTV, Floatplane, MagentaMusik, Naver, Nebula, OnDemandKorea, Vbox7 etc

Makefile

@@ -2,7 +2,7 @@ all: lazy-extractors yt-dlp doc pypi-files
 clean: clean-test clean-dist
 clean-all: clean clean-cache
 completions: completion-bash completion-fish completion-zsh
-doc: README.md CONTRIBUTING.md CONTRIBUTORS issuetemplates supportedsites
+doc: README.md CONTRIBUTING.md issuetemplates supportedsites
 ot: offlinetest
 tar: yt-dlp.tar.gz
 
@@ -10,25 +10,21 @@ tar: yt-dlp.tar.gz
 # intended use: when building a source distribution,
 # make pypi-files && python3 -m build -sn .
 pypi-files: AUTHORS Changelog.md LICENSE README.md README.txt supportedsites \
-            completions yt-dlp.1 pyproject.toml setup.cfg devscripts/* test/*
+	        completions yt-dlp.1 pyproject.toml setup.cfg devscripts/* test/*
 
-.PHONY: all clean clean-all clean-test clean-dist clean-cache \
-        completions completion-bash completion-fish completion-zsh \
-        doc issuetemplates supportedsites ot offlinetest codetest test \
-        tar pypi-files lazy-extractors install uninstall
+.PHONY: all clean install test tar pypi-files completions ot offlinetest codetest supportedsites
 
 clean-test:
-	rm -rf tmp/ *.annotations.xml *.aria2 *.description *.dump *.frag \
+	rm -rf test/testdata/sigs/player-*.js tmp/ *.annotations.xml *.aria2 *.description *.dump *.frag \
 	*.frag.aria2 *.frag.urls *.info.json *.live_chat.json *.meta *.part* *.tmp *.temp *.unknown_video *.ytdl \
 	*.3gp *.ape *.ass *.avi *.desktop *.f4v *.flac *.flv *.gif *.jpeg *.jpg *.lrc *.m4a *.m4v *.mhtml *.mkv *.mov *.mp3 *.mp4 \
-	*.mpg *.mpga *.oga *.ogg *.opus *.png *.sbv *.srt *.ssa *.swf *.tt *.ttml *.url *.vtt *.wav *.webloc *.webm *.webp \
-	test/testdata/sigs/player-*.js test/testdata/thumbnails/empty.webp "test/testdata/thumbnails/foo %d bar/foo_%d."*
+	*.mpg *.mpga *.oga *.ogg *.opus *.png *.sbv *.srt *.ssa *.swf *.swp *.tt *.ttml *.url *.vtt *.wav *.webloc *.webm *.webp
 clean-dist:
 	rm -rf yt-dlp.1.temp.md yt-dlp.1 README.txt MANIFEST build/ dist/ .coverage cover/ yt-dlp.tar.gz completions/ \
 	yt_dlp/extractor/lazy_extractors.py *.spec CONTRIBUTING.md.tmp yt-dlp yt-dlp.exe yt_dlp.egg-info/ AUTHORS
 clean-cache:
 	find . \( \
-		-type d -name ".*_cache" -o -type d -name __pycache__ -o -name "*.pyc" -o -name "*.class" \
+		-type d -name .pytest_cache -o -type d -name __pycache__ -o -name "*.pyc" -o -name "*.class" \
 	\) -prune -exec rm -rf {} \;
 
 completion-bash: completions/bash/yt-dlp
@@ -71,15 +67,14 @@ uninstall:
 	rm -f $(DESTDIR)$(SHAREDIR)/fish/vendor_completions.d/yt-dlp.fish
 
 codetest:
-	ruff check .
-	autopep8 --diff .
+	flake8 .
 
 test:
-	$(PYTHON) -m pytest -Werror
+	$(PYTHON) -m pytest
 	$(MAKE) codetest
 
 offlinetest: codetest
-	$(PYTHON) -m pytest -Werror -m "not download"
+	$(PYTHON) -m pytest -k "not download"
 
 CODE_FOLDERS_CMD = find yt_dlp -type f -name '__init__.py' | sed 's,/__init__.py,,' | grep -v '/__' | sort
 CODE_FOLDERS != $(CODE_FOLDERS_CMD)
@@ -153,7 +148,7 @@ yt-dlp.tar.gz: all
 		--exclude '*.pyo' \
 		--exclude '*~' \
 		--exclude '__pycache__' \
-		--exclude '.*_cache' \
+		--exclude '.pytest_cache' \
 		--exclude '.git' \
 		-- \
 		README.md supportedsites.md Changelog.md LICENSE \
@@ -161,14 +156,5 @@ yt-dlp.tar.gz: all
 		Makefile yt-dlp.1 README.txt completions .gitignore \
 		setup.cfg yt-dlp yt_dlp pyproject.toml devscripts test
 
-AUTHORS: Changelog.md
-	@if [ -d '.git' ] && command -v git > /dev/null ; then \
-	  echo 'Generating $@ from git commit history' ; \
-	  git shortlog -s -n HEAD | cut -f2 | sort > $@ ; \
-	fi
-
-CONTRIBUTORS: Changelog.md
-	@if [ -d '.git' ] && command -v git > /dev/null ; then \
-	  echo 'Updating $@ from git commit history' ; \
-	  $(PYTHON) devscripts/make_changelog.py -v -c > /dev/null ; \
-	fi
+AUTHORS:
+	git shortlog -s -n HEAD | cut -f2 | sort > AUTHORS

bundle/docker/compose.yml

@@ -1,10 +0,0 @@
-services:
-  static:
-    build: static
-    environment:
-      channel: ${channel}
-      origin: ${origin}
-      version: ${version}
-    volumes:
-      - ~/build:/build
-      - ../..:/yt-dlp

bundle/docker/static/Dockerfile

@@ -1,21 +0,0 @@
-FROM alpine:3.19 as base
-
-RUN apk --update add --no-cache \
-        build-base \
-        python3 \
-        pipx \
-    ;
-
-RUN pipx install pyinstaller
-# Requires above step to prepare the shared venv
-RUN ~/.local/share/pipx/shared/bin/python -m pip install -U wheel
-RUN apk --update add --no-cache \
-        scons \
-        patchelf \
-        binutils \
-    ;
-RUN pipx install staticx
-
-WORKDIR /yt-dlp
-COPY entrypoint.sh /entrypoint.sh
-ENTRYPOINT /entrypoint.sh

bundle/docker/static/entrypoint.sh

@@ -1,14 +0,0 @@
-#!/bin/ash
-set -e
-
-source ~/.local/share/pipx/venvs/pyinstaller/bin/activate
-python -m devscripts.install_deps -o --include build
-python -m devscripts.install_deps --include secretstorage --include curl-cffi
-python -m devscripts.make_lazy_extractors
-python devscripts/update-version.py -c "${channel}" -r "${origin}" "${version}"
-python -m bundle.pyinstaller
-deactivate
-
-source ~/.local/share/pipx/venvs/staticx/bin/activate
-staticx /yt-dlp/dist/yt-dlp_linux /build/yt-dlp_linux
-deactivate

bundle/py2exe.py

@@ -0,0 +1,59 @@
+#!/usr/bin/env python3
+
+# Allow execution from anywhere
+import os
+import sys
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+import warnings
+
+from py2exe import freeze
+
+from devscripts.utils import read_version
+
+VERSION = read_version()
+
+
+def main():
+    warnings.warn(
+        'py2exe builds do not support pycryptodomex and needs VC++14 to run. '
+        'It is recommended to run "pyinst.py" to build using pyinstaller instead')
+
+    freeze(
+        console=[{
+            'script': './yt_dlp/__main__.py',
+            'dest_base': 'yt-dlp',
+            'icon_resources': [(1, 'devscripts/logo.ico')],
+        }],
+        version_info={
+            'version': VERSION,
+            'description': 'A youtube-dl fork with additional features and patches',
+            'comments': 'Official repository: <https://github.com/yt-dlp/yt-dlp>',
+            'product_name': 'yt-dlp',
+            'product_version': VERSION,
+        },
+        options={
+            'bundle_files': 0,
+            'compressed': 1,
+            'optimize': 2,
+            'dist_dir': './dist',
+            'excludes': [
+                # py2exe cannot import Crypto
+                'Crypto',
+                'Cryptodome',
+                # py2exe appears to confuse this with our socks library.
+                # We don't use pysocks and urllib3.contrib.socks would fail to import if tried.
+                'urllib3.contrib.socks'
+            ],
+            'dll_excludes': ['w9xpopen.exe', 'crypt32.dll'],
+            # Modules that are only imported dynamically must be added here
+            'includes': ['yt_dlp.compat._legacy', 'yt_dlp.compat._deprecated',
+                         'yt_dlp.utils._legacy', 'yt_dlp.utils._deprecated'],
+        },
+        zipfile=None,
+    )
+
+
+if __name__ == '__main__':
+    main()

bundle/pyinstaller.py

@@ -36,9 +36,6 @@ def main():
         f'--name={name}',
         '--icon=devscripts/logo.ico',
         '--upx-exclude=vcruntime140.dll',
-        # Ref: https://github.com/yt-dlp/yt-dlp/issues/13311
-        #      https://github.com/pyinstaller/pyinstaller/issues/9149
-        '--exclude-module=pkg_resources',
         '--noconfirm',
         '--additional-hooks-dir=yt_dlp/__pyinstaller',
         *opts,
@@ -71,7 +68,7 @@ def exe(onedir):
         'dist/',
         onedir and f'{name}/',
         name,
-        OS_NAME == 'win32' and '.exe',
+        OS_NAME == 'win32' and '.exe'
     )))
 
 
@@ -116,7 +113,7 @@ def windows_set_version(exe, version):
         ),
         kids=[
             StringFileInfo([StringTable('040904B0', [
-                StringStruct('Comments', f'yt-dlp{suffix} Command Line Interface'),
+                StringStruct('Comments', 'yt-dlp%s Command Line Interface' % suffix),
                 StringStruct('CompanyName', 'https://github.com/yt-dlp'),
                 StringStruct('FileDescription', 'yt-dlp%s' % (MACHINE and f' ({MACHINE})')),
                 StringStruct('FileVersion', version),
@@ -126,8 +123,8 @@ def windows_set_version(exe, version):
                 StringStruct('ProductName', f'yt-dlp{suffix}'),
                 StringStruct(
                     'ProductVersion', f'{version}{suffix} on Python {platform.python_version()}'),
-            ])]), VarFileInfo([VarStruct('Translation', [0, 1200])]),
-        ],
+            ])]), VarFileInfo([VarStruct('Translation', [0, 1200])])
+        ]
     ))
 
 

devscripts/bash-completion.py

@@ -9,8 +9,8 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 import yt_dlp
 
-BASH_COMPLETION_FILE = 'completions/bash/yt-dlp'
-BASH_COMPLETION_TEMPLATE = 'devscripts/bash-completion.in'
+BASH_COMPLETION_FILE = "completions/bash/yt-dlp"
+BASH_COMPLETION_TEMPLATE = "devscripts/bash-completion.in"
 
 
 def build_completion(opt_parser):
@@ -21,9 +21,9 @@ def build_completion(opt_parser):
             opts_flag.append(option.get_opt_string())
     with open(BASH_COMPLETION_TEMPLATE) as f:
         template = f.read()
-    with open(BASH_COMPLETION_FILE, 'w') as f:
+    with open(BASH_COMPLETION_FILE, "w") as f:
         # just using the special char
-        filled_template = template.replace('{{flags}}', ' '.join(opts_flag))
+        filled_template = template.replace("{{flags}}", " ".join(opts_flag))
         f.write(filled_template)
 
 

devscripts/changelog_override.json

@@ -126,141 +126,5 @@
         "when": "4ce57d3b873c2887814cbec03d029533e82f7db5",
         "short": "[ie] Support multi-period MPD streams (#6654)",
         "authors": ["alard", "pukkandan"]
-    },
-    {
-        "action": "change",
-        "when": "aa7e9ae4f48276bd5d0173966c77db9484f65a0a",
-        "short": "[ie/xvideos] Support new URL format (#9502)",
-        "authors": ["sta1us"]
-    },
-    {
-        "action": "remove",
-        "when": "22e4dfacb61f62dfbb3eb41b31c7b69ba1059b80"
-    },
-    {
-        "action": "change",
-        "when": "e3a3ed8a981d9395c4859b6ef56cd02bc3148db2",
-        "short": "[cleanup:ie] No `from` stdlib imports in extractors",
-        "authors": ["pukkandan"]
-    },
-    {
-        "action": "add",
-        "when": "9590cc6b4768e190183d7d071a6c78170889116a",
-        "short": "[priority] Security: [[CVE-2024-22423](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-22423)] [Prevent RCE when using `--exec` with `%q` on Windows](https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-hjq6-52gw-2g7p)\n    - The shell escape function now properly escapes `%`, `\\` and `\\n`.\n    - `utils.Popen` has been patched accordingly."
-    },
-    {
-        "action": "change",
-        "when": "41ba4a808b597a3afed78c89675a30deb6844450",
-        "short": "[ie/tiktok] Extract via mobile API only if extractor-arg is passed (#9938)",
-        "authors": ["bashonly"]
-    },
-    {
-        "action": "remove",
-        "when": "6e36d17f404556f0e3a43f441c477a71a91877d9"
-    },
-    {
-        "action": "change",
-        "when": "beaf832c7a9d57833f365ce18f6115b88071b296",
-        "short": "[ie/soundcloud] Add `formats` extractor-arg (#10004)",
-        "authors": ["bashonly", "Grub4K"]
-    },
-    {
-        "action": "change",
-        "when": "5c019f6328ad40d66561eac3c4de0b3cd070d0f6",
-        "short": "[cleanup] Misc (#9765)",
-        "authors": ["bashonly", "Grub4K", "seproDev"]
-    },
-    {
-        "action": "change",
-        "when": "e6a22834df1776ec4e486526f6df2bf53cb7e06f",
-        "short": "[ie/orf:on] Add `prefer_segments_playlist` extractor-arg (#10314)",
-        "authors": ["seproDev"]
-    },
-    {
-        "action": "add",
-        "when": "6aaf96a3d6e7d0d426e97e11a2fcf52fda00e733",
-        "short": "[priority] Security: [[CVE-2024-38519](https://nvd.nist.gov/vuln/detail/CVE-2024-38519)] [Properly sanitize file-extension to prevent file system modification and RCE](https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-79w7-vh3h-8g4j)\n    - Unsafe extensions are now blocked from being downloaded"
-    },
-    {
-        "action": "add",
-        "when": "6075a029dba70a89675ae1250e7cdfd91f0eba41",
-        "short": "[priority] Security: [[ie/douyutv] Do not use dangerous javascript source/URL](https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-3v33-3wmw-3785)\n    - A dependency on potentially malicious third-party JavaScript code has been removed from the Douyu extractors"
-    },
-    {
-        "action": "add",
-        "when": "fb8b7f226d251e521a89b23c415e249e5b788e5c",
-        "short": "[priority] **The minimum *recommended* Python version has been raised to 3.9**\nSince Python 3.8 will reach end-of-life in October 2024, support for it will be dropped soon. [Read more](https://github.com/yt-dlp/yt-dlp/issues/10086)"
-    },
-    {
-        "action": "change",
-        "when": "b31b81d85f00601710d4fac590c3e4efb4133283",
-        "short": "[ci] Rerun failed tests (#11143)",
-        "authors": ["Grub4K"]
-    },
-    {
-        "action": "add",
-        "when": "a886cf3e900f4a2ec00af705f883539269545609",
-        "short": "[priority] **py2exe is no longer supported**\nThis release's `yt-dlp_min.exe` will be the last, and it's actually a PyInstaller-bundled executable so that yt-dlp users updating their py2exe build with `-U` will be automatically migrated. [Read more](https://github.com/yt-dlp/yt-dlp/issues/10087)"
-    },
-    {
-        "action": "add",
-        "when": "a886cf3e900f4a2ec00af705f883539269545609",
-        "short": "[priority] **Following this release, yt-dlp's Python dependencies *must* be installed using the `default` group**\nIf you're installing yt-dlp with pip/pipx or requiring yt-dlp in your own Python project, you'll need to specify `yt-dlp[default]` if you want to also install yt-dlp's optional dependencies (which were previously included by default). [Read more](https://github.com/yt-dlp/yt-dlp/pull/11255)"
-    },
-    {
-        "action": "add",
-        "when": "87884f15580910e4e0fe0e1db73508debc657471",
-        "short": "[priority] **Beginning with this release, yt-dlp's Python dependencies *must* be installed using the `default` group**\nIf you're installing yt-dlp with pip/pipx or requiring yt-dlp in your own Python project, you'll need to specify `yt-dlp[default]` if you want to also install yt-dlp's optional dependencies (which were previously included by default). [Read more](https://github.com/yt-dlp/yt-dlp/pull/11255)"
-    },
-    {
-        "action": "add",
-        "when": "d784464399b600ba9516bbcec6286f11d68974dd",
-        "short": "[priority] **The minimum *required* Python version has been raised to 3.9**\nPython 3.8 reached its end-of-life on 2024.10.07, and yt-dlp has now removed support for it. As an unfortunate side effect, the official `yt-dlp.exe` and `yt-dlp_x86.exe` binaries are no longer supported on Windows 7. [Read more](https://github.com/yt-dlp/yt-dlp/issues/10086)"
-    },
-    {
-        "action": "change",
-        "when": "914af9a0cf51c9a3f74aa88d952bee8334c67511",
-        "short": "Expand paths in `--plugin-dirs` (#11334)",
-        "authors": ["bashonly"]
-    },
-    {
-        "action": "change",
-        "when": "c29f5a7fae93a08f3cfbb6127b2faa75145b06a0",
-        "short": "[ie/generic] Do not impersonate by default (#11336)",
-        "authors": ["bashonly"]
-    },
-    {
-        "action": "change",
-        "when": "57212a5f97ce367590aaa5c3e9a135eead8f81f7",
-        "short": "[ie/vimeo] Fix API retries (#11351)",
-        "authors": ["bashonly"]
-    },
-    {
-        "action": "add",
-        "when": "52c0ffe40ad6e8404d93296f575007b05b04c686",
-        "short": "[priority] **Login with OAuth is no longer supported for YouTube**\nDue to a change made by the site, yt-dlp is no longer able to support OAuth login for YouTube. [Read more](https://github.com/yt-dlp/yt-dlp/issues/11462#issuecomment-2471703090)"
-    },
-    {
-        "action": "change",
-        "when": "76ac023ff02f06e8c003d104f02a03deeddebdcd",
-        "short": "[ie/youtube:tab] Improve shorts title extraction (#11997)",
-        "authors": ["bashonly", "d3d9"]
-    },
-    {
-        "action": "add",
-        "when": "88eb1e7a9a2720ac89d653c0d0e40292388823bb",
-        "short": "[priority] **New option `--preset-alias`/`-t` has been added**\nThis provides convenient predefined aliases for common use cases. Available presets include `mp4`, `mp3`, `mkv`, `aac`, and `sleep`. See [the README](https://github.com/yt-dlp/yt-dlp/blob/master/README.md#preset-aliases) for more details."
-    },
-    {
-        "action": "remove",
-        "when": "d596824c2f8428362c072518856065070616e348"
-    },
-    {
-        "action": "remove",
-        "when": "7b81634fb1d15999757e7a9883daa6ef09ea785b"
-    },
-    {
-        "action": "remove",
-        "when": "500761e41acb96953a5064e951d41d190c287e46"
     }
 ]

devscripts/cli_to_api.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 # Allow direct execution
 import os
 import sys

devscripts/generate_aes_testdata.py

@@ -11,12 +11,13 @@ import codecs
 import subprocess
 
 from yt_dlp.aes import aes_encrypt, key_expansion
+from yt_dlp.utils import intlist_to_bytes
 
 secret_msg = b'Secret message goes here'
 
 
 def hex_str(int_list):
-    return codecs.encode(bytes(int_list), 'hex')
+    return codecs.encode(intlist_to_bytes(int_list), 'hex')
 
 
 def openssl_encode(algo, key, iv):

devscripts/install_deps.py

@@ -10,8 +10,6 @@ import argparse
 import re
 import subprocess
 
-from pathlib import Path
-
 from devscripts.tomlparse import parse_toml
 from devscripts.utils import read_file
 
@@ -19,50 +17,44 @@ from devscripts.utils import read_file
 def parse_args():
     parser = argparse.ArgumentParser(description='Install dependencies for yt-dlp')
     parser.add_argument(
-        'input', nargs='?', metavar='TOMLFILE', default=Path(__file__).parent.parent / 'pyproject.toml',
-        help='input file (default: %(default)s)')
+        'input', nargs='?', metavar='TOMLFILE', default='pyproject.toml', help='Input file (default: %(default)s)')
     parser.add_argument(
-        '-e', '--exclude', metavar='DEPENDENCY', action='append',
-        help='exclude a dependency')
+        '-e', '--exclude', metavar='DEPENDENCY', action='append', help='Exclude a dependency')
     parser.add_argument(
-        '-i', '--include', metavar='GROUP', action='append',
-        help='include an optional dependency group')
+        '-i', '--include', metavar='GROUP', action='append', help='Include an optional dependency group')
     parser.add_argument(
-        '-o', '--only-optional', action='store_true',
-        help='only install optional dependencies')
+        '-o', '--only-optional', action='store_true', help='Only install optional dependencies')
     parser.add_argument(
-        '-p', '--print', action='store_true',
-        help='only print requirements to stdout')
+        '-p', '--print', action='store_true', help='Only print a requirements.txt to stdout')
     parser.add_argument(
-        '-u', '--user', action='store_true',
-        help='install with pip as --user')
+        '-u', '--user', action='store_true', help='Install with pip as --user')
     return parser.parse_args()
 
 
 def main():
     args = parse_args()
     project_table = parse_toml(read_file(args.input))['project']
-    recursive_pattern = re.compile(rf'{project_table["name"]}\[(?P<group_name>[\w-]+)\]')
     optional_groups = project_table['optional-dependencies']
     excludes = args.exclude or []
 
-    def yield_deps(group):
-        for dep in group:
-            if mobj := recursive_pattern.fullmatch(dep):
-                yield from optional_groups.get(mobj.group('group_name'), [])
-            else:
-                yield dep
-
-    targets = []
+    deps = []
     if not args.only_optional:  # `-o` should exclude 'dependencies' and the 'default' group
-        targets.extend(project_table['dependencies'])
+        deps.extend(project_table['dependencies'])
         if 'default' not in excludes:  # `--exclude default` should exclude entire 'default' group
-            targets.extend(yield_deps(optional_groups['default']))
+            deps.extend(optional_groups['default'])
+
+    def name(dependency):
+        return re.match(r'[\w-]+', dependency)[0].lower()
+
+    target_map = {name(dep): dep for dep in deps}
 
     for include in filter(None, map(optional_groups.get, args.include or [])):
-        targets.extend(yield_deps(include))
+        target_map.update(zip(map(name, include), include))
 
-    targets = [t for t in targets if re.match(r'[\w-]+', t).group(0).lower() not in excludes]
+    for exclude in map(name, excludes):
+        target_map.pop(exclude, None)
+
+    targets = list(target_map.values())
 
     if args.print:
         for target in targets:

devscripts/make_changelog.py

@@ -71,13 +71,14 @@ class CommitGroup(enum.Enum):
     def get(cls, value: str) -> tuple[CommitGroup | None, str | None]:
         group, _, subgroup = (group.strip().lower() for group in value.partition('/'))
 
-        if result := cls.group_lookup().get(group):
-            return result, subgroup or None
+        result = cls.group_lookup().get(group)
+        if not result:
+            if subgroup:
+                return None, value
+            subgroup = group
+            result = cls.subgroup_lookup().get(subgroup)
 
-        if subgroup:
-            return None, value
-
-        return cls.subgroup_lookup().get(group), group or None
+        return result, subgroup or None
 
 
 @dataclass
@@ -135,7 +136,8 @@ class Changelog:
                 first = False
                 yield '\n<details><summary><h3>Changelog</h3></summary>\n'
 
-            if group := groups[item]:
+            group = groups[item]
+            if group:
                 yield self.format_module(item.value, group)
 
         if self._collapsible:
@@ -221,10 +223,10 @@ class Changelog:
 
         return message if not sep else f'{message}{sep}{rest}'
 
-    def _format_message_link(self, message, commit_hash):
-        assert message or commit_hash, 'Improperly defined commit message or override'
-        message = message if message else commit_hash[:HASH_LENGTH]
-        return f'[{message}]({self.repo_url}/commit/{commit_hash})' if commit_hash else message
+    def _format_message_link(self, message, hash):
+        assert message or hash, 'Improperly defined commit message or override'
+        message = message if message else hash[:HASH_LENGTH]
+        return f'[{message}]({self.repo_url}/commit/{hash})' if hash else message
 
     def _format_issues(self, issues):
         return ', '.join(f'[#{issue}]({self.repo_url}/issues/{issue})' for issue in issues)
@@ -251,7 +253,7 @@ class CommitRange:
         ''', re.VERBOSE | re.DOTALL)
     EXTRACTOR_INDICATOR_RE = re.compile(r'(?:Fix|Add)\s+Extractors?', re.IGNORECASE)
     REVERT_RE = re.compile(r'(?:\[[^\]]+\]\s+)?(?i:Revert)\s+([\da-f]{40})')
-    FIXES_RE = re.compile(r'(?i:(?:bug\s*)?fix(?:es)?(?:\s+bugs?)?(?:\s+in|\s+for)?|Improve)\s+([\da-f]{40})')
+    FIXES_RE = re.compile(r'(?i:Fix(?:es)?(?:\s+bugs?)?(?:\s+in|\s+for)?|Revert|Improve)\s+([\da-f]{40})')
     UPSTREAM_MERGE_RE = re.compile(r'Update to ytdl-commit-([\da-f]+)')
 
     def __init__(self, start, end, default_author=None):
@@ -285,16 +287,11 @@ class CommitRange:
             short = next(lines)
             skip = short.startswith('Release ') or short == '[version] update'
 
-            fix_commitish = None
-            if match := self.FIXES_RE.search(short):
-                fix_commitish = match.group(1)
-
             authors = [default_author] if default_author else []
             for line in iter(lambda: next(lines), self.COMMIT_SEPARATOR):
-                if match := self.AUTHOR_INDICATOR_RE.match(line):
+                match = self.AUTHOR_INDICATOR_RE.match(line)
+                if match:
                     authors = sorted(map(str.strip, line[match.end():].split(',')), key=str.casefold)
-                if not fix_commitish and (match := self.FIXES_RE.fullmatch(line)):
-                    fix_commitish = match.group(1)
 
             commit = Commit(commit_hash, short, authors)
             if skip and (self._start or not i):
@@ -304,17 +301,21 @@ class CommitRange:
                 logger.debug(f'Reached Release commit, breaking: {commit}')
                 break
 
-            if match := self.REVERT_RE.fullmatch(commit.short):
-                reverts[match.group(1)] = commit
+            revert_match = self.REVERT_RE.fullmatch(commit.short)
+            if revert_match:
+                reverts[revert_match.group(1)] = commit
                 continue
 
-            if fix_commitish:
-                fixes[fix_commitish].append(commit)
+            fix_match = self.FIXES_RE.search(commit.short)
+            if fix_match:
+                commitish = fix_match.group(1)
+                fixes[commitish].append(commit)
 
             commits[commit.hash] = commit
 
         for commitish, revert_commit in reverts.items():
-            if reverted := commits.pop(commitish, None):
+            reverted = commits.pop(commitish, None)
+            if reverted:
                 logger.debug(f'{commitish} fully reverted {reverted}')
             else:
                 commits[revert_commit.hash] = revert_commit
@@ -355,7 +356,7 @@ class CommitRange:
                 logger.info(f'CHANGE {self._commits[commit.hash]} -> {commit}')
                 self._commits[commit.hash] = commit
 
-        self._commits = dict(reversed(self._commits.items()))
+        self._commits = {key: value for key, value in reversed(self._commits.items())}
 
     def groups(self):
         group_dict = defaultdict(list)
@@ -444,31 +445,7 @@ def get_new_contributors(contributors_path, commits):
     return sorted(new_contributors, key=str.casefold)
 
 
-def create_changelog(args):
-    logging.basicConfig(
-        datefmt='%Y-%m-%d %H-%M-%S', format='{asctime} | {levelname:<8} | {message}',
-        level=logging.WARNING - 10 * args.verbosity, style='{', stream=sys.stderr)
-
-    commits = CommitRange(None, args.commitish, args.default_author)
-
-    if not args.no_override:
-        if args.override_path.exists():
-            overrides = json.loads(read_file(args.override_path))
-            commits.apply_overrides(overrides)
-        else:
-            logger.warning(f'File {args.override_path.as_posix()} does not exist')
-
-    logger.info(f'Loaded {len(commits)} commits')
-
-    if new_contributors := get_new_contributors(args.contributors_path, commits):
-        if args.contributors:
-            write_file(args.contributors_path, '\n'.join(new_contributors) + '\n', mode='a')
-        logger.info(f'New contributors: {", ".join(new_contributors)}')
-
-    return Changelog(commits.groups(), args.repo, args.collapsible)
-
-
-def create_parser():
+if __name__ == '__main__':
     import argparse
 
     parser = argparse.ArgumentParser(
@@ -500,9 +477,27 @@ def create_parser():
     parser.add_argument(
         '--collapsible', action='store_true',
         help='make changelog collapsible (default: %(default)s)')
+    args = parser.parse_args()
 
-    return parser
+    logging.basicConfig(
+        datefmt='%Y-%m-%d %H-%M-%S', format='{asctime} | {levelname:<8} | {message}',
+        level=logging.WARNING - 10 * args.verbosity, style='{', stream=sys.stderr)
 
+    commits = CommitRange(None, args.commitish, args.default_author)
 
-if __name__ == '__main__':
-    print(create_changelog(create_parser().parse_args()))
+    if not args.no_override:
+        if args.override_path.exists():
+            overrides = json.loads(read_file(args.override_path))
+            commits.apply_overrides(overrides)
+        else:
+            logger.warning(f'File {args.override_path.as_posix()} does not exist')
+
+    logger.info(f'Loaded {len(commits)} commits')
+
+    new_contributors = get_new_contributors(args.contributors_path, commits)
+    if new_contributors:
+        if args.contributors:
+            write_file(args.contributors_path, '\n'.join(new_contributors) + '\n', mode='a')
+        logger.info(f'New contributors: {", ".join(new_contributors)}')
+
+    print(Changelog(commits.groups(), args.repo, args.collapsible))

devscripts/make_issue_template.py

@@ -11,13 +11,11 @@ import re
 
 from devscripts.utils import get_filename_args, read_file, write_file
 
-VERBOSE = '''
+VERBOSE_TMPL = '''
   - type: checkboxes
     id: verbose
     attributes:
       label: Provide verbose output that clearly demonstrates the problem
-      description: |
-        This is mandatory unless absolutely impossible to provide. If you are unable to provide the output, please explain why.
       options:
         - label: Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)
           required: true
@@ -34,15 +32,14 @@ VERBOSE = '''
       placeholder: |
         [debug] Command-line config: ['-vU', 'https://www.youtube.com/watch?v=BaW_jenozKc']
         [debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-        [debug] yt-dlp version nightly@... from yt-dlp/yt-dlp-nightly-builds [1a176d874] (win_exe)
-        [debug] Python 3.10.11 (CPython AMD64 64bit) - Windows-10-10.0.20348-SP0 (OpenSSL 1.1.1t  7 Feb 2023)
-        [debug] exe versions: ffmpeg 7.0.2 (setts), ffprobe 7.0.2
-        [debug] Optional libraries: Cryptodome-3.21.0, brotli-1.1.0, certifi-2024.08.30, curl_cffi-0.5.10, mutagen-1.47.0, requests-2.32.3, sqlite3-3.40.1, urllib3-2.2.3, websockets-13.1
+        [debug] yt-dlp version nightly@... from yt-dlp/yt-dlp [b634ba742] (win_exe)
+        [debug] Python 3.8.10 (CPython 64bit) - Windows-10-10.0.22000-SP0
+        [debug] exe versions: ffmpeg N-106550-g072101bd52-20220410 (fdk,setts), ffprobe N-106624-g391ce570c8-20220415, phantomjs 2.1.1
+        [debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3
         [debug] Proxy map: {}
-        [debug] Request Handlers: urllib, requests, websockets, curl_cffi
-        [debug] Loaded 1838 extractors
-        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-        Latest version: nightly@... from yt-dlp/yt-dlp-nightly-builds
+        [debug] Request Handlers: urllib, requests
+        [debug] Loaded 1893 extractors
+        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp-nightly-builds/releases/latest
         yt-dlp is up to date (nightly@... from yt-dlp/yt-dlp-nightly-builds)
         [youtube] Extracting URL: https://www.youtube.com/watch?v=BaW_jenozKc
         <more lines>
@@ -52,20 +49,20 @@ VERBOSE = '''
 '''.strip()
 
 NO_SKIP = '''
-  - type: markdown
+  - type: checkboxes
     attributes:
-      value: |
-        > [!IMPORTANT]
-        > Not providing the required (*) information or removing the template will result in your issue being closed and ignored.
+      label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
+      description: Fill all fields even if you think it is irrelevant for the issue
+      options:
+        - label: I understand that I will be **blocked** if I *intentionally* remove or skip any mandatory\\* field
+          required: true
 '''.strip()
 
 
 def main():
-    fields = {
-        'no_skip': NO_SKIP,
-        'verbose': VERBOSE,
-        'verbose_optional': re.sub(r'(\n\s+validations:)?\n\s+required: true', '', VERBOSE),
-    }
+    fields = {'no_skip': NO_SKIP}
+    fields['verbose'] = VERBOSE_TMPL % fields
+    fields['verbose_optional'] = re.sub(r'(\n\s+validations:)?\n\s+required: true', '', fields['verbose'])
 
     infile, outfile = get_filename_args(has_infile=True)
     write_file(outfile, read_file(infile) % fields)

devscripts/make_lazy_extractors.py

@@ -2,6 +2,7 @@
 
 # Allow direct execution
 import os
+import shutil
 import sys
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
@@ -10,9 +11,6 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 from inspect import getsource
 
 from devscripts.utils import get_filename_args, read_file, write_file
-from yt_dlp.extractor import import_extractors
-from yt_dlp.extractor.common import InfoExtractor, SearchInfoExtractor
-from yt_dlp.globals import extractors
 
 NO_ATTR = object()
 STATIC_CLASS_PROPERTIES = [
@@ -36,12 +34,17 @@ MODULE_TEMPLATE = read_file('devscripts/lazy_load_template.py')
 
 
 def main():
-    os.environ['YTDLP_NO_PLUGINS'] = 'true'
-    os.environ['YTDLP_NO_LAZY_EXTRACTORS'] = 'true'
-
     lazy_extractors_filename = get_filename_args(default_outfile='yt_dlp/extractor/lazy_extractors.py')
+    if os.path.exists(lazy_extractors_filename):
+        os.remove(lazy_extractors_filename)
 
-    import_extractors()
+    _ALL_CLASSES = get_all_ies()  # Must be before import
+
+    import yt_dlp.plugins
+    from yt_dlp.extractor.common import InfoExtractor, SearchInfoExtractor
+
+    # Filter out plugins
+    _ALL_CLASSES = [cls for cls in _ALL_CLASSES if not cls.__module__.startswith(f'{yt_dlp.plugins.PACKAGE_NAME}.')]
 
     DummyInfoExtractor = type('InfoExtractor', (InfoExtractor,), {'IE_NAME': NO_ATTR})
     module_src = '\n'.join((
@@ -49,12 +52,26 @@ def main():
         '    _module = None',
         *extra_ie_code(DummyInfoExtractor),
         '\nclass LazyLoadSearchExtractor(LazyLoadExtractor):\n    pass\n',
-        *build_ies(list(extractors.value.values()), (InfoExtractor, SearchInfoExtractor), DummyInfoExtractor),
+        *build_ies(_ALL_CLASSES, (InfoExtractor, SearchInfoExtractor), DummyInfoExtractor),
     ))
 
     write_file(lazy_extractors_filename, f'{module_src}\n')
 
 
+def get_all_ies():
+    PLUGINS_DIRNAME = 'ytdlp_plugins'
+    BLOCKED_DIRNAME = f'{PLUGINS_DIRNAME}_blocked'
+    if os.path.exists(PLUGINS_DIRNAME):
+        # os.rename cannot be used, e.g. in Docker. See https://github.com/yt-dlp/yt-dlp/pull/4958
+        shutil.move(PLUGINS_DIRNAME, BLOCKED_DIRNAME)
+    try:
+        from yt_dlp.extractor.extractors import _ALL_CLASSES
+    finally:
+        if os.path.exists(BLOCKED_DIRNAME):
+            shutil.move(BLOCKED_DIRNAME, PLUGINS_DIRNAME)
+    return _ALL_CLASSES
+
+
 def extra_ie_code(ie, base=None):
     for var in STATIC_CLASS_PROPERTIES:
         val = getattr(ie, var)
@@ -75,7 +92,7 @@ def build_ies(ies, bases, attr_base):
         if ie in ies:
             names.append(ie.__name__)
 
-    yield '\n_CLASS_LOOKUP = {%s}' % ', '.join(f'{name!r}: {name}' for name in names)
+    yield f'\n_ALL_CLASSES = [{", ".join(names)}]'
 
 
 def sort_ies(ies, ignored_bases):

devscripts/make_readme.py

@@ -51,7 +51,7 @@ PATCHES = (
     ),
     (   # Headings
         r'(?m)^  (\w.+\n)(    (?=\w))?',
-        r'## \1',
+        r'## \1'
     ),
     (   # Fixup `--date` formatting
         rf'(?m)(    --date DATE.+({delim}[^\[]+)*)\[.+({delim}.+)*$',
@@ -61,26 +61,26 @@ PATCHES = (
     ),
     (   # Do not split URLs
         rf'({delim[:-1]})? (?P<label>\[\S+\] )?(?P<url>https?({delim})?:({delim})?/({delim})?/(({delim})?\S+)+)\s',
-        lambda mobj: ''.join((delim, mobj.group('label') or '', re.sub(r'\s+', '', mobj.group('url')), '\n')),
+        lambda mobj: ''.join((delim, mobj.group('label') or '', re.sub(r'\s+', '', mobj.group('url')), '\n'))
     ),
     (   # Do not split "words"
         rf'(?m)({delim}\S+)+$',
-        lambda mobj: ''.join((delim, mobj.group(0).replace(delim, ''))),
+        lambda mobj: ''.join((delim, mobj.group(0).replace(delim, '')))
     ),
     (   # Allow overshooting last line
         rf'(?m)^(?P<prev>.+)${delim}(?P<current>.+)$(?!{delim})',
         lambda mobj: (mobj.group().replace(delim, ' ')
                       if len(mobj.group()) - len(delim) + 1 <= max_width + ALLOWED_OVERSHOOT
-                      else mobj.group()),
+                      else mobj.group())
     ),
     (   # Avoid newline when a space is available b/w switch and description
         DISABLE_PATCH,  # This creates issues with prepare_manpage
         r'(?m)^(\s{4}-.{%d})(%s)' % (switch_col_width - 6, delim),
-        r'\1 ',
+        r'\1 '
     ),
     (   # Replace brackets with a Markdown link
         r'SponsorBlock API \((http.+)\)',
-        r'[SponsorBlock API](\1)',
+        r'[SponsorBlock API](\1)'
     ),
 )
 

devscripts/make_supportedsites.py

@@ -10,21 +10,10 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 from devscripts.utils import get_filename_args, write_file
 from yt_dlp.extractor import list_extractor_classes
 
-TEMPLATE = '''\
-# Supported sites
-
-Below is a list of all extractors that are currently included with yt-dlp.
-If a site is not listed here, it might still be supported by yt-dlp's embed extraction or generic extractor.
-Not all sites listed here are guaranteed to work; websites are constantly changing and sometimes this breaks yt-dlp's support for them.
-The only reliable way to check if a site is supported is to try it.
-
-{ie_list}
-'''
-
 
 def main():
     out = '\n'.join(ie.description() for ie in list_extractor_classes() if ie.IE_DESC is not False)
-    write_file(get_filename_args(), TEMPLATE.format(ie_list=out))
+    write_file(get_filename_args(), f'# Supported sites\n{out}\n')
 
 
 if __name__ == '__main__':

devscripts/prepare_manpage.py

@@ -24,7 +24,7 @@ PREFIX = r'''%yt-dlp(1)
 
 # NAME
 
-yt\-dlp \- A feature\-rich command\-line audio/video downloader
+yt\-dlp \- A youtube-dl fork with additional features and patches
 
 # SYNOPSIS
 
@@ -43,27 +43,6 @@ def filter_excluded_sections(readme):
         '', readme)
 
 
-def _convert_code_blocks(readme):
-    current_code_block = None
-
-    for line in readme.splitlines(True):
-        if current_code_block:
-            if line == current_code_block:
-                current_code_block = None
-                yield '\n'
-            else:
-                yield f'    {line}'
-        elif line.startswith('```'):
-            current_code_block = line.count('`') * '`' + '\n'
-            yield '\n'
-        else:
-            yield line
-
-
-def convert_code_blocks(readme):
-    return ''.join(_convert_code_blocks(readme))
-
-
 def move_sections(readme):
     MOVE_TAG_TEMPLATE = '<!-- MANPAGE: MOVE "%s" SECTION HERE -->'
     sections = re.findall(r'(?m)^%s$' % (
@@ -86,10 +65,8 @@ def move_sections(readme):
 
 def filter_options(readme):
     section = re.search(r'(?sm)^# USAGE AND OPTIONS\n.+?(?=^# )', readme).group(0)
-    section_new = section.replace('*', R'\*')
-
     options = '# OPTIONS\n'
-    for line in section_new.split('\n')[1:]:
+    for line in section.split('\n')[1:]:
         mobj = re.fullmatch(r'''(?x)
                 \s{4}(?P<opt>-(?:,\s|[^\s])+)
                 (?:\s(?P<meta>(?:[^\s]|\s(?!\s))+))?
@@ -109,7 +86,7 @@ def filter_options(readme):
     return readme.replace(section, options, 1)
 
 
-TRANSFORM = compose_functions(filter_excluded_sections, convert_code_blocks, move_sections, filter_options)
+TRANSFORM = compose_functions(filter_excluded_sections, move_sections, filter_options)
 
 
 def main():

devscripts/run_tests.bat

@@ -0,0 +1,4 @@
+@echo off
+
+>&2 echo run_tests.bat is deprecated. Please use `devscripts/run_tests.py` instead
+python %~dp0run_tests.py %~1

devscripts/run_tests.py

@@ -4,7 +4,6 @@ import argparse
 import functools
 import os
 import re
-import shlex
 import subprocess
 import sys
 from pathlib import Path
@@ -16,34 +15,29 @@ fix_test_name = functools.partial(re.compile(r'IE(_all|_\d+)?$').sub, r'\1')
 def parse_args():
     parser = argparse.ArgumentParser(description='Run selected yt-dlp tests')
     parser.add_argument(
-        'test', help='an extractor test, test path, or one of "core" or "download"', nargs='*')
+        'test', help='a extractor tests, or one of "core" or "download"', nargs='*')
     parser.add_argument(
         '-k', help='run a test matching EXPRESSION. Same as "pytest -k"', metavar='EXPRESSION')
-    parser.add_argument(
-        '--pytest-args', help='arguments to passthrough to pytest')
     return parser.parse_args()
 
 
 def run_tests(*tests, pattern=None, ci=False):
-    # XXX: hatch uses `tests` if no arguments are passed
-    run_core = 'core' in tests or 'tests' in tests or (not pattern and not tests)
+    run_core = 'core' in tests or (not pattern and not tests)
     run_download = 'download' in tests
+    tests = list(map(fix_test_name, tests))
 
-    pytest_args = args.pytest_args or os.getenv('HATCH_TEST_ARGS', '')
-    arguments = ['pytest', '-Werror', '--tb=short', *shlex.split(pytest_args)]
+    arguments = ['pytest', '-Werror', '--tb=short']
     if ci:
         arguments.append('--color=yes')
-    if pattern:
-        arguments.extend(['-k', pattern])
     if run_core:
         arguments.extend(['-m', 'not download'])
     elif run_download:
         arguments.extend(['-m', 'download'])
+    elif pattern:
+        arguments.extend(['-k', pattern])
     else:
         arguments.extend(
-            test if '/' in test
-            else f'test/test_download.py::TestDownload::test_{fix_test_name(test)}'
-            for test in tests)
+            f'test/test_download.py::TestDownload::test_{test}' for test in tests)
 
     print(f'Running {arguments}', flush=True)
     try:
@@ -52,13 +46,13 @@ def run_tests(*tests, pattern=None, ci=False):
         pass
 
     arguments = [sys.executable, '-Werror', '-m', 'unittest']
-    if pattern:
-        arguments.extend(['-k', pattern])
     if run_core:
         print('"pytest" needs to be installed to run core tests', file=sys.stderr, flush=True)
         return 1
     elif run_download:
         arguments.append('test.test_download')
+    elif pattern:
+        arguments.extend(['-k', pattern])
     else:
         arguments.extend(
             f'test.test_download.TestDownload.test_{test}' for test in tests)

devscripts/run_tests.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+
+>&2 echo 'run_tests.sh is deprecated. Please use `devscripts/run_tests.py` instead'
+python3 devscripts/run_tests.py "$1"

devscripts/set-variant.py

@@ -30,7 +30,7 @@ def property_setter(name, value):
 opts = parse_options()
 transform = compose_functions(
     property_setter('VARIANT', opts.variant),
-    property_setter('UPDATE_HINT', opts.update_message),
+    property_setter('UPDATE_HINT', opts.update_message)
 )
 
 write_file(VERSION_FILE, transform(read_file(VERSION_FILE)))

devscripts/tomlparse.py

@@ -11,7 +11,7 @@ IMPORTANT: INVALID FILES OR MULTILINE STRINGS ARE NOT SUPPORTED!
 
 from __future__ import annotations
 
-import datetime as dt
+import datetime
 import json
 import re
 
@@ -115,9 +115,9 @@ def parse_value(data: str, index: int):
     for func in [
         int,
         float,
-        dt.time.fromisoformat,
-        dt.date.fromisoformat,
-        dt.datetime.fromisoformat,
+        datetime.time.fromisoformat,
+        datetime.date.fromisoformat,
+        datetime.datetime.fromisoformat,
         {'true': True, 'false': False}.get,
     ]:
         try:
@@ -179,7 +179,7 @@ def main():
         data = file.read()
 
     def default(obj):
-        if isinstance(obj, (dt.date, dt.time, dt.datetime)):
+        if isinstance(obj, (datetime.date, datetime.time, datetime.datetime)):
             return obj.isoformat()
 
     print(json.dumps(parse_toml(data), default=default))

devscripts/update-version.py

@@ -9,22 +9,22 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 import argparse
 import contextlib
-import datetime as dt
 import sys
+from datetime import datetime, timezone
 
 from devscripts.utils import read_version, run_process, write_file
 
 
 def get_new_version(version, revision):
     if not version:
-        version = dt.datetime.now(dt.timezone.utc).strftime('%Y.%m.%d')
+        version = datetime.now(timezone.utc).strftime('%Y.%m.%d')
 
     if revision:
         assert revision.isdecimal(), 'Revision must be a number'
     else:
         old_version = read_version().split('.')
         if version.split('.') == old_version[:3]:
-            revision = str(int(([*old_version, 0])[3]) + 1)
+            revision = str(int((old_version + [0])[3]) + 1)
 
     return f'{version}.{revision}' if revision else version
 

devscripts/update_changelog.py

@@ -1,26 +0,0 @@
-#!/usr/bin/env python3
-
-# Allow direct execution
-import os
-import sys
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-from pathlib import Path
-
-from devscripts.make_changelog import create_changelog, create_parser
-from devscripts.utils import read_file, read_version, write_file
-
-# Always run after devscripts/update-version.py, and run before `make doc|pypi-files|tar|all`
-
-if __name__ == '__main__':
-    parser = create_parser()
-    parser.description = 'Update an existing changelog file with an entry for a new release'
-    parser.add_argument(
-        '--changelog-path', type=Path, default=Path(__file__).parent.parent / 'Changelog.md',
-        help='path to the Changelog file')
-    args = parser.parse_args()
-    new_entry = create_changelog(args)
-
-    header, sep, changelog = read_file(args.changelog_path).partition('\n### ')
-    write_file(args.changelog_path, f'{header}{sep}{read_version()}\n{new_entry}\n{sep}{changelog}')

devscripts/zsh-completion.py

@@ -9,15 +9,15 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 import yt_dlp
 
-ZSH_COMPLETION_FILE = 'completions/zsh/_yt-dlp'
-ZSH_COMPLETION_TEMPLATE = 'devscripts/zsh-completion.in'
+ZSH_COMPLETION_FILE = "completions/zsh/_yt-dlp"
+ZSH_COMPLETION_TEMPLATE = "devscripts/zsh-completion.in"
 
 
 def build_completion(opt_parser):
     opts = [opt for group in opt_parser.option_groups
             for opt in group.option_list]
-    opts_file = [opt for opt in opts if opt.metavar == 'FILE']
-    opts_dir = [opt for opt in opts if opt.metavar == 'DIR']
+    opts_file = [opt for opt in opts if opt.metavar == "FILE"]
+    opts_dir = [opt for opt in opts if opt.metavar == "DIR"]
 
     fileopts = []
     for opt in opts_file:
@@ -38,11 +38,11 @@ def build_completion(opt_parser):
     with open(ZSH_COMPLETION_TEMPLATE) as f:
         template = f.read()
 
-    template = template.replace('{{fileopts}}', '|'.join(fileopts))
-    template = template.replace('{{diropts}}', '|'.join(diropts))
-    template = template.replace('{{flags}}', ' '.join(flags))
+    template = template.replace("{{fileopts}}", "|".join(fileopts))
+    template = template.replace("{{diropts}}", "|".join(diropts))
+    template = template.replace("{{flags}}", " ".join(flags))
 
-    with open(ZSH_COMPLETION_FILE, 'w') as f:
+    with open(ZSH_COMPLETION_FILE, "w") as f:
         f.write(template)
 
 

pyinst.py

@@ -0,0 +1,17 @@
+#!/usr/bin/env python3
+
+# Allow execution from anywhere
+import os
+import sys
+
+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
+
+import warnings
+
+from bundle.pyinstaller import main
+
+warnings.warn(DeprecationWarning('`pyinst.py` is deprecated and will be removed in a future version. '
+                                 'Use `bundle.pyinstaller` instead'))
+
+if __name__ == '__main__':
+    main()

pyproject.toml

@@ -9,11 +9,10 @@ maintainers = [
     {name = "Grub4K", email = "contact@grub4k.xyz"},
     {name = "bashonly", email = "bashonly@protonmail.com"},
     {name = "coletdjnz", email = "coletdjnz@protonmail.com"},
-    {name = "sepro", email = "sepro@sepr0.com"},
 ]
-description = "A feature-rich command-line audio/video downloader"
+description = "A youtube-dl fork with additional features and patches"
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.8"
 keywords = [
     "youtube-dl",
     "video-downloader",
@@ -29,11 +28,11 @@ classifiers = [
     "Environment :: Console",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
-    "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: Implementation",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
@@ -41,22 +40,19 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 dynamic = ["version"]
-dependencies = []
-
-[project.optional-dependencies]
-default = [
+dependencies = [
     "brotli; implementation_name=='cpython'",
     "brotlicffi; implementation_name!='cpython'",
     "certifi",
     "mutagen",
     "pycryptodomex",
-    "requests>=2.32.2,<3",
+    "requests>=2.31.0,<3",
     "urllib3>=1.26.17,<3",
-    "websockets>=13.0",
-]
-curl-cffi = [
-    "curl-cffi>=0.5.10,!=0.6.*,!=0.7.*,!=0.8.*,!=0.9.*,<0.11; implementation_name=='cpython'",
+    "websockets>=12.0",
 ]
+
+[project.optional-dependencies]
+default = []
 secretstorage = [
     "cffi",
     "secretstorage",
@@ -65,25 +61,15 @@ build = [
     "build",
     "hatchling",
     "pip",
-    "setuptools>=71.0.2,<81",  # See https://github.com/pyinstaller/pyinstaller/issues/9149
     "wheel",
 ]
 dev = [
-    "pre-commit",
-    "yt-dlp[static-analysis]",
-    "yt-dlp[test]",
-]
-static-analysis = [
-    "autopep8~=2.0",
-    "ruff~=0.12.0",
-]
-test = [
-    "pytest~=8.1",
-    "pytest-rerunfailures~=14.0",
-]
-pyinstaller = [
-    "pyinstaller>=6.13.0",  # Windows temp cleanup fixed in 6.13.0
+    "flake8",
+    "isort",
+    "pytest",
 ]
+pyinstaller = ["pyinstaller>=6.3"]
+py2exe = ["py2exe>=0.12"]
 
 [project.urls]
 Documentation = "https://github.com/yt-dlp/yt-dlp#readme"
@@ -132,267 +118,3 @@ artifacts = ["/yt_dlp/extractor/lazy_extractors.py"]
 [tool.hatch.version]
 path = "yt_dlp/version.py"
 pattern = "_pkg_version = '(?P<version>[^']+)'"
-
-[tool.hatch.envs.default]
-features = ["curl-cffi", "default"]
-dependencies = ["pre-commit"]
-path = ".venv"
-installer = "uv"
-
-[tool.hatch.envs.default.scripts]
-setup = "pre-commit install --config .pre-commit-hatch.yaml"
-yt-dlp = "python -Werror -Xdev -m yt_dlp {args}"
-
-[tool.hatch.envs.hatch-static-analysis]
-detached = true
-features = ["static-analysis"]
-dependencies = []  # override hatch ruff version
-config-path = "pyproject.toml"
-
-[tool.hatch.envs.hatch-static-analysis.scripts]
-format-check = "autopep8 --diff {args:.}"
-format-fix = "autopep8 --in-place {args:.}"
-lint-check = "ruff check {args:.}"
-lint-fix = "ruff check --fix {args:.}"
-
-[tool.hatch.envs.hatch-test]
-features = ["test"]
-dependencies = [
-    "pytest-randomly~=3.15",
-    "pytest-xdist[psutil]~=3.5",
-]
-
-[tool.hatch.envs.hatch-test.scripts]
-run = "python -m devscripts.run_tests {args}"
-run-cov = "echo Code coverage not implemented && exit 1"
-
-[[tool.hatch.envs.hatch-test.matrix]]
-python = [
-    "3.9",
-    "3.10",
-    "3.11",
-    "3.12",
-    "3.13",
-    "pypy3.10",
-]
-
-[tool.ruff]
-line-length = 120
-
-[tool.ruff.lint]
-ignore = [
-    "E402",    # module-import-not-at-top-of-file
-    "E501",    # line-too-long
-    "E731",    # lambda-assignment
-    "E741",    # ambiguous-variable-name
-    "UP031",   # printf-string-formatting
-    "UP036",   # outdated-version-block
-    "B006",    # mutable-argument-default
-    "B008",    # function-call-in-default-argument
-    "B011",    # assert-false
-    "B017",    # assert-raises-exception
-    "B023",    # function-uses-loop-variable (false positives)
-    "B028",    # no-explicit-stacklevel
-    "B904",    # raise-without-from-inside-except
-    "A005",    # stdlib-module-shadowing
-    "C401",    # unnecessary-generator-set
-    "C402",    # unnecessary-generator-dict
-    "PIE790",  # unnecessary-placeholder
-    "SIM102",  # collapsible-if
-    "SIM108",  # if-else-block-instead-of-if-exp
-    "SIM112",  # uncapitalized-environment-variables
-    "SIM113",  # enumerate-for-loop
-    "SIM114",  # if-with-same-arms
-    "SIM115",  # open-file-with-context-handler
-    "SIM117",  # multiple-with-statements
-    "SIM223",  # expr-and-false
-    "SIM300",  # yoda-conditions
-    "TD001",   # invalid-todo-tag
-    "TD002",   # missing-todo-author
-    "TD003",   # missing-todo-link
-    "PLC0415", # import-outside-top-level
-    "PLE0604", # invalid-all-object (false positives)
-    "PLE0643", # potential-index-error (false positives)
-    "PLW0603", # global-statement
-    "PLW1510", # subprocess-run-without-check
-    "PLW1641", # eq-without-hash
-    "PLW2901", # redefined-loop-name
-    "RUF001",  # ambiguous-unicode-character-string
-    "RUF012",  # mutable-class-default
-    "RUF100",  # unused-noqa (flake8 has slightly different behavior)
-]
-select = [
-    "E",      # pycodestyle Error
-    "W",      # pycodestyle Warning
-    "F",      # Pyflakes
-    "I",      # isort
-    "Q",      # flake8-quotes
-    "N803",   # invalid-argument-name
-    "N804",   # invalid-first-argument-name-for-class-method
-    "UP",     # pyupgrade
-    "B",      # flake8-bugbear
-    "A",      # flake8-builtins
-    "COM",    # flake8-commas
-    "C4",     # flake8-comprehensions
-    "FA",     # flake8-future-annotations
-    "ISC",    # flake8-implicit-str-concat
-    "ICN003", # banned-import-from
-    "PIE",    # flake8-pie
-    "T20",    # flake8-print
-    "RSE",    # flake8-raise
-    "RET504", # unnecessary-assign
-    "SIM",    # flake8-simplify
-    "TID251", # banned-api
-    "TD",     # flake8-todos
-    "PLC",    # Pylint Convention
-    "PLE",    # Pylint Error
-    "PLW",    # Pylint Warning
-    "RUF",    # Ruff-specific rules
-]
-
-[tool.ruff.lint.per-file-ignores]
-"devscripts/lazy_load_template.py" = [
-    "F401",   # unused-import
-]
-"!yt_dlp/extractor/**.py" = [
-    "I",      # isort
-    "ICN003", # banned-import-from
-    "T20",    # flake8-print
-    "A002",   # builtin-argument-shadowing
-    "C408",   # unnecessary-collection-call
-]
-
-[tool.ruff.lint.isort]
-known-first-party = [
-    "bundle",
-    "devscripts",
-    "test",
-]
-relative-imports-order = "closest-to-furthest"
-
-[tool.ruff.lint.flake8-quotes]
-docstring-quotes = "double"
-multiline-quotes = "single"
-inline-quotes = "single"
-avoid-escape = false
-
-[tool.ruff.lint.pep8-naming]
-classmethod-decorators = [
-    "yt_dlp.utils.classproperty",
-]
-
-[tool.ruff.lint.flake8-import-conventions]
-banned-from = [
-    "base64",
-    "datetime",
-    "functools",
-    "glob",
-    "hashlib",
-    "itertools",
-    "json",
-    "math",
-    "os",
-    "pathlib",
-    "random",
-    "re",
-    "string",
-    "sys",
-    "time",
-    "urllib.parse",
-    "uuid",
-    "xml",
-]
-
-[tool.ruff.lint.flake8-tidy-imports.banned-api]
-"yt_dlp.compat.compat_str".msg = "Use `str` instead."
-"yt_dlp.compat.compat_b64decode".msg = "Use `base64.b64decode` instead."
-"yt_dlp.compat.compat_urlparse".msg = "Use `urllib.parse` instead."
-"yt_dlp.compat.compat_parse_qs".msg = "Use `urllib.parse.parse_qs` instead."
-"yt_dlp.compat.compat_urllib_parse_unquote".msg = "Use `urllib.parse.unquote` instead."
-"yt_dlp.compat.compat_urllib_parse_urlencode".msg = "Use `urllib.parse.urlencode` instead."
-"yt_dlp.compat.compat_urllib_parse_urlparse".msg = "Use `urllib.parse.urlparse` instead."
-"yt_dlp.compat.compat_shlex_quote".msg = "Use `yt_dlp.utils.shell_quote` instead."
-"yt_dlp.utils.error_to_compat_str".msg = "Use `str` instead."
-"yt_dlp.utils.bytes_to_intlist".msg = "Use `list` instead."
-"yt_dlp.utils.intlist_to_bytes".msg = "Use `bytes` instead."
-"yt_dlp.utils.decodeArgument".msg = "Do not use"
-"yt_dlp.utils.decodeFilename".msg = "Do not use"
-"yt_dlp.utils.encodeFilename".msg = "Do not use"
-"yt_dlp.compat.compat_os_name".msg = "Use `os.name` instead."
-"yt_dlp.compat.compat_realpath".msg = "Use `os.path.realpath` instead."
-"yt_dlp.compat.functools".msg = "Use `functools` instead."
-"yt_dlp.utils.decodeOption".msg = "Do not use"
-"yt_dlp.utils.compiled_regex_type".msg = "Use `re.Pattern` instead."
-
-[tool.autopep8]
-max_line_length = 120
-recursive = true
-exit-code = true
-jobs = 0
-select = [
-    "E101",
-    "E112",
-    "E113",
-    "E115",
-    "E116",
-    "E117",
-    "E121",
-    "E122",
-    "E123",
-    "E124",
-    "E125",
-    "E126",
-    "E127",
-    "E128",
-    "E129",
-    "E131",
-    "E201",
-    "E202",
-    "E203",
-    "E211",
-    "E221",
-    "E222",
-    "E223",
-    "E224",
-    "E225",
-    "E226",
-    "E227",
-    "E228",
-    "E231",
-    "E241",
-    "E242",
-    "E251",
-    "E252",
-    "E261",
-    "E262",
-    "E265",
-    "E266",
-    "E271",
-    "E272",
-    "E273",
-    "E274",
-    "E275",
-    "E301",
-    "E302",
-    "E303",
-    "E304",
-    "E305",
-    "E306",
-    "E502",
-    "E701",
-    "E702",
-    "E704",
-    "W391",
-    "W504",
-]
-exclude = "*/extractor/lazy_extractors.py,*venv*,*/test/testdata/sigs/player-*.js,.idea,.vscode"
-
-[tool.pytest.ini_options]
-addopts = [
-    "-ra",  # summary: all except passed
-    "--verbose",
-    "--strict-markers",
-]
-markers = [
-    "download",
-]

setup.cfg

@@ -14,9 +14,15 @@ remove-duplicate-keys = true
 remove-unused-variables = true
 
 
+[tool:pytest]
+addopts = -ra -v --strict-markers
+markers =
+    download
+
+
 [tox:tox]
 skipsdist = true
-envlist = py{39,310,311,312,313},pypy310
+envlist = py{38,39,310,311,312},pypy{38,39,310}
 skip_missing_interpreters = true
 
 [testenv]  # tox
@@ -29,7 +35,7 @@ setenv =
 
 
 [isort]
-py_version = 39
+py_version = 38
 multi_line_output = VERTICAL_HANGING_INDENT
 line_length = 80
 reverse_relative = true

setup.py

@@ -0,0 +1,36 @@
+#!/usr/bin/env python3
+
+# Allow execution from anywhere
+import os
+import sys
+
+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
+
+import warnings
+
+
+if sys.argv[1:2] == ['py2exe']:
+    warnings.warn(DeprecationWarning('`setup.py py2exe` is deprecated and will be removed in a future version. '
+                                     'Use `bundle.py2exe` instead'))
+
+    import bundle.py2exe
+
+    bundle.py2exe.main()
+
+elif 'build_lazy_extractors' in sys.argv:
+    warnings.warn(DeprecationWarning('`setup.py build_lazy_extractors` is deprecated and will be removed in a future version. '
+                                     'Use `devscripts.make_lazy_extractors` instead'))
+
+    import subprocess
+
+    os.chdir(sys.path[0])
+    print('running build_lazy_extractors')
+    subprocess.run([sys.executable, 'devscripts/make_lazy_extractors.py'])
+
+else:
+
+    print(
+        'ERROR: Building by calling `setup.py` is deprecated. '
+        'Use a build frontend like `build` instead. ',
+        'Refer to  https://build.pypa.io  for more info', file=sys.stderr)
+    sys.exit(1)

supportedsites.md

@@ -1,15 +1,6 @@
 # Supported sites
-
-Below is a list of all extractors that are currently included with yt-dlp.
-If a site is not listed here, it might still be supported by yt-dlp's embed extraction or generic extractor.
-Not all sites listed here are guaranteed to work; websites are constantly changing and sometimes this breaks yt-dlp's support for them.
-The only reliable way to check if a site is supported is to try it.
-
- - **10play**: [*10play*](## "netrc machine")
- - **10play:season**
  - **17live**
  - **17live:clip**
- - **17live:vod**
  - **1News**: 1news.co.nz article videos
  - **1tv**: Первый канал
  - **20min**
@@ -23,6 +14,7 @@ The only reliable way to check if a site is supported is to try it.
  - **6play**
  - **7plus**
  - **8tracks**
+ - **91porn**
  - **9c9media**
  - **9gag**: 9GAG
  - **9News**
@@ -54,6 +46,9 @@ The only reliable way to check if a site is supported is to try it.
  - **aenetworks:collection**
  - **aenetworks:show**
  - **AeonCo**
+ - **afreecatv**: [*afreecatv*](## "netrc machine") afreecatv.com
+ - **afreecatv:live**: [*afreecatv*](## "netrc machine") afreecatv.com
+ - **afreecatv:user**
  - **AirTV**
  - **AitubeKZVideo**
  - **AliExpressLive**
@@ -110,7 +105,6 @@ The only reliable way to check if a site is supported is to try it.
  - **ArteTVPlaylist**
  - **asobichannel**: ASOBI CHANNEL
  - **asobichannel:tag**: ASOBI CHANNEL
- - **AsobiStage**: ASOBISTAGE (アソビステージ)
  - **AtresPlayer**: [*atresplayer*](## "netrc machine")
  - **AtScaleConfEvent**
  - **ATVAt**
@@ -138,8 +132,6 @@ The only reliable way to check if a site is supported is to try it.
  - **Bandcamp:album**
  - **Bandcamp:user**
  - **Bandcamp:weekly**
- - **Bandlab**
- - **BandlabPlaylist**
  - **BannedVideo**
  - **bbc**: [*bbc*](## "netrc machine") BBC
  - **bbc.co.uk**: [*bbc*](## "netrc machine") BBC iPlayer
@@ -150,7 +142,6 @@ The only reliable way to check if a site is supported is to try it.
  - **BBVTV**: [*bbvtv*](## "netrc machine")
  - **BBVTVLive**: [*bbvtv*](## "netrc machine")
  - **BBVTVRecordings**: [*bbvtv*](## "netrc machine")
- - **BeaconTv**
  - **BeatBumpPlaylist**
  - **BeatBumpVideo**
  - **Beatport**
@@ -180,7 +171,6 @@ The only reliable way to check if a site is supported is to try it.
  - **BilibiliCheese**
  - **BilibiliCheeseSeason**
  - **BilibiliCollectionList**
- - **BiliBiliDynamic**
  - **BilibiliFavoritesList**
  - **BiliBiliPlayer**
  - **BilibiliPlaylist**
@@ -202,8 +192,7 @@ The only reliable way to check if a site is supported is to try it.
  - **blerp**
  - **blogger.com**
  - **Bloomberg**
- - **Bluesky**
- - **BokeCC**: CC视频
+ - **BokeCC**
  - **BongaCams**
  - **Boosty**
  - **BostonGlobe**
@@ -227,11 +216,10 @@ The only reliable way to check if a site is supported is to try it.
  - **bt:vestlendingen**: Bergens Tidende - Vestlendingen
  - **Bundesliga**
  - **Bundestag**
- - **BunnyCdn**
  - **BusinessInsider**
  - **BuzzFeed**
  - **BYUtv**: (**Currently broken**)
- - **CaffeineTV**
+ - **CableAV**
  - **Callin**
  - **Caltrans**
  - **CAM4**
@@ -246,8 +234,8 @@ The only reliable way to check if a site is supported is to try it.
  - **CanalAlpha**
  - **canalc2.tv**
  - **Canalplus**: mycanal.fr and piwiplus.fr
- - **Canalsurmas**
  - **CaracolTvPlay**: [*caracoltv-play*](## "netrc machine")
+ - **CartoonNetwork**
  - **cbc.ca**
  - **cbc.ca:player**
  - **cbc.ca:​player:playlist**
@@ -261,10 +249,9 @@ The only reliable way to check if a site is supported is to try it.
  - **cbsnews:livevideo**: CBS News Live Videos
  - **cbssports**: (**Currently broken**)
  - **cbssports:embed**: (**Currently broken**)
- - **CCMA**: 3Cat, TV3 and Catalunya Ràdio
+ - **CCMA**
  - **CCTV**: 央视网
  - **CDA**: [*cdapl*](## "netrc machine")
- - **CDAFolder**
  - **Cellebrite**
  - **CeskaTelevize**
  - **CGTN**
@@ -294,10 +281,12 @@ The only reliable way to check if a site is supported is to try it.
  - **cmt.com**: (**Currently broken**)
  - **CNBCVideo**
  - **CNN**
+ - **CNNArticle**
+ - **CNNBlogs**
  - **CNNIndonesia**
  - **ComedyCentral**
  - **ComedyCentralTV**
- - **ConanClassic**: (**Currently broken**)
+ - **ConanClassic**
  - **CondeNast**: Condé Nast media group: Allure, Architectural Digest, Ars Technica, Bon Appétit, Brides, Condé Nast, Condé Nast Traveler, Details, Epicurious, GQ, Glamour, Golf Digest, SELF, Teen Vogue, The New Yorker, Vanity Fair, Vogue, W Magazine, WIRED
  - **CONtv**
  - **CookingChannel**
@@ -314,18 +303,21 @@ The only reliable way to check if a site is supported is to try it.
  - **CrowdBunker**
  - **CrowdBunkerChannel**
  - **Crtvg**
+ - **crunchyroll**: [*crunchyroll*](## "netrc machine")
+ - **crunchyroll:artist**: [*crunchyroll*](## "netrc machine")
+ - **crunchyroll:music**: [*crunchyroll*](## "netrc machine")
+ - **crunchyroll:playlist**: [*crunchyroll*](## "netrc machine")
  - **CSpan**: C-SPAN
  - **CSpanCongress**
  - **CtsNews**: 華視新聞
  - **CTV**
  - **CTVNews**
- - **cu.ntv.co.jp**: 日テレ無料TADA!
+ - **cu.ntv.co.jp**: Nippon Television Network
  - **CultureUnplugged**
  - **curiositystream**: [*curiositystream*](## "netrc machine")
  - **curiositystream:collections**: [*curiositystream*](## "netrc machine")
  - **curiositystream:series**: [*curiositystream*](## "netrc machine")
- - **cwtv**
- - **cwtv:movie**
+ - **CWTV**
  - **Cybrary**: [*cybrary*](## "netrc machine")
  - **CybraryCourse**: [*cybrary*](## "netrc machine")
  - **DacastPlaylist**
@@ -340,8 +332,6 @@ The only reliable way to check if a site is supported is to try it.
  - **DailyWirePodcast**
  - **damtomo:record**
  - **damtomo:video**
- - **dangalplay**: [*dangalplay*](## "netrc machine")
- - **dangalplay:season**: [*dangalplay*](## "netrc machine")
  - **daum.net**
  - **daum.net:clip**
  - **daum.net:playlist**
@@ -349,6 +339,8 @@ The only reliable way to check if a site is supported is to try it.
  - **daystar:clip**
  - **DBTV**
  - **DctpTv**
+ - **DeezerAlbum**
+ - **DeezerPlaylist**
  - **democracynow**
  - **DestinationAmerica**
  - **DetikEmbed**
@@ -358,8 +350,8 @@ The only reliable way to check if a site is supported is to try it.
  - **DigitalConcertHall**: [*digitalconcerthall*](## "netrc machine") DigitalConcertHall extractor
  - **DigitallySpeaking**
  - **Digiteka**
- - **Digiview**
  - **DiscogsReleasePlaylist**
+ - **Discovery**
  - **DiscoveryLife**
  - **DiscoveryNetworksDe**
  - **DiscoveryPlus**
@@ -368,6 +360,7 @@ The only reliable way to check if a site is supported is to try it.
  - **DiscoveryPlusItaly**
  - **DiscoveryPlusItalyShow**
  - **Disney**
+ - **DIYNetwork**
  - **dlf**
  - **dlf:corpus**: DLF Multi-feed Archives
  - **dlive:stream**
@@ -381,7 +374,6 @@ The only reliable way to check if a site is supported is to try it.
  - **Dropbox**
  - **Dropout**: [*dropout*](## "netrc machine")
  - **DropoutSeason**
- - **DrTalks**
  - **DrTuber**
  - **drtv**
  - **drtv:live**
@@ -395,18 +387,15 @@ The only reliable way to check if a site is supported is to try it.
  - **dvtv**: http://video.aktualne.cz/
  - **dw**: (**Currently broken**)
  - **dw:article**: (**Currently broken**)
- - **dzen.ru**: Дзен (dzen) formerly Яндекс.Дзен (Yandex Zen)
- - **dzen.ru:channel**
  - **EaglePlatform**
  - **EbaumsWorld**
  - **Ebay**
  - **egghead:course**: egghead.io course
  - **egghead:lesson**: egghead.io lesson
- - **eggs:artist**
- - **eggs:single**
  - **EinsUndEinsTV**: [*1und1tv*](## "netrc machine")
  - **EinsUndEinsTVLive**: [*1und1tv*](## "netrc machine")
  - **EinsUndEinsTVRecordings**: [*1und1tv*](## "netrc machine")
+ - **Einthusan**
  - **eitb.tv**
  - **ElementorEmbed**
  - **Elonet**
@@ -447,7 +436,6 @@ The only reliable way to check if a site is supported is to try it.
  - **FacebookPluginsVideo**
  - **fancode:live**: [*fancode*](## "netrc machine") (**Currently broken**)
  - **fancode:vod**: [*fancode*](## "netrc machine") (**Currently broken**)
- - **Fathom**
  - **faz.net**
  - **fc2**: [*fc2*](## "netrc machine")
  - **fc2:embed**
@@ -475,12 +463,11 @@ The only reliable way to check if a site is supported is to try it.
  - **FoxNewsVideo**
  - **FoxSports**
  - **fptplay**: fptplay.vn
- - **FrancaisFacile**
  - **FranceCulture**
  - **FranceInter**
- - **francetv**
- - **francetv:site**
+ - **FranceTV**
  - **francetvinfo.fr**
+ - **FranceTVSite**
  - **Freesound**
  - **freespeech.org**
  - **freetv:series**
@@ -489,6 +476,9 @@ The only reliable way to check if a site is supported is to try it.
  - **FrontendMastersCourse**: [*frontendmasters*](## "netrc machine")
  - **FrontendMastersLesson**: [*frontendmasters*](## "netrc machine")
  - **FujiTVFODPlus7**
+ - **Funimation**: [*funimation*](## "netrc machine")
+ - **funimation:page**: [*funimation*](## "netrc machine")
+ - **funimation:show**: [*funimation*](## "netrc machine")
  - **Funk**
  - **Funker530**
  - **Fux**
@@ -496,7 +486,6 @@ The only reliable way to check if a site is supported is to try it.
  - **Gab**
  - **GabTV**
  - **Gaia**: [*gaia*](## "netrc machine")
- - **GameDevTVDashboard**: [*gamedevtv*](## "netrc machine")
  - **GameJolt**
  - **GameJoltCommunity**
  - **GameJoltGame**
@@ -507,15 +496,13 @@ The only reliable way to check if a site is supported is to try it.
  - **GameStar**
  - **Gaskrank**
  - **Gazeta**: (**Currently broken**)
- - **GBNews**: GB News clips, features and live streams
  - **GDCVault**: [*gdcvault*](## "netrc machine") (**Currently broken**)
  - **GediDigital**
  - **gem.cbc.ca**: [*cbcgem*](## "netrc machine")
  - **gem.cbc.ca:live**
- - **gem.cbc.ca:playlist**: [*cbcgem*](## "netrc machine")
+ - **gem.cbc.ca:playlist**
  - **Genius**
  - **GeniusLyrics**
- - **Germanupa**: germanupa.de
  - **GetCourseRu**: [*getcourseru*](## "netrc machine")
  - **GetCourseRuPlayer**
  - **Gettr**
@@ -525,6 +512,7 @@ The only reliable way to check if a site is supported is to try it.
  - **GlattvisionTVLive**: [*glattvisiontv*](## "netrc machine")
  - **GlattvisionTVRecordings**: [*glattvisiontv*](## "netrc machine")
  - **Glide**: Glide mobile video messages (glide.me)
+ - **GlobalCyclingNetworkPlus**
  - **GlobalPlayerAudio**
  - **GlobalPlayerAudioEpisode**
  - **GlobalPlayerLive**
@@ -537,7 +525,6 @@ The only reliable way to check if a site is supported is to try it.
  - **GMANetworkVideo**
  - **Go**
  - **GoDiscovery**
- - **GodResource**
  - **GodTube**: (**Currently broken**)
  - **Gofile**
  - **Golem**
@@ -551,7 +538,6 @@ The only reliable way to check if a site is supported is to try it.
  - **Goshgay**
  - **GoToStage**
  - **GPUTechConf**
- - **Graspop**
  - **Gronkh**
  - **gronkh:feed**
  - **gronkh:vods**
@@ -575,7 +561,9 @@ The only reliable way to check if a site is supported is to try it.
  - **HollywoodReporterPlaylist**
  - **Holodex**
  - **HotNewHipHop**: (**Currently broken**)
- - **hotstar**: JioHotstar
+ - **hotstar**
+ - **hotstar:playlist**
+ - **hotstar:season**
  - **hotstar:series**
  - **hrfernsehen**
  - **HRTi**: [*hrti*](## "netrc machine")
@@ -588,8 +576,7 @@ The only reliable way to check if a site is supported is to try it.
  - **Hungama**
  - **HungamaAlbumPlaylist**
  - **HungamaSong**
- - **huya:live**: 虎牙直播
- - **huya:video**: 虎牙视频
+ - **huya:live**: huya.com
  - **Hypem**
  - **Hytale**
  - **Icareus**
@@ -612,10 +599,10 @@ The only reliable way to check if a site is supported is to try it.
  - **Inc**
  - **IndavideoEmbed**
  - **InfoQ**
- - **Instagram**
- - **instagram:story**
- - **instagram:tag**: Instagram hashtag search URLs
- - **instagram:user**: Instagram user profile (**Currently broken**)
+ - **Instagram**: [*instagram*](## "netrc machine")
+ - **instagram:story**: [*instagram*](## "netrc machine")
+ - **instagram:tag**: [*instagram*](## "netrc machine") Instagram hashtag search URLs
+ - **instagram:user**: [*instagram*](## "netrc machine") Instagram user profile (**Currently broken**)
  - **InstagramIOS**: IOS instagram:// URL
  - **Internazionale**
  - **InternetVideoArchive**
@@ -635,22 +622,19 @@ The only reliable way to check if a site is supported is to try it.
  - **ivi**: ivi.ru
  - **ivi:compilation**: ivi.ru compilations
  - **ivideon**: Ivideon TV
- - **Ivoox**
  - **IVXPlayer**
  - **iwara**: [*iwara*](## "netrc machine")
  - **iwara:playlist**: [*iwara*](## "netrc machine")
  - **iwara:user**: [*iwara*](## "netrc machine")
  - **Ixigua**
  - **Izlesene**
+ - **Jable**
+ - **JablePlaylist**
  - **Jamendo**
  - **JamendoAlbum**
  - **JeuxVideo**: (**Currently broken**)
- - **jiosaavn:album**
- - **jiosaavn:artist**
- - **jiosaavn:playlist**
- - **jiosaavn:show**
- - **jiosaavn:​show:playlist**
- - **jiosaavn:song**
+ - **JioSaavnAlbum**
+ - **JioSaavnSong**
  - **Joj**
  - **JoqrAg**: 超!A&G+ 文化放送 (f.k.a. AGQR) Nippon Cultural Broadcasting, Inc. (JOQR)
  - **Jove**
@@ -664,17 +648,13 @@ The only reliable way to check if a site is supported is to try it.
  - **Karaoketv**
  - **Katsomo**: (**Currently broken**)
  - **KelbyOne**: (**Currently broken**)
- - **Kenh14Playlist**
- - **Kenh14Video**
+ - **Ketnet**
  - **khanacademy**
  - **khanacademy:unit**
- - **kick:clips**
- - **kick:live**
- - **kick:vod**
+ - **Kick**
  - **Kicker**
  - **KickStarter**
- - **Kika**: KiKA.de
- - **KikaPlaylist**
+ - **KickVOD**
  - **kinja:embed**
  - **KinoPoisk**
  - **Kommunetv**
@@ -693,20 +673,17 @@ The only reliable way to check if a site is supported is to try it.
  - **la7.it**
  - **la7.it:​pod:episode**
  - **la7.it:podcast**
- - **laracasts**
- - **laracasts:series**
  - **LastFM**
  - **LastFMPlaylist**
  - **LastFMUser**
  - **LaXarxaMes**: [*laxarxames*](## "netrc machine")
- - **lbry**: odysee.com
- - **lbry:channel**: odysee.com channels
- - **lbry:playlist**: odysee.com playlists
+ - **lbry**
+ - **lbry:channel**
+ - **lbry:playlist**
  - **LCI**
  - **Lcp**
  - **LcpPlay**
  - **Le**: 乐视网
- - **LearningOnScreen**
  - **Lecture2Go**: (**Currently broken**)
  - **Lecturio**: [*lecturio*](## "netrc machine")
  - **LecturioCourse**: [*lecturio*](## "netrc machine")
@@ -727,7 +704,6 @@ The only reliable way to check if a site is supported is to try it.
  - **limelight:channel**
  - **limelight:channel_list**
  - **LinkedIn**: [*linkedin*](## "netrc machine")
- - **linkedin:events**: [*linkedin*](## "netrc machine")
  - **linkedin:learning**: [*linkedin*](## "netrc machine")
  - **linkedin:​learning:course**: [*linkedin*](## "netrc machine")
  - **Liputan6**
@@ -738,12 +714,9 @@ The only reliable way to check if a site is supported is to try it.
  - **livestream:original**
  - **Livestreamfails**
  - **Lnk**
+ - **LnkGo**
  - **loc**: Library of Congress
- - **Loco**
- - **loom**
- - **loom:folder**
  - **LoveHomePorn**
- - **LRTRadio**
  - **LRTStream**
  - **LRTVOD**
  - **LSMLREmbed**
@@ -765,16 +738,15 @@ The only reliable way to check if a site is supported is to try it.
  - **ManotoTV**: Manoto TV (Episode)
  - **ManotoTVLive**: Manoto TV (Live)
  - **ManotoTVShow**: Manoto TV (Show)
- - **ManyVids**
+ - **ManyVids**: (**Currently broken**)
  - **MaoriTV**
  - **Markiza**: (**Currently broken**)
  - **MarkizaPage**: (**Currently broken**)
  - **massengeschmack.tv**
  - **Masters**
  - **MatchTV**
- - **Mave**
  - **MBN**: mbn.co.kr (매일방송)
- - **MDR**: MDR.DE
+ - **MDR**: MDR.DE and KiKA
  - **MedalTV**
  - **media.ccc.de**
  - **media.ccc.de:lists**
@@ -796,13 +768,12 @@ The only reliable way to check if a site is supported is to try it.
  - **MelonVOD**
  - **Metacritic**
  - **mewatch**
- - **MicrosoftBuild**
  - **MicrosoftEmbed**
- - **MicrosoftLearnEpisode**
- - **MicrosoftLearnPlaylist**
- - **MicrosoftLearnSession**
- - **MicrosoftMedius**
  - **microsoftstream**: Microsoft Stream
+ - **mildom**: Record ongoing live by specific user in Mildom
+ - **mildom:clip**: Clip in Mildom
+ - **mildom:​user:vod**: Download all VODs from specific user in Mildom
+ - **mildom:vod**: VOD in Mildom
  - **minds**
  - **minds:channel**
  - **minds:group**
@@ -813,7 +784,6 @@ The only reliable way to check if a site is supported is to try it.
  - **MiTele**: mitele.es
  - **mixch**
  - **mixch:archive**
- - **mixch:movie**
  - **mixcloud**
  - **mixcloud:playlist**
  - **mixcloud:user**
@@ -826,21 +796,22 @@ The only reliable way to check if a site is supported is to try it.
  - **MNetTVLive**: [*mnettv*](## "netrc machine")
  - **MNetTVRecordings**: [*mnettv*](## "netrc machine")
  - **MochaVideo**
- - **Mojevideo**: mojevideo.sk
  - **Mojvideo**
  - **Monstercat**
- - **monstersiren**: 塞壬唱片
+ - **MonsterSirenHypergryphMusic**
  - **Motherless**
  - **MotherlessGallery**
  - **MotherlessGroup**
  - **MotherlessUploader**
  - **Motorsport**: motorsport.com (**Currently broken**)
+ - **MotorTrend**
+ - **MotorTrendOnDemand**
  - **MovieFap**
- - **moviepilot**: Moviepilot trailer
+ - **Moviepilot**
  - **MoviewPlay**
  - **Moviezine**
  - **MovingImage**
- - **MSN**
+ - **MSN**: (**Currently broken**)
  - **mtg**: MTG services
  - **mtv**
  - **mtv.de**: (**Currently broken**)
@@ -852,7 +823,7 @@ The only reliable way to check if a site is supported is to try it.
  - **MTVUutisetArticle**: (**Currently broken**)
  - **MuenchenTV**: münchen.tv (**Currently broken**)
  - **MujRozhlas**
- - **Murrtube**
+ - **Murrtube**: (**Currently broken**)
  - **MurrtubeUser**: Murrtube user profile (**Currently broken**)
  - **MuseAI**
  - **MuseScore**
@@ -860,6 +831,8 @@ The only reliable way to check if a site is supported is to try it.
  - **MusicdexArtist**
  - **MusicdexPlaylist**
  - **MusicdexSong**
+ - **mva**: Microsoft Virtual Academy videos
+ - **mva:course**: Microsoft Virtual Academy courses
  - **Mx3**
  - **Mx3Neo**
  - **Mx3Volksmusik**
@@ -881,19 +854,19 @@ The only reliable way to check if a site is supported is to try it.
  - **Naver**
  - **Naver:live**
  - **navernow**
- - **nba**: (**Currently broken**)
- - **nba:channel**: (**Currently broken**)
- - **nba:embed**: (**Currently broken**)
- - **nba:watch**: (**Currently broken**)
- - **nba:​watch:collection**: (**Currently broken**)
- - **nba:​watch:embed**: (**Currently broken**)
+ - **nba**
+ - **nba:channel**
+ - **nba:embed**
+ - **nba:watch**
+ - **nba:​watch:collection**
+ - **nba:​watch:embed**
  - **NBC**
  - **NBCNews**
  - **nbcolympics**
- - **nbcolympics:stream**: (**Currently broken**)
- - **NBCSports**: (**Currently broken**)
- - **NBCSportsStream**: (**Currently broken**)
- - **NBCSportsVPlayer**: (**Currently broken**)
+ - **nbcolympics:stream**
+ - **NBCSports**
+ - **NBCSportsStream**
+ - **NBCSportsVPlayer**
  - **NBCStations**
  - **ndr**: NDR.de - Norddeutscher Rundfunk
  - **ndr:embed**
@@ -905,8 +878,6 @@ The only reliable way to check if a site is supported is to try it.
  - **nebula:video**: [*watchnebula*](## "netrc machine")
  - **NekoHacker**
  - **NerdCubedFeed**
- - **Nest**
- - **NestClip**
  - **netease:album**: 网易云音乐 - 专辑
  - **netease:djradio**: 网易云音乐 - 电台
  - **netease:mv**: 网易云音乐 - MV
@@ -953,7 +924,7 @@ The only reliable way to check if a site is supported is to try it.
  - **nickelodeonru**
  - **niconico**: [*niconico*](## "netrc machine") ニコニコ動画
  - **niconico:history**: NicoNico user history or likes. Requires cookies.
- - **niconico:live**: [*niconico*](## "netrc machine") ニコニコ生放送
+ - **niconico:live**: ニコニコ生放送
  - **niconico:playlist**
  - **niconico:series**
  - **niconico:tag**: NicoNico video tag URLs
@@ -969,7 +940,7 @@ The only reliable way to check if a site is supported is to try it.
  - **Nitter**
  - **njoy**: N-JOY
  - **njoy:embed**
- - **NobelPrize**
+ - **NobelPrize**: (**Currently broken**)
  - **NoicePodcast**
  - **NonkTube**
  - **NoodleMagazine**
@@ -998,7 +969,6 @@ The only reliable way to check if a site is supported is to try it.
  - **NRKTVSeason**
  - **NRKTVSeries**
  - **NRLTV**: (**Currently broken**)
- - **nts.live**
  - **ntv.ru**
  - **NubilesPorn**: [*nubiles-porn*](## "netrc machine")
  - **nuum:live**
@@ -1040,6 +1010,7 @@ The only reliable way to check if a site is supported is to try it.
  - **orf:on**
  - **orf:podcast**
  - **orf:radio**
+ - **orf:tvthek**: ORF TVthek
  - **OsnatelTV**: [*osnateltv*](## "netrc machine")
  - **OsnatelTVLive**: [*osnateltv*](## "netrc machine")
  - **OsnatelTVRecordings**: [*osnateltv*](## "netrc machine")
@@ -1060,10 +1031,8 @@ The only reliable way to check if a site is supported is to try it.
  - **Parler**: Posts on parler.com
  - **parliamentlive.tv**: UK parliament videos
  - **Parlview**: (**Currently broken**)
- - **parti:livestream**
- - **parti:video**
- - **patreon**
- - **patreon:campaign**
+ - **Patreon**
+ - **PatreonCampaign**
  - **pbs**: Public Broadcasting Service (PBS) and member stations: PBS: Public Broadcasting Service, APT - Alabama Public Television (WBIQ), GPB/Georgia Public Broadcasting (WGTV), Mississippi Public Broadcasting (WMPN), Nashville Public Television (WNPT), WFSU-TV (WFSU), WSRE (WSRE), WTCI (WTCI), WPBA/Channel 30 (WPBA), Alaska Public Media (KAKM), Arizona PBS (KAET), KNME-TV/Channel 5 (KNME), Vegas PBS (KLVX), AETN/ARKANSAS ETV NETWORK (KETS), KET (WKLE), WKNO/Channel 10 (WKNO), LPB/LOUISIANA PUBLIC BROADCASTING (WLPB), OETA (KETA), Ozarks Public Television (KOZK), WSIU Public Broadcasting (WSIU), KEET TV (KEET), KIXE/Channel 9 (KIXE), KPBS San Diego (KPBS), KQED (KQED), KVIE Public Television (KVIE), PBS SoCal/KOCE (KOCE), ValleyPBS (KVPT), CONNECTICUT PUBLIC TELEVISION (WEDH), KNPB Channel 5 (KNPB), SOPTV (KSYS), Rocky Mountain PBS (KRMA), KENW-TV3 (KENW), KUED Channel 7 (KUED), Wyoming PBS (KCWC), Colorado Public Television / KBDI 12 (KBDI), KBYU-TV (KBYU), Thirteen/WNET New York (WNET), WGBH/Channel 2 (WGBH), WGBY (WGBY), NJTV Public Media NJ (WNJT), WLIW21 (WLIW), mpt/Maryland Public Television (WMPB), WETA Television and Radio (WETA), WHYY (WHYY), PBS 39 (WLVT), WVPT - Your Source for PBS and More! (WVPT), Howard University Television (WHUT), WEDU PBS (WEDU), WGCU Public Media (WGCU), WPBT2 (WPBT), WUCF TV (WUCF), WUFT/Channel 5 (WUFT), WXEL/Channel 42 (WXEL), WLRN/Channel 17 (WLRN), WUSF Public Broadcasting (WUSF), ETV (WRLK), UNC-TV (WUNC), PBS Hawaii - Oceanic Cable Channel 10 (KHET), Idaho Public Television (KAID), KSPS (KSPS), OPB (KOPB), KWSU/Channel 10 & KTNW/Channel 31 (KWSU), WILL-TV (WILL), Network Knowledge - WSEC/Springfield (WSEC), WTTW11 (WTTW), Iowa Public Television/IPTV (KDIN), Nine Network (KETC), PBS39 Fort Wayne (WFWA), WFYI Indianapolis (WFYI), Milwaukee Public Television (WMVS), WNIN (WNIN), WNIT Public Television (WNIT), WPT (WPNE), WVUT/Channel 22 (WVUT), WEIU/Channel 51 (WEIU), WQPT-TV (WQPT), WYCC PBS Chicago (WYCC), WIPB-TV (WIPB), WTIU (WTIU), CET  (WCET), ThinkTVNetwork (WPTD), WBGU-TV (WBGU), WGVU TV (WGVU), NET1 (KUON), Pioneer Public Television (KWCM), SDPB Television (KUSD), TPT (KTCA), KSMQ (KSMQ), KPTS/Channel 8 (KPTS), KTWU/Channel 11 (KTWU), East Tennessee PBS (WSJK), WCTE-TV (WCTE), WLJT, Channel 11 (WLJT), WOSU TV (WOSU), WOUB/WOUC (WOUB), WVPB (WVPB), WKYU-PBS (WKYU), KERA 13 (KERA), MPBN (WCBB), Mountain Lake PBS (WCFE), NHPTV (WENH), Vermont PBS (WETK), witf (WITF), WQED Multimedia (WQED), WMHT Educational Telecommunications (WMHT), Q-TV (WDCQ), WTVS Detroit Public TV (WTVS), CMU Public Television (WCMU), WKAR-TV (WKAR), WNMU-TV Public TV 13 (WNMU), WDSE - WRPT (WDSE), WGTE TV (WGTE), Lakeland Public Television (KAWE), KMOS-TV - Channels 6.1, 6.2 and 6.3 (KMOS), MontanaPBS (KUSM), KRWG/Channel 22 (KRWG), KACV (KACV), KCOS/Channel 13 (KCOS), WCNY/Channel 24 (WCNY), WNED (WNED), WPBS (WPBS), WSKG Public TV (WSKG), WXXI (WXXI), WPSU (WPSU), WVIA Public Media Studios (WVIA), WTVI (WTVI), Western Reserve PBS (WNEO), WVIZ/PBS ideastream (WVIZ), KCTS 9 (KCTS), Basin PBS (KPBT), KUHT / Channel 8 (KUHT), KLRN (KLRN), KLRU (KLRU), WTJX Channel 12 (WTJX), WCVE PBS (WCVE), KBTC Public Television (KBTC)
  - **PBSKids**
  - **PearVideo**
@@ -1080,16 +1049,14 @@ The only reliable way to check if a site is supported is to try it.
  - **PhilharmonieDeParis**: Philharmonie de Paris
  - **phoenix.de**
  - **Photobucket**
- - **PiaLive**
  - **Piapro**: [*piapro*](## "netrc machine")
- - **picarto**
- - **picarto:vod**
+ - **PIAULIZAPortal**: ulizaportal.jp - PIA LIVE STREAM
+ - **Picarto**
+ - **PicartoVod**
  - **Piksel**
  - **Pinkbike**
  - **Pinterest**
  - **PinterestCollection**
- - **PiramideTV**
- - **PiramideTVChannel**
  - **pixiv:sketch**
  - **pixiv:​sketch:user**
  - **Pladform**
@@ -1106,11 +1073,12 @@ The only reliable way to check if a site is supported is to try it.
  - **pluralsight**: [*pluralsight*](## "netrc machine")
  - **pluralsight:course**
  - **PlutoTV**: (**Currently broken**)
- - **PlVideo**: Платформа
  - **PodbayFM**
  - **PodbayFMChannel**
  - **Podchaser**
  - **podomatic**: (**Currently broken**)
+ - **Pokemon**
+ - **PokemonWatch**
  - **PokerGo**: [*pokergo*](## "netrc machine")
  - **PokerGoCollection**: [*pokergo*](## "netrc machine")
  - **PolsatGo**
@@ -1156,19 +1124,18 @@ The only reliable way to check if a site is supported is to try it.
  - **QingTing**
  - **qqmusic**: QQ音乐
  - **qqmusic:album**: QQ音乐 - 专辑
- - **qqmusic:mv**: QQ音乐 - MV
  - **qqmusic:playlist**: QQ音乐 - 歌单
  - **qqmusic:singer**: QQ音乐 - 歌手
  - **qqmusic:toplist**: QQ音乐 - 排行榜
  - **QuantumTV**: [*quantumtv*](## "netrc machine")
  - **QuantumTVLive**: [*quantumtv*](## "netrc machine")
  - **QuantumTVRecordings**: [*quantumtv*](## "netrc machine")
+ - **Qub**
  - **R7**: (**Currently broken**)
  - **R7Article**: (**Currently broken**)
  - **Radiko**
  - **RadikoRadio**
  - **radio.de**: (**Currently broken**)
- - **Radio1Be**
  - **radiocanada**
  - **radiocanada:audiovideo**
  - **RadioComercial**
@@ -1181,7 +1148,6 @@ The only reliable way to check if a site is supported is to try it.
  - **RadioJavan**: (**Currently broken**)
  - **radiokapital**
  - **radiokapital:show**
- - **RadioRadicale**
  - **RadioZetPodcast**
  - **radlive**
  - **radlive:channel**
@@ -1236,7 +1202,6 @@ The only reliable way to check if a site is supported is to try it.
  - **RoosterTeeth**: [*roosterteeth*](## "netrc machine")
  - **RoosterTeethSeries**: [*roosterteeth*](## "netrc machine")
  - **RottenTomatoes**
- - **RoyaLive**
  - **Rozhlas**
  - **RozhlasVltava**
  - **RTBF**: [*rtbf*](## "netrc machine") (**Currently broken**)
@@ -1257,12 +1222,13 @@ The only reliable way to check if a site is supported is to try it.
  - **RTVCKaltura**
  - **RTVCPlay**
  - **RTVCPlayEmbed**
- - **rtve.es:alacarta**: RTVE a la carta and Play
+ - **rtve.es:alacarta**: RTVE a la carta
  - **rtve.es:audio**: RTVE audio
+ - **rtve.es:infantil**: RTVE infantil
  - **rtve.es:live**: RTVE.es live streams
  - **rtve.es:television**
+ - **RTVS**
  - **rtvslo.si**
- - **rtvslo.si:show**
  - **RudoVideo**
  - **Rule34Video**
  - **Rumble**
@@ -1295,7 +1261,6 @@ The only reliable way to check if a site is supported is to try it.
  - **SampleFocus**
  - **Sangiin**: 参議院インターネット審議中継 (archive)
  - **Sapo**: SAPO Vídeos
- - **SaucePlus**: Sauce+
  - **SBS**: sbs.com.au
  - **sbs.co.kr**
  - **sbs.co.kr:allvod_program**
@@ -1307,17 +1272,15 @@ The only reliable way to check if a site is supported is to try it.
  - **Screencast**
  - **Screencastify**
  - **ScreencastOMatic**
- - **ScreenRec**
  - **ScrippsNetworks**
  - **scrippsnetworks:watch**
  - **Scrolller**
  - **SCTE**: [*scte*](## "netrc machine") (**Currently broken**)
  - **SCTECourse**: [*scte*](## "netrc machine") (**Currently broken**)
  - **sejm**
- - **Sen**
  - **SenalColombiaLive**: (**Currently broken**)
- - **senate.gov**
- - **senate.gov:isvp**
+ - **SenateGov**
+ - **SenateISVP**
  - **SendtoNews**: (**Currently broken**)
  - **Servus**
  - **Sexu**: (**Currently broken**)
@@ -1325,7 +1288,6 @@ The only reliable way to check if a site is supported is to try it.
  - **SeznamZpravyArticle**
  - **Shahid**: [*shahid*](## "netrc machine")
  - **ShahidShow**
- - **SharePoint**
  - **ShareVideosEmbed**
  - **ShemarooMe**
  - **ShowRoomLive**
@@ -1351,17 +1313,11 @@ The only reliable way to check if a site is supported is to try it.
  - **SlidesLive**
  - **Slutload**
  - **Smotrim**
- - **SnapchatSpotlight**
  - **Snotr**
- - **SoftWhiteUnderbelly**: [*softwhiteunderbelly*](## "netrc machine")
  - **Sohu**
  - **SohuV**
  - **SonyLIV**: [*sonyliv*](## "netrc machine")
  - **SonyLIVSeries**
- - **soop**: [*afreecatv*](## "netrc machine") sooplive.co.kr
- - **soop:catchstory**: [*afreecatv*](## "netrc machine") sooplive.co.kr catch story
- - **soop:live**: [*afreecatv*](## "netrc machine") sooplive.co.kr livestreams
- - **soop:user**: [*afreecatv*](## "netrc machine")
  - **soundcloud**: [*soundcloud*](## "netrc machine")
  - **soundcloud:playlist**: [*soundcloud*](## "netrc machine")
  - **soundcloud:related**: [*soundcloud*](## "netrc machine")
@@ -1390,17 +1346,19 @@ The only reliable way to check if a site is supported is to try it.
  - **spotify**: Spotify episodes (**Currently broken**)
  - **spotify:show**: Spotify shows (**Currently broken**)
  - **Spreaker**
+ - **SpreakerPage**
  - **SpreakerShow**
+ - **SpreakerShowPage**
  - **SpringboardPlatform**
- - **SproutVideo**
- - **sr:mediathek**: Saarländischer Rundfunk
+ - **Sprout**
+ - **sr:mediathek**: Saarländischer Rundfunk (**Currently broken**)
  - **SRGSSR**
  - **SRGSSRPlay**: srf.ch, rts.ch, rsi.ch, rtr.ch and swissinfo.ch play sites
  - **StacommuLive**: [*stacommu*](## "netrc machine")
  - **StacommuVOD**: [*stacommu*](## "netrc machine")
  - **StagePlusVODConcert**: [*stageplus*](## "netrc machine")
  - **stanfordoc**: Stanford Open ClassRoom
- - **startrek**: STAR TREK
+ - **StarTrek**: (**Currently broken**)
  - **startv**
  - **Steam**
  - **SteamCommunityBroadcast**
@@ -1409,33 +1367,26 @@ The only reliable way to check if a site is supported is to try it.
  - **StoryFire**
  - **StoryFireSeries**
  - **StoryFireUser**
- - **Streaks**
  - **Streamable**
  - **StreamCZ**
  - **StreetVoice**
  - **StretchInternet**
  - **Stripchat**
  - **stv:player**
- - **stvr**: Slovak Television and Radio (formerly RTVS)
- - **Subsplash**
- - **subsplash:playlist**
  - **Substack**
  - **SunPorno**
  - **sverigesradio:episode**
  - **sverigesradio:publication**
- - **svt:page**
- - **svt:play**: SVT Play and Öppet arkiv
- - **svt:​play:series**
+ - **SVT**
+ - **SVTPage**
+ - **SVTPlay**: SVT Play and Öppet arkiv
+ - **SVTSeries**
  - **SwearnetEpisode**
- - **Syfy**
+ - **Syfy**: (**Currently broken**)
  - **SYVDK**
  - **SztvHu**
  - **t-online.de**: (**Currently broken**)
  - **Tagesschau**: (**Currently broken**)
- - **TapTapApp**
- - **TapTapAppIntl**
- - **TapTapMoment**
- - **TapTapPostIntl**
  - **Tass**: (**Currently broken**)
  - **TBS**
  - **TBSJPEpisode**
@@ -1454,7 +1405,7 @@ The only reliable way to check if a site is supported is to try it.
  - **TedSeries**
  - **TedTalk**
  - **Tele13**
- - **Tele5**
+ - **Tele5**: (**Currently broken**)
  - **TeleBruxelles**
  - **TelecaribePlay**
  - **Telecinco**: telecinco.es, cuatro.com and mediaset.es
@@ -1468,9 +1419,11 @@ The only reliable way to check if a site is supported is to try it.
  - **TeleQuebecSquat**
  - **TeleQuebecVideo**
  - **TeleTask**: (**Currently broken**)
- - **Telewebion**: (**Currently broken**)
+ - **Telewebion**
  - **Tempo**
  - **TennisTV**: [*tennistv*](## "netrc machine")
+ - **TenPlay**: [*10play*](## "netrc machine")
+ - **TenPlaySeason**
  - **TF1**
  - **TFO**
  - **theatercomplextown:ppv**: [*theatercomplextown*](## "netrc machine")
@@ -1492,12 +1445,11 @@ The only reliable way to check if a site is supported is to try it.
  - **ThreeSpeak**
  - **ThreeSpeakUser**
  - **TikTok**
- - **tiktok:collection**
  - **tiktok:effect**: (**Currently broken**)
  - **tiktok:live**
  - **tiktok:sound**: (**Currently broken**)
  - **tiktok:tag**: (**Currently broken**)
- - **tiktok:user**
+ - **tiktok:user**: (**Currently broken**)
  - **TLC**
  - **TMZ**
  - **TNAFlix**
@@ -1508,7 +1460,6 @@ The only reliable way to check if a site is supported is to try it.
  - **tokfm:podcast**
  - **ToonGoggles**
  - **tou.tv**: [*toutv*](## "netrc machine")
- - **toutiao**: 今日头条
  - **Toypics**: Toypics video (**Currently broken**)
  - **ToypicsUser**: Toypics user profile (**Currently broken**)
  - **TrailerAddict**: (**Currently broken**)
@@ -1529,8 +1480,8 @@ The only reliable way to check if a site is supported is to try it.
  - **Tube8**: (**Currently broken**)
  - **TubeTuGraz**: [*tubetugraz*](## "netrc machine") tube.tugraz.at
  - **TubeTuGrazSeries**: [*tubetugraz*](## "netrc machine")
- - **tubitv**: [*tubitv*](## "netrc machine")
- - **tubitv:series**
+ - **TubiTv**: [*tubitv*](## "netrc machine")
+ - **TubiTvShow**
  - **Tumblr**: [*tumblr*](## "netrc machine")
  - **TuneInPodcast**
  - **TuneInPodcastEpisode**
@@ -1543,15 +1494,13 @@ The only reliable way to check if a site is supported is to try it.
  - **tv2play.hu**
  - **tv2playseries.hu**
  - **TV4**: tv4.se and tv4play.se
- - **TV5MONDE**
+ - **TV5MondePlus**: TV5MONDE+
  - **tv5unis**
  - **tv5unis:video**
  - **tv8.it**
- - **tv8.it:live**: TV8 Live
- - **tv8.it:playlist**: TV8 Playlist
+ - **TVA**
  - **TVANouvelles**
  - **TVANouvellesArticle**
- - **tvaplus**: TVA+
  - **TVC**
  - **TVCArticle**
  - **TVer**
@@ -1569,8 +1518,6 @@ The only reliable way to check if a site is supported is to try it.
  - **tvp:​vod:series**
  - **TVPlayer**
  - **TVPlayHome**
- - **tvw**
- - **tvw:tvchannels**
  - **Tweakers**
  - **TwitCasting**
  - **TwitCastingLive**
@@ -1596,9 +1543,7 @@ The only reliable way to check if a site is supported is to try it.
  - **UFCTV**: [*ufctv*](## "netrc machine")
  - **ukcolumn**: (**Currently broken**)
  - **UKTVPlay**
- - **UlizaPlayer**
- - **UlizaPortal**: ulizaportal.jp
- - **umg:de**: Universal Music Deutschland
+ - **umg:de**: Universal Music Deutschland (**Currently broken**)
  - **Unistra**
  - **Unity**: (**Currently broken**)
  - **uol.com.br**
@@ -1615,15 +1560,17 @@ The only reliable way to check if a site is supported is to try it.
  - **Varzesh3**: (**Currently broken**)
  - **Vbox7**
  - **Veo**
+ - **Veoh**
+ - **veoh:user**
  - **Vesti**: Вести.Ru (**Currently broken**)
  - **Vevo**
  - **VevoPlaylist**
  - **VGTV**: VGTV, BTTV, FTV, Aftenposten and Aftonbladet
  - **vh1.com**
  - **vhx:embed**: [*vimeo*](## "netrc machine")
- - **vice**: (**Currently broken**)
- - **vice:article**: (**Currently broken**)
- - **vice:show**: (**Currently broken**)
+ - **vice**
+ - **vice:article**
+ - **vice:show**
  - **Viddler**
  - **Videa**
  - **video.arnes.si**: Arnes Video
@@ -1641,21 +1588,19 @@ The only reliable way to check if a site is supported is to try it.
  - **videomore:season**
  - **videomore:video**
  - **VideoPress**
- - **Vidflex**
  - **Vidio**: [*vidio*](## "netrc machine")
  - **VidioLive**: [*vidio*](## "netrc machine")
  - **VidioPremier**: [*vidio*](## "netrc machine")
  - **VidLii**
  - **Vidly**
- - **vids.io**
- - **Vidyard**
  - **viewlift**
  - **viewlift:embed**
  - **Viidea**
+ - **viki**: [*viki*](## "netrc machine")
+ - **viki:channel**: [*viki*](## "netrc machine")
  - **vimeo**: [*vimeo*](## "netrc machine")
  - **vimeo:album**: [*vimeo*](## "netrc machine")
  - **vimeo:channel**: [*vimeo*](## "netrc machine")
- - **vimeo:event**: [*vimeo*](## "netrc machine")
  - **vimeo:group**: [*vimeo*](## "netrc machine")
  - **vimeo:likes**: [*vimeo*](## "netrc machine") Vimeo user likes
  - **vimeo:ondemand**: [*vimeo*](## "netrc machine")
@@ -1667,6 +1612,8 @@ The only reliable way to check if a site is supported is to try it.
  - **Vimm:stream**
  - **ViMP**
  - **ViMP:Playlist**
+ - **Vine**
+ - **vine:user**
  - **Viously**
  - **Viqeo**: (**Currently broken**)
  - **Viu**
@@ -1685,20 +1632,16 @@ The only reliable way to check if a site is supported is to try it.
  - **voicy**: (**Currently broken**)
  - **voicy:channel**: (**Currently broken**)
  - **VolejTV**
+ - **Voot**: [*voot*](## "netrc machine") (**Currently broken**)
+ - **VootSeries**: [*voot*](## "netrc machine") (**Currently broken**)
  - **VoxMedia**
  - **VoxMediaVolume**
  - **vpro**: npo.nl, ntr.nl, omroepwnl.nl, zapp.nl and npo3.nl
  - **vqq:series**
  - **vqq:video**
- - **vrsquare**: VR SQUARE
- - **vrsquare:channel**
- - **vrsquare:search**
- - **vrsquare:section**
  - **VRT**: VRT NWS, Flanders News, Flandern Info and Sporza
- - **vrtmax**: [*vrtnu*](## "netrc machine") VRT MAX (formerly VRT NU)
+ - **VrtNU**: [*vrtnu*](## "netrc machine") VRT MAX
  - **VTM**: (**Currently broken**)
- - **VTV**
- - **VTVGo**
  - **VTXTV**: [*vtxtv*](## "netrc machine")
  - **VTXTVLive**: [*vtxtv*](## "netrc machine")
  - **VTXTVRecordings**: [*vtxtv*](## "netrc machine")
@@ -1765,13 +1708,13 @@ The only reliable way to check if a site is supported is to try it.
  - **wykop:​post:comment**
  - **Xanimu**
  - **XboxClips**
+ - **XFileShare**: XFileShare based sites: Aparat, ClipWatching, GoUnlimited, GoVid, HolaVid, Streamty, TheVideoBee, Uqload, VidBom, vidlo, VidLocker, VidShare, VUp, WolfStream, XVideoSharing
  - **XHamster**
  - **XHamsterEmbed**
  - **XHamsterUser**
- - **XiaoHongShu**: 小红书
  - **ximalaya**: 喜马拉雅FM
  - **ximalaya:album**: 喜马拉雅FM 专辑
- - **Xinpianchang**: 新片场
+ - **xinpianchang**: xinpianchang.com (**Currently broken**)
  - **XMinus**: (**Currently broken**)
  - **XNXX**
  - **Xstream**
@@ -1799,30 +1742,26 @@ The only reliable way to check if a site is supported is to try it.
  - **YouNowLive**
  - **YouNowMoment**
  - **YouPorn**
- - **YouPornCategory**: YouPorn category, with sorting, filtering and pagination
- - **YouPornChannel**: YouPorn channel, with sorting and pagination
- - **YouPornCollection**: YouPorn collection (user playlist), with sorting and pagination
- - **YouPornStar**: YouPorn Pornstar, with description, sorting and pagination
- - **YouPornTag**: YouPorn tag (porntags), with sorting, filtering and pagination
- - **YouPornVideos**: YouPorn video (browse) playlists, with sorting, filtering and pagination
- - **youtube**: [*youtube*](## "netrc machine") YouTube
- - **youtube:clip**: [*youtube*](## "netrc machine")
- - **youtube:favorites**: [*youtube*](## "netrc machine") YouTube liked videos; ":ytfav" keyword (requires cookies)
- - **youtube:history**: [*youtube*](## "netrc machine") Youtube watch history; ":ythis" keyword (requires cookies)
- - **youtube:​music:search_url**: [*youtube*](## "netrc machine") YouTube music search URLs with selectable sections, e.g. #songs
- - **youtube:notif**: [*youtube*](## "netrc machine") YouTube notifications; ":ytnotif" keyword (requires cookies)
- - **youtube:playlist**: [*youtube*](## "netrc machine") YouTube playlists
- - **youtube:recommended**: [*youtube*](## "netrc machine") YouTube recommended videos; ":ytrec" keyword
- - **youtube:search**: [*youtube*](## "netrc machine") YouTube search; "ytsearch:" prefix
- - **youtube:​search:date**: [*youtube*](## "netrc machine") YouTube search, newest videos first; "ytsearchdate:" prefix
- - **youtube:search_url**: [*youtube*](## "netrc machine") YouTube search URLs with sorting and filter support
- - **youtube:​shorts:pivot:audio**: [*youtube*](## "netrc machine") YouTube Shorts audio pivot (Shorts using audio of a given video)
- - **youtube:subscriptions**: [*youtube*](## "netrc machine") YouTube subscriptions feed; ":ytsubs" keyword (requires cookies)
- - **youtube:tab**: [*youtube*](## "netrc machine") YouTube Tabs
- - **youtube:user**: [*youtube*](## "netrc machine") YouTube user videos; "ytuser:" prefix
- - **youtube:watchlater**: [*youtube*](## "netrc machine") Youtube watch later list; ":ytwatchlater" keyword (requires cookies)
- - **YoutubeLivestreamEmbed**: [*youtube*](## "netrc machine") YouTube livestream embeds
- - **YoutubeYtBe**: [*youtube*](## "netrc machine") youtu.be
+ - **YourPorn**
+ - **YourUpload**
+ - **youtube**: YouTube
+ - **youtube:clip**
+ - **youtube:favorites**: YouTube liked videos; ":ytfav" keyword (requires cookies)
+ - **youtube:history**: Youtube watch history; ":ythis" keyword (requires cookies)
+ - **youtube:​music:search_url**: YouTube music search URLs with selectable sections, e.g. #songs
+ - **youtube:notif**: YouTube notifications; ":ytnotif" keyword (requires cookies)
+ - **youtube:playlist**: YouTube playlists
+ - **youtube:recommended**: YouTube recommended videos; ":ytrec" keyword
+ - **youtube:search**: YouTube search; "ytsearch:" prefix
+ - **youtube:​search:date**: YouTube search, newest videos first; "ytsearchdate:" prefix
+ - **youtube:search_url**: YouTube search URLs with sorting and filter support
+ - **youtube:​shorts:pivot:audio**: YouTube Shorts audio pivot (Shorts using audio of a given video)
+ - **youtube:subscriptions**: YouTube subscriptions feed; ":ytsubs" keyword (requires cookies)
+ - **youtube:tab**: YouTube Tabs
+ - **youtube:user**: YouTube user videos; "ytuser:" prefix
+ - **youtube:watchlater**: Youtube watch later list; ":ytwatchlater" keyword (requires cookies)
+ - **YoutubeLivestreamEmbed**: YouTube livestream embeds
+ - **YoutubeYtBe**: youtu.be
  - **Zaiko**
  - **ZaikoETicket**
  - **Zapiks**
@@ -1830,12 +1769,14 @@ The only reliable way to check if a site is supported is to try it.
  - **ZattooLive**: [*zattoo*](## "netrc machine")
  - **ZattooMovies**: [*zattoo*](## "netrc machine")
  - **ZattooRecordings**: [*zattoo*](## "netrc machine")
- - **zdf**
- - **zdf:channel**
+ - **ZDF**
+ - **ZDFChannel**
  - **Zee5**: [*zee5*](## "netrc machine")
  - **zee5:series**
  - **ZeeNews**: (**Currently broken**)
  - **ZenPorn**
+ - **ZenYandex**
+ - **ZenYandexChannel**
  - **ZetlandDKArticle**
  - **Zhihu**
  - **zingmp3**: zingmp3.vn

test/conftest.py

@@ -1,3 +1,4 @@
+import functools
 import inspect
 
 import pytest
@@ -9,9 +10,7 @@ from yt_dlp.utils._utils import _YDLLogger as FakeLogger
 
 @pytest.fixture
 def handler(request):
-    RH_KEY = getattr(request, 'param', None)
-    if not RH_KEY:
-        return
+    RH_KEY = request.param
     if inspect.isclass(RH_KEY) and issubclass(RH_KEY, RequestHandler):
         handler = RH_KEY
     elif RH_KEY in _REQUEST_HANDLERS:
@@ -19,46 +18,9 @@ def handler(request):
     else:
         pytest.skip(f'{RH_KEY} request handler is not available')
 
-    class HandlerWrapper(handler):
-        RH_KEY = handler.RH_KEY
-
-        def __init__(self, **kwargs):
-            super().__init__(logger=FakeLogger, **kwargs)
-
-    return HandlerWrapper
+    return functools.partial(handler, logger=FakeLogger)
 
 
-@pytest.fixture(autouse=True)
-def skip_handler(request, handler):
-    """usage: pytest.mark.skip_handler('my_handler', 'reason')"""
-    for marker in request.node.iter_markers('skip_handler'):
-        if marker.args[0] == handler.RH_KEY:
-            pytest.skip(marker.args[1] if len(marker.args) > 1 else '')
-
-
-@pytest.fixture(autouse=True)
-def skip_handler_if(request, handler):
-    """usage: pytest.mark.skip_handler_if('my_handler', lambda request: True, 'reason')"""
-    for marker in request.node.iter_markers('skip_handler_if'):
-        if marker.args[0] == handler.RH_KEY and marker.args[1](request):
-            pytest.skip(marker.args[2] if len(marker.args) > 2 else '')
-
-
-@pytest.fixture(autouse=True)
-def skip_handlers_if(request, handler):
-    """usage: pytest.mark.skip_handlers_if(lambda request, handler: True, 'reason')"""
-    for marker in request.node.iter_markers('skip_handlers_if'):
-        if handler and marker.args[0](request, handler):
-            pytest.skip(marker.args[1] if len(marker.args) > 1 else '')
-
-
-def pytest_configure(config):
-    config.addinivalue_line(
-        'markers', 'skip_handler(handler): skip test for the given handler',
-    )
-    config.addinivalue_line(
-        'markers', 'skip_handler_if(handler): skip test for the given handler if condition is true',
-    )
-    config.addinivalue_line(
-        'markers', 'skip_handlers_if(handler): skip test for handlers when the condition is true',
-    )
+def validate_and_send(rh, req):
+    rh.validate(req)
+    return rh.send(req)

test/helper.py

@@ -9,14 +9,15 @@ import types
 
 import yt_dlp.extractor
 from yt_dlp import YoutubeDL
+from yt_dlp.compat import compat_os_name
 from yt_dlp.utils import preferredencoding, try_call, write_string, find_available_port
 
 if 'pytest' in sys.modules:
     import pytest
     is_download_test = pytest.mark.download
 else:
-    def is_download_test(test_class):
-        return test_class
+    def is_download_test(testClass):
+        return testClass
 
 
 def get_params(override=None):
@@ -44,11 +45,11 @@ def try_rm(filename):
 
 
 def report_warning(message, *args, **kwargs):
-    """
+    '''
     Print the message to stderr, it will be prefixed with 'WARNING:'
     If stderr is a tty file the 'WARNING:' will be colored
-    """
-    if sys.stderr.isatty() and os.name != 'nt':
+    '''
+    if sys.stderr.isatty() and compat_os_name != 'nt':
         _msg_header = '\033[0;33mWARNING:\033[0m'
     else:
         _msg_header = 'WARNING:'
@@ -101,109 +102,88 @@ def getwebpagetestcases():
 md5 = lambda s: hashlib.md5(s.encode()).hexdigest()
 
 
-def _iter_differences(got, expected, field):
-    if isinstance(expected, str):
-        op, _, val = expected.partition(':')
-        if op in ('mincount', 'maxcount', 'count'):
-            if not isinstance(got, (list, dict)):
-                yield field, f'expected either {list.__name__} or {dict.__name__}, got {type(got).__name__}'
-                return
-
-            expected_num = int(val)
-            got_num = len(got)
-            if op == 'mincount':
-                if got_num < expected_num:
-                    yield field, f'expected at least {val} items, got {got_num}'
-                return
-
-            if op == 'maxcount':
-                if got_num > expected_num:
-                    yield field, f'expected at most {val} items, got {got_num}'
-                return
-
-            assert op == 'count'
-            if got_num != expected_num:
-                yield field, f'expected exactly {val} items, got {got_num}'
-            return
-
-        if not isinstance(got, str):
-            yield field, f'expected {str.__name__}, got {type(got).__name__}'
-            return
-
-        if op == 're':
-            if not re.match(val, got):
-                yield field, f'should match {val!r}, got {got!r}'
-            return
-
-        if op == 'startswith':
-            if not got.startswith(val):
-                yield field, f'should start with {val!r}, got {got!r}'
-            return
-
-        if op == 'contains':
-            if not val.startswith(got):
-                yield field, f'should contain {val!r}, got {got!r}'
-            return
-
-        if op == 'md5':
-            hash_val = md5(got)
-            if hash_val != val:
-                yield field, f'expected hash {val}, got {hash_val}'
-            return
-
-        if got != expected:
-            yield field, f'expected {expected!r}, got {got!r}'
-        return
-
-    if isinstance(expected, dict) and isinstance(got, dict):
-        for key, expected_val in expected.items():
-            if key not in got:
-                yield field, f'missing key: {key!r}'
-                continue
-
-            field_name = key if field is None else f'{field}.{key}'
-            yield from _iter_differences(got[key], expected_val, field_name)
-        return
-
-    if isinstance(expected, type):
-        if not isinstance(got, expected):
-            yield field, f'expected {expected.__name__}, got {type(got).__name__}'
-        return
-
-    if isinstance(expected, list) and isinstance(got, list):
-        # TODO: clever diffing algorithm lmao
-        if len(expected) != len(got):
-            yield field, f'expected length of {len(expected)}, got {len(got)}'
-            return
-
-        for index, (got_val, expected_val) in enumerate(zip(got, expected)):
-            field_name = str(index) if field is None else f'{field}.{index}'
-            yield from _iter_differences(got_val, expected_val, field_name)
-        return
-
-    if got != expected:
-        yield field, f'expected {expected!r}, got {got!r}'
-
-
-def _expect_value(message, got, expected, field):
-    mismatches = list(_iter_differences(got, expected, field))
-    if not mismatches:
-        return
-
-    fields = [field for field, _ in mismatches if field is not None]
-    return ''.join((
-        message, f' ({", ".join(fields)})' if fields else '',
-        *(f'\n\t{field}: {message}' for field, message in mismatches)))
-
-
 def expect_value(self, got, expected, field):
-    if message := _expect_value('values differ', got, expected, field):
-        self.fail(message)
+    if isinstance(expected, str) and expected.startswith('re:'):
+        match_str = expected[len('re:'):]
+        match_rex = re.compile(match_str)
+
+        self.assertTrue(
+            isinstance(got, str),
+            f'Expected a {str.__name__} object, but got {type(got).__name__} for field {field}')
+        self.assertTrue(
+            match_rex.match(got),
+            f'field {field} (value: {got!r}) should match {match_str!r}')
+    elif isinstance(expected, str) and expected.startswith('startswith:'):
+        start_str = expected[len('startswith:'):]
+        self.assertTrue(
+            isinstance(got, str),
+            f'Expected a {str.__name__} object, but got {type(got).__name__} for field {field}')
+        self.assertTrue(
+            got.startswith(start_str),
+            f'field {field} (value: {got!r}) should start with {start_str!r}')
+    elif isinstance(expected, str) and expected.startswith('contains:'):
+        contains_str = expected[len('contains:'):]
+        self.assertTrue(
+            isinstance(got, str),
+            f'Expected a {str.__name__} object, but got {type(got).__name__} for field {field}')
+        self.assertTrue(
+            contains_str in got,
+            f'field {field} (value: {got!r}) should contain {contains_str!r}')
+    elif isinstance(expected, type):
+        self.assertTrue(
+            isinstance(got, expected),
+            f'Expected type {expected!r} for field {field}, but got value {got!r} of type {type(got)!r}')
+    elif isinstance(expected, dict) and isinstance(got, dict):
+        expect_dict(self, got, expected)
+    elif isinstance(expected, list) and isinstance(got, list):
+        self.assertEqual(
+            len(expected), len(got),
+            'Expect a list of length %d, but got a list of length %d for field %s' % (
+                len(expected), len(got), field))
+        for index, (item_got, item_expected) in enumerate(zip(got, expected)):
+            type_got = type(item_got)
+            type_expected = type(item_expected)
+            self.assertEqual(
+                type_expected, type_got,
+                'Type mismatch for list item at index %d for field %s, expected %r, got %r' % (
+                    index, field, type_expected, type_got))
+            expect_value(self, item_got, item_expected, field)
+    else:
+        if isinstance(expected, str) and expected.startswith('md5:'):
+            self.assertTrue(
+                isinstance(got, str),
+                f'Expected field {field} to be a unicode object, but got value {got!r} of type {type(got)!r}')
+            got = 'md5:' + md5(got)
+        elif isinstance(expected, str) and re.match(r'^(?:min|max)?count:\d+', expected):
+            self.assertTrue(
+                isinstance(got, (list, dict)),
+                f'Expected field {field} to be a list or a dict, but it is of type {type(got).__name__}')
+            op, _, expected_num = expected.partition(':')
+            expected_num = int(expected_num)
+            if op == 'mincount':
+                assert_func = assertGreaterEqual
+                msg_tmpl = 'Expected %d items in field %s, but only got %d'
+            elif op == 'maxcount':
+                assert_func = assertLessEqual
+                msg_tmpl = 'Expected maximum %d items in field %s, but got %d'
+            elif op == 'count':
+                assert_func = assertEqual
+                msg_tmpl = 'Expected exactly %d items in field %s, but got %d'
+            else:
+                assert False
+            assert_func(
+                self, len(got), expected_num,
+                msg_tmpl % (expected_num, field, len(got)))
+            return
+        self.assertEqual(
+            expected, got,
+            f'Invalid value for field {field}, expected {expected!r}, got {got!r}')
 
 
 def expect_dict(self, got_dict, expected_dict):
-    if message := _expect_value('dictionaries differ', got_dict, expected_dict, None):
-        self.fail(message)
+    for info_field, expected in expected_dict.items():
+        got = got_dict.get(info_field)
+        expect_value(self, got, expected, info_field)
 
 
 def sanitize_got_info_dict(got_dict):
@@ -244,7 +224,7 @@ def sanitize_got_info_dict(got_dict):
         test_info_dict.pop('display_id')
 
     # Remove deprecated fields
-    for old in YoutubeDL._deprecated_multivalue_fields:
+    for old in YoutubeDL._deprecated_multivalue_fields.keys():
         test_info_dict.pop(old, None)
 
     # release_year may be generated from release_date
@@ -259,20 +239,6 @@ def sanitize_got_info_dict(got_dict):
 
 
 def expect_info_dict(self, got_dict, expected_dict):
-    ALLOWED_KEYS_SORT_ORDER = (
-        # NB: Keep in sync with the docstring of extractor/common.py
-        'id', 'ext', 'direct', 'display_id', 'title', 'alt_title', 'description', 'media_type',
-        'uploader', 'uploader_id', 'uploader_url', 'channel', 'channel_id', 'channel_url', 'channel_is_verified',
-        'channel_follower_count', 'comment_count', 'view_count', 'concurrent_view_count',
-        'like_count', 'dislike_count', 'repost_count', 'average_rating', 'age_limit', 'duration', 'thumbnail', 'heatmap',
-        'chapters', 'chapter', 'chapter_number', 'chapter_id', 'start_time', 'end_time', 'section_start', 'section_end',
-        'categories', 'tags', 'cast', 'composers', 'artists', 'album_artists', 'creators', 'genres',
-        'track', 'track_number', 'track_id', 'album', 'album_type', 'disc_number',
-        'series', 'series_id', 'season', 'season_number', 'season_id', 'episode', 'episode_number', 'episode_id',
-        'timestamp', 'upload_date', 'release_timestamp', 'release_date', 'release_year', 'modified_timestamp', 'modified_date',
-        'playable_in_embed', 'availability', 'live_status', 'location', 'license', '_old_archive_ids',
-    )
-
     expect_dict(self, got_dict, expected_dict)
     # Check for the presence of mandatory fields
     if got_dict.get('_type') not in ('playlist', 'multi_video'):
@@ -280,25 +246,19 @@ def expect_info_dict(self, got_dict, expected_dict):
         if expected_dict.get('ext'):
             mandatory_fields.extend(('url', 'ext'))
         for key in mandatory_fields:
-            self.assertTrue(got_dict.get(key), f'Missing mandatory field {key}')
+            self.assertTrue(got_dict.get(key), 'Missing mandatory field %s' % key)
     # Check for mandatory fields that are automatically set by YoutubeDL
     if got_dict.get('_type', 'video') == 'video':
         for key in ['webpage_url', 'extractor', 'extractor_key']:
-            self.assertTrue(got_dict.get(key), f'Missing field: {key}')
+            self.assertTrue(got_dict.get(key), 'Missing field: %s' % key)
 
     test_info_dict = sanitize_got_info_dict(got_dict)
 
-    # Check for invalid/misspelled field names being returned by the extractor
-    invalid_keys = sorted(test_info_dict.keys() - ALLOWED_KEYS_SORT_ORDER)
-    self.assertFalse(invalid_keys, f'Invalid fields returned by the extractor: {", ".join(invalid_keys)}')
-
-    missing_keys = sorted(
-        test_info_dict.keys() - expected_dict.keys(),
-        key=lambda x: ALLOWED_KEYS_SORT_ORDER.index(x))
+    missing_keys = set(test_info_dict.keys()) - set(expected_dict.keys())
     if missing_keys:
         def _repr(v):
             if isinstance(v, str):
-                return "'{}'".format(v.replace('\\', '\\\\').replace("'", "\\'").replace('\n', '\\n'))
+                return "'%s'" % v.replace('\\', '\\\\').replace("'", "\\'").replace('\n', '\\n')
             elif isinstance(v, type):
                 return v.__name__
             else:
@@ -315,7 +275,8 @@ def expect_info_dict(self, got_dict, expected_dict):
         write_string(info_dict_str.replace('\n', '\n        '), out=sys.stderr)
         self.assertFalse(
             missing_keys,
-            'Missing keys in test definition: {}'.format(', '.join(sorted(missing_keys))))
+            'Missing keys in test definition: %s' % (
+                ', '.join(sorted(missing_keys))))
 
 
 def assertRegexpMatches(self, text, regexp, msg=None):
@@ -324,9 +285,9 @@ def assertRegexpMatches(self, text, regexp, msg=None):
     else:
         m = re.match(regexp, text)
         if not m:
-            note = f'Regexp didn\'t match: {regexp!r} not found'
+            note = 'Regexp didn\'t match: %r not found' % (regexp)
             if len(text) < 1000:
-                note += f' in {text!r}'
+                note += ' in %r' % text
             if msg is None:
                 msg = note
             else:
@@ -349,7 +310,7 @@ def assertLessEqual(self, got, expected, msg=None):
 
 
 def assertEqual(self, got, expected, msg=None):
-    if got != expected:
+    if not (got == expected):
         if msg is None:
             msg = f'{got!r} not equal to {expected!r}'
         self.assertTrue(got == expected, msg)
@@ -377,8 +338,3 @@ def http_server_port(httpd):
 def verify_address_availability(address):
     if find_available_port(address) is None:
         pytest.skip(f'Unable to bind to source address {address} (address may not exist)')
-
-
-def validate_and_send(rh, req):
-    rh.validate(req)
-    return rh.send(req)

test/test_InfoExtractor.py

@@ -53,18 +53,6 @@ class TestInfoExtractor(unittest.TestCase):
     def test_ie_key(self):
         self.assertEqual(get_info_extractor(YoutubeIE.ie_key()), YoutubeIE)
 
-    def test_get_netrc_login_info(self):
-        for params in [
-            {'usenetrc': True, 'netrc_location': './test/testdata/netrc/netrc'},
-            {'netrc_cmd': f'{sys.executable} ./test/testdata/netrc/print_netrc.py'},
-        ]:
-            ie = DummyIE(FakeYDL(params))
-            self.assertEqual(ie._get_netrc_login_info(netrc_machine='normal_use'), ('user', 'pass'))
-            self.assertEqual(ie._get_netrc_login_info(netrc_machine='empty_user'), ('', 'pass'))
-            self.assertEqual(ie._get_netrc_login_info(netrc_machine='empty_pass'), ('user', ''))
-            self.assertEqual(ie._get_netrc_login_info(netrc_machine='both_empty'), ('', ''))
-            self.assertEqual(ie._get_netrc_login_info(netrc_machine='nonexistent'), (None, None))
-
     def test_html_search_regex(self):
         html = '<p id="foo">Watch this <a href="http://www.youtube.com/watch?v=BaW_jenozKc">video</a></p>'
         search = lambda re, *args: self.ie._html_search_regex(re, html, *args)
@@ -274,19 +262,19 @@ class TestInfoExtractor(unittest.TestCase):
                 ''',
                 {
                     'chapters': [
-                        {'title': 'Explosie Turnhout', 'start_time': 70, 'end_time': 440},
-                        {'title': 'Jaarwisseling', 'start_time': 440, 'end_time': 1179},
-                        {'title': 'Natuurbranden Colorado', 'start_time': 1179, 'end_time': 1263},
-                        {'title': 'Klimaatverandering', 'start_time': 1263, 'end_time': 1367},
-                        {'title': 'Zacht weer', 'start_time': 1367, 'end_time': 1383},
-                        {'title': 'Financiële balans', 'start_time': 1383, 'end_time': 1484},
-                        {'title': 'Club Brugge', 'start_time': 1484, 'end_time': 1575},
-                        {'title': 'Mentale gezondheid bij topsporters', 'start_time': 1575, 'end_time': 1728},
-                        {'title': 'Olympische Winterspelen', 'start_time': 1728, 'end_time': 1873},
-                        {'title': 'Sober oudjaar in Nederland', 'start_time': 1873, 'end_time': 2079.23},
+                        {"title": "Explosie Turnhout", "start_time": 70, "end_time": 440},
+                        {"title": "Jaarwisseling", "start_time": 440, "end_time": 1179},
+                        {"title": "Natuurbranden Colorado", "start_time": 1179, "end_time": 1263},
+                        {"title": "Klimaatverandering", "start_time": 1263, "end_time": 1367},
+                        {"title": "Zacht weer", "start_time": 1367, "end_time": 1383},
+                        {"title": "Financiële balans", "start_time": 1383, "end_time": 1484},
+                        {"title": "Club Brugge", "start_time": 1484, "end_time": 1575},
+                        {"title": "Mentale gezondheid bij topsporters", "start_time": 1575, "end_time": 1728},
+                        {"title": "Olympische Winterspelen", "start_time": 1728, "end_time": 1873},
+                        {"title": "Sober oudjaar in Nederland", "start_time": 1873, "end_time": 2079.23}
                     ],
-                    'title': 'Het journaal - Aflevering 365 (Seizoen 2021)',
-                }, {},
+                    'title': 'Het journaal - Aflevering 365 (Seizoen 2021)'
+                }, {}
             ),
             (
                 # test multiple thumbnails in a list
@@ -313,27 +301,13 @@ class TestInfoExtractor(unittest.TestCase):
                     'thumbnails': [{'url': 'https://www.rainews.it/cropgd/640x360/dl/img/2021/12/30/1640886376927_GettyImages.jpg'}],
                 },
                 {},
-            ),
-            (
-                # test thumbnail_url key without URL scheme
-                r'''
-<script type="application/ld+json">
-{
-"@context": "https://schema.org",
-"@type": "VideoObject",
-"thumbnail_url": "//www.nobelprize.org/images/12693-landscape-medium-gallery.jpg"
-}</script>''',
-                {
-                    'thumbnails': [{'url': 'https://www.nobelprize.org/images/12693-landscape-medium-gallery.jpg'}],
-                },
-                {},
-            ),
+            )
         ]
         for html, expected_dict, search_json_ld_kwargs in _TESTS:
             expect_dict(
                 self,
                 self.ie._search_json_ld(html, None, **search_json_ld_kwargs),
-                expected_dict,
+                expected_dict
             )
 
     def test_download_json(self):
@@ -392,7 +366,7 @@ class TestInfoExtractor(unittest.TestCase):
                     'height': 740,
                     'tbr': 1500,
                 }],
-                'thumbnail': '//pics.r18.com/digital/amateur/mgmr105/mgmr105jp.jpg',
+                'thumbnail': '//pics.r18.com/digital/amateur/mgmr105/mgmr105jp.jpg'
             })
 
         # from https://www.csfd.cz/
@@ -445,9 +419,9 @@ class TestInfoExtractor(unittest.TestCase):
                     'height': 1080,
                 }],
                 'subtitles': {
-                    'cs': [{'url': 'https://video.csfd.cz/files/subtitles/163/344/163344115_4c388b.srt'}],
+                    'cs': [{'url': 'https://video.csfd.cz/files/subtitles/163/344/163344115_4c388b.srt'}]
                 },
-                'thumbnail': 'https://img.csfd.cz/files/images/film/video/preview/163/344/163344118_748d20.png?h360',
+                'thumbnail': 'https://img.csfd.cz/files/images/film/video/preview/163/344/163344118_748d20.png?h360'
             })
 
         # from https://tamasha.com/v/Kkdjw
@@ -478,7 +452,7 @@ class TestInfoExtractor(unittest.TestCase):
                     'ext': 'mp4',
                     'format_id': '144p',
                     'height': 144,
-                }],
+                }]
             })
 
         # from https://www.directvnow.com
@@ -496,7 +470,7 @@ class TestInfoExtractor(unittest.TestCase):
                 'formats': [{
                     'ext': 'mp4',
                     'url': 'https://cdn.directv.com/content/dam/dtv/prod/website_directvnow-international/videos/DTVN_hdr_HBO_v3.mp4',
-                }],
+                }]
             })
 
         # from https://www.directvnow.com
@@ -514,7 +488,7 @@ class TestInfoExtractor(unittest.TestCase):
                 'formats': [{
                     'url': 'https://cdn.directv.com/content/dam/dtv/prod/website_directvnow-international/videos/DTVN_hdr_HBO_v3.mp4',
                     'ext': 'mp4',
-                }],
+                }]
             })
 
         # from https://www.klarna.com/uk/
@@ -573,8 +547,8 @@ class TestInfoExtractor(unittest.TestCase):
                 'id': 'XEgvuql4',
                 'formats': [{
                     'url': 'rtmp://192.138.214.154/live/sjclive',
-                    'ext': 'flv',
-                }],
+                    'ext': 'flv'
+                }]
             })
 
         # from https://www.pornoxo.com/videos/7564/striptease-from-sexy-secretary/
@@ -614,8 +588,8 @@ class TestInfoExtractor(unittest.TestCase):
                 'thumbnail': 'https://t03.vipstreamservice.com/thumbs/pxo-full/2009-12/14/a4b2157147afe5efa93ce1978e0265289c193874e02597.flv-full-13.jpg',
                 'formats': [{
                     'url': 'https://cdn.pornoxo.com/key=MF+oEbaxqTKb50P-w9G3nA,end=1489689259,ip=104.199.146.27/ip=104.199.146.27/speed=6573765/buffer=3.0/2009-12/4b2157147afe5efa93ce1978e0265289c193874e02597.flv',
-                    'ext': 'flv',
-                }],
+                    'ext': 'flv'
+                }]
             })
 
         # from http://www.indiedb.com/games/king-machine/videos
@@ -636,12 +610,12 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                 'formats': [{
                     'url': 'http://cdn.dbolical.com/cache/videos/games/1/50/49678/encode_mp4/king-machine-trailer.mp4',
                     'height': 360,
-                    'ext': 'mp4',
+                    'ext': 'mp4'
                 }, {
                     'url': 'http://cdn.dbolical.com/cache/videos/games/1/50/49678/encode720p_mp4/king-machine-trailer.mp4',
                     'height': 720,
-                    'ext': 'mp4',
-                }],
+                    'ext': 'mp4'
+                }]
             })
 
     def test_parse_m3u8_formats(self):
@@ -652,7 +626,6 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                 'img_bipbop_adv_example_fmp4',
                 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                 [{
-                    # 60kbps (bitrate not provided in m3u8); sorted as worst because it's grouped with lowest bitrate video track
                     'format_id': 'aud1-English',
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/a1/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
@@ -660,19 +633,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'ext': 'mp4',
                     'protocol': 'm3u8_native',
                     'audio_ext': 'mp4',
-                    'source_preference': 0,
                 }, {
-                    # 192kbps (bitrate not provided in m3u8)
-                    'format_id': 'aud3-English',
-                    'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/a3/prog_index.m3u8',
-                    'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
-                    'language': 'en',
-                    'ext': 'mp4',
-                    'protocol': 'm3u8_native',
-                    'audio_ext': 'mp4',
-                    'source_preference': 1,
-                }, {
-                    # 384kbps (bitrate not provided in m3u8); sorted as best because it's grouped with the highest bitrate video track
                     'format_id': 'aud2-English',
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/a2/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
@@ -680,7 +641,14 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'ext': 'mp4',
                     'protocol': 'm3u8_native',
                     'audio_ext': 'mp4',
-                    'source_preference': 2,
+                }, {
+                    'format_id': 'aud3-English',
+                    'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/a3/prog_index.m3u8',
+                    'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
+                    'language': 'en',
+                    'ext': 'mp4',
+                    'protocol': 'm3u8_native',
+                    'audio_ext': 'mp4',
                 }, {
                     'format_id': '530',
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v2/prog_index.m3u8',
@@ -898,7 +866,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'height': 1080,
                     'vcodec': 'avc1.64002a',
                 }],
-                {},
+                {}
             ),
             (
                 'bipbop_16x9',
@@ -1022,45 +990,45 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'en': [{
                         'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/subtitles/eng/prog_index.m3u8',
                         'ext': 'vtt',
-                        'protocol': 'm3u8_native',
+                        'protocol': 'm3u8_native'
                     }, {
                         'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/subtitles/eng_forced/prog_index.m3u8',
                         'ext': 'vtt',
-                        'protocol': 'm3u8_native',
+                        'protocol': 'm3u8_native'
                     }],
                     'fr': [{
                         'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/subtitles/fra/prog_index.m3u8',
                         'ext': 'vtt',
-                        'protocol': 'm3u8_native',
+                        'protocol': 'm3u8_native'
                     }, {
                         'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/subtitles/fra_forced/prog_index.m3u8',
                         'ext': 'vtt',
-                        'protocol': 'm3u8_native',
+                        'protocol': 'm3u8_native'
                     }],
                     'es': [{
                         'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/subtitles/spa/prog_index.m3u8',
                         'ext': 'vtt',
-                        'protocol': 'm3u8_native',
+                        'protocol': 'm3u8_native'
                     }, {
                         'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/subtitles/spa_forced/prog_index.m3u8',
                         'ext': 'vtt',
-                        'protocol': 'm3u8_native',
+                        'protocol': 'm3u8_native'
                     }],
                     'ja': [{
                         'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/subtitles/jpn/prog_index.m3u8',
                         'ext': 'vtt',
-                        'protocol': 'm3u8_native',
+                        'protocol': 'm3u8_native'
                     }, {
                         'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/subtitles/jpn_forced/prog_index.m3u8',
                         'ext': 'vtt',
-                        'protocol': 'm3u8_native',
+                        'protocol': 'm3u8_native'
                     }],
-                },
+                }
             ),
         ]
 
         for m3u8_file, m3u8_url, expected_formats, expected_subs in _TEST_CASES:
-            with open(f'./test/testdata/m3u8/{m3u8_file}.m3u8', encoding='utf-8') as f:
+            with open('./test/testdata/m3u8/%s.m3u8' % m3u8_file, encoding='utf-8') as f:
                 formats, subs = self.ie._parse_m3u8_formats_and_subtitles(
                     f.read(), m3u8_url, ext='mp4')
                 self.ie._sort_formats(formats)
@@ -1398,14 +1366,14 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                             'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
                             'fragment_base_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/dash/',
                             'protocol': 'http_dash_segments',
-                        },
-                    ],
+                        }
+                    ]
                 },
-            ),
+            )
         ]
 
         for mpd_file, mpd_url, mpd_base_url, expected_formats, expected_subtitles in _TEST_CASES:
-            with open(f'./test/testdata/mpd/{mpd_file}.mpd', encoding='utf-8') as f:
+            with open('./test/testdata/mpd/%s.mpd' % mpd_file, encoding='utf-8') as f:
                 formats, subtitles = self.ie._parse_mpd_formats_and_subtitles(
                     compat_etree_fromstring(f.read().encode()),
                     mpd_base_url=mpd_base_url, mpd_url=mpd_url)
@@ -1440,7 +1408,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                         'sampling_rate': 48000,
                         'channels': 2,
                         'bits_per_sample': 16,
-                        'nal_unit_length_field': 4,
+                        'nal_unit_length_field': 4
                     },
                 }, {
                     'format_id': 'video-100',
@@ -1463,7 +1431,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                         'codec_private_data': '00000001674D401FDA0544EFFC2D002CBC40000003004000000C03C60CA80000000168EF32C8',
                         'channels': 2,
                         'bits_per_sample': 16,
-                        'nal_unit_length_field': 4,
+                        'nal_unit_length_field': 4
                     },
                 }, {
                     'format_id': 'video-326',
@@ -1486,7 +1454,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                         'codec_private_data': '00000001674D401FDA0241FE23FFC3BC83BA44000003000400000300C03C60CA800000000168EF32C8',
                         'channels': 2,
                         'bits_per_sample': 16,
-                        'nal_unit_length_field': 4,
+                        'nal_unit_length_field': 4
                     },
                 }, {
                     'format_id': 'video-698',
@@ -1509,7 +1477,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                         'codec_private_data': '00000001674D401FDA0350BFB97FF06AF06AD1000003000100000300300F1832A00000000168EF32C8',
                         'channels': 2,
                         'bits_per_sample': 16,
-                        'nal_unit_length_field': 4,
+                        'nal_unit_length_field': 4
                     },
                 }, {
                     'format_id': 'video-1493',
@@ -1532,7 +1500,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                         'codec_private_data': '00000001674D401FDA011C3DE6FFF0D890D871000003000100000300300F1832A00000000168EF32C8',
                         'channels': 2,
                         'bits_per_sample': 16,
-                        'nal_unit_length_field': 4,
+                        'nal_unit_length_field': 4
                     },
                 }, {
                     'format_id': 'video-4482',
@@ -1555,7 +1523,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                         'codec_private_data': '00000001674D401FDA01A816F97FFC1ABC1AB440000003004000000C03C60CA80000000168EF32C8',
                         'channels': 2,
                         'bits_per_sample': 16,
-                        'nal_unit_length_field': 4,
+                        'nal_unit_length_field': 4
                     },
                 }],
                 {
@@ -1570,10 +1538,10 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                                 'duration': 8880746666,
                                 'timescale': 10000000,
                                 'fourcc': 'TTML',
-                                'codec_private_data': '',
-                            },
-                        },
-                    ],
+                                'codec_private_data': ''
+                            }
+                        }
+                    ]
                 },
             ),
             (
@@ -1603,7 +1571,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                         'sampling_rate': 48000,
                         'channels': 2,
                         'bits_per_sample': 16,
-                        'nal_unit_length_field': 4,
+                        'nal_unit_length_field': 4
                     },
                 }, {
                     'format_id': 'audio_deu_1-224',
@@ -1629,7 +1597,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                         'sampling_rate': 48000,
                         'channels': 6,
                         'bits_per_sample': 16,
-                        'nal_unit_length_field': 4,
+                        'nal_unit_length_field': 4
                     },
                 }, {
                     'format_id': 'video_deu-23',
@@ -1654,7 +1622,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                         'codec_private_data': '000000016742C00CDB06077E5C05A808080A00000300020000030009C0C02EE0177CC6300F142AE00000000168CA8DC8',
                         'channels': 2,
                         'bits_per_sample': 16,
-                        'nal_unit_length_field': 4,
+                        'nal_unit_length_field': 4
                     },
                 }, {
                     'format_id': 'video_deu-403',
@@ -1679,7 +1647,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                         'codec_private_data': '00000001674D4014E98323B602D4040405000003000100000300320F1429380000000168EAECF2',
                         'channels': 2,
                         'bits_per_sample': 16,
-                        'nal_unit_length_field': 4,
+                        'nal_unit_length_field': 4
                     },
                 }, {
                     'format_id': 'video_deu-680',
@@ -1704,7 +1672,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                         'codec_private_data': '00000001674D401EE981405FF2E02D4040405000000300100000030320F162D3800000000168EAECF2',
                         'channels': 2,
                         'bits_per_sample': 16,
-                        'nal_unit_length_field': 4,
+                        'nal_unit_length_field': 4
                     },
                 }, {
                     'format_id': 'video_deu-1253',
@@ -1730,7 +1698,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                         'codec_private_data': '00000001674D401EE981405FF2E02D4040405000000300100000030320F162D3800000000168EAECF2',
                         'channels': 2,
                         'bits_per_sample': 16,
-                        'nal_unit_length_field': 4,
+                        'nal_unit_length_field': 4
                     },
                 }, {
                     'format_id': 'video_deu-2121',
@@ -1755,7 +1723,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                         'codec_private_data': '00000001674D401EECA0601BD80B50101014000003000400000300C83C58B6580000000168E93B3C80',
                         'channels': 2,
                         'bits_per_sample': 16,
-                        'nal_unit_length_field': 4,
+                        'nal_unit_length_field': 4
                     },
                 }, {
                     'format_id': 'video_deu-3275',
@@ -1780,7 +1748,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                         'codec_private_data': '00000001674D4020ECA02802DD80B501010140000003004000000C83C60C65800000000168E93B3C80',
                         'channels': 2,
                         'bits_per_sample': 16,
-                        'nal_unit_length_field': 4,
+                        'nal_unit_length_field': 4
                     },
                 }, {
                     'format_id': 'video_deu-5300',
@@ -1805,7 +1773,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                         'codec_private_data': '00000001674D4028ECA03C0113F2E02D4040405000000300100000030320F18319600000000168E93B3C80',
                         'channels': 2,
                         'bits_per_sample': 16,
-                        'nal_unit_length_field': 4,
+                        'nal_unit_length_field': 4
                     },
                 }, {
                     'format_id': 'video_deu-8079',
@@ -1830,7 +1798,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                         'codec_private_data': '00000001674D4028ECA03C0113F2E02D4040405000000300100000030320F18319600000000168E93B3C80',
                         'channels': 2,
                         'bits_per_sample': 16,
-                        'nal_unit_length_field': 4,
+                        'nal_unit_length_field': 4
                     },
                 }],
                 {},
@@ -1838,7 +1806,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
         ]
 
         for ism_file, ism_url, expected_formats, expected_subtitles in _TEST_CASES:
-            with open(f'./test/testdata/ism/{ism_file}.Manifest', encoding='utf-8') as f:
+            with open('./test/testdata/ism/%s.Manifest' % ism_file, encoding='utf-8') as f:
                 formats, subtitles = self.ie._parse_ism_formats_and_subtitles(
                     compat_etree_fromstring(f.read().encode()), ism_url=ism_url)
                 self.ie._sort_formats(formats)
@@ -1859,12 +1827,12 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'tbr': 2148,
                     'width': 1280,
                     'height': 720,
-                }],
+                }]
             ),
         ]
 
         for f4m_file, f4m_url, expected_formats in _TEST_CASES:
-            with open(f'./test/testdata/f4m/{f4m_file}.f4m', encoding='utf-8') as f:
+            with open('./test/testdata/f4m/%s.f4m' % f4m_file, encoding='utf-8') as f:
                 formats = self.ie._parse_f4m_formats(
                     compat_etree_fromstring(f.read().encode()),
                     f4m_url, None)
@@ -1905,13 +1873,13 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     }, {
                         'manifest_url': 'https://example.org/src/foo_xspf.xspf',
                         'url': 'https://example.com/track3.mp3',
-                    }],
-                }],
+                    }]
+                }]
             ),
         ]
 
         for xspf_file, xspf_url, expected_entries in _TEST_CASES:
-            with open(f'./test/testdata/xspf/{xspf_file}.xspf', encoding='utf-8') as f:
+            with open('./test/testdata/xspf/%s.xspf' % xspf_file, encoding='utf-8') as f:
                 entries = self.ie._parse_xspf(
                     compat_etree_fromstring(f.read().encode()),
                     xspf_file, xspf_url=xspf_url, xspf_base_url=xspf_url)
@@ -1934,150 +1902,10 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
         server_thread.start()
 
         (content, urlh) = self.ie._download_webpage_handle(
-            f'http://127.0.0.1:{port}/teapot', None,
+            'http://127.0.0.1:%d/teapot' % port, None,
             expected_status=TEAPOT_RESPONSE_STATUS)
         self.assertEqual(content, TEAPOT_RESPONSE_BODY)
 
-    def test_search_nextjs_data(self):
-        data = '<script id="__NEXT_DATA__" type="application/json">{"props":{}}</script>'
-        self.assertEqual(self.ie._search_nextjs_data(data, None), {'props': {}})
-        self.assertEqual(self.ie._search_nextjs_data('', None, fatal=False), {})
-        self.assertEqual(self.ie._search_nextjs_data('', None, default=None), None)
-        self.assertEqual(self.ie._search_nextjs_data('', None, default={}), {})
-        with self.assertWarns(DeprecationWarning):
-            self.assertEqual(self.ie._search_nextjs_data('', None, default='{}'), {})
-
-    def test_search_nuxt_json(self):
-        HTML_TMPL = '<script data-ssr="true" id="__NUXT_DATA__" type="application/json">[{}]</script>'
-        VALID_DATA = '''
-            ["ShallowReactive",1],
-            {"data":2,"state":21,"once":25,"_errors":28,"_server_errors":30},
-            ["ShallowReactive",3],
-            {"$abcdef123456":4},
-            {"podcast":5,"activeEpisodeData":7},
-            {"podcast":6,"seasons":14},
-            {"title":10,"id":11},
-            ["Reactive",8],
-            {"episode":9,"creators":18,"empty_list":20},
-            {"title":12,"id":13,"refs":34,"empty_refs":35},
-            "Series Title",
-            "podcast-id-01",
-            "Episode Title",
-            "episode-id-99",
-            [15,16,17],
-            1,
-            2,
-            3,
-            [19],
-            "Podcast Creator",
-            [],
-            {"$ssite-config":22},
-            {"env":23,"name":24,"map":26,"numbers":14},
-            "production",
-            "podcast-website",
-            ["Set"],
-            ["Reactive",27],
-            ["Map"],
-            ["ShallowReactive",29],
-            {},
-            ["NuxtError",31],
-            {"status":32,"message":33},
-            503,
-            "Service Unavailable",
-            [36,37],
-            [38,39],
-            ["Ref",40],
-            ["ShallowRef",41],
-            ["EmptyRef",42],
-            ["EmptyShallowRef",43],
-            "ref",
-            "shallow_ref",
-            "{\\"ref\\":1}",
-            "{\\"shallow_ref\\":2}"
-        '''
-        PAYLOAD = {
-            'data': {
-                '$abcdef123456': {
-                    'podcast': {
-                        'podcast': {
-                            'title': 'Series Title',
-                            'id': 'podcast-id-01',
-                        },
-                        'seasons': [1, 2, 3],
-                    },
-                    'activeEpisodeData': {
-                        'episode': {
-                            'title': 'Episode Title',
-                            'id': 'episode-id-99',
-                            'refs': ['ref', 'shallow_ref'],
-                            'empty_refs': [{'ref': 1}, {'shallow_ref': 2}],
-                        },
-                        'creators': ['Podcast Creator'],
-                        'empty_list': [],
-                    },
-                },
-            },
-            'state': {
-                '$ssite-config': {
-                    'env': 'production',
-                    'name': 'podcast-website',
-                    'map': [],
-                    'numbers': [1, 2, 3],
-                },
-            },
-            'once': [],
-            '_errors': {},
-            '_server_errors': {
-                'status': 503,
-                'message': 'Service Unavailable',
-            },
-        }
-        PARTIALLY_INVALID = [(
-            '''
-            {"data":1},
-            {"invalid_raw_list":2},
-            [15,16,17]
-            ''',
-            {'data': {'invalid_raw_list': [None, None, None]}},
-        ), (
-            '''
-            {"data":1},
-            ["EmptyRef",2],
-            "not valid JSON"
-            ''',
-            {'data': None},
-        ), (
-            '''
-            {"data":1},
-            ["EmptyShallowRef",2],
-            "not valid JSON"
-            ''',
-            {'data': None},
-        )]
-        INVALID = [
-            '''
-                []
-            ''',
-            '''
-                ["unsupported",1],
-                {"data":2},
-                {}
-            ''',
-        ]
-        DEFAULT = object()
-
-        self.assertEqual(self.ie._search_nuxt_json(HTML_TMPL.format(VALID_DATA), None), PAYLOAD)
-        self.assertEqual(self.ie._search_nuxt_json('', None, fatal=False), {})
-        self.assertIs(self.ie._search_nuxt_json('', None, default=DEFAULT), DEFAULT)
-
-        for data, expected in PARTIALLY_INVALID:
-            self.assertEqual(
-                self.ie._search_nuxt_json(HTML_TMPL.format(data), None, fatal=False), expected)
-
-        for data in INVALID:
-            self.assertIs(
-                self.ie._search_nuxt_json(HTML_TMPL.format(data), None, default=DEFAULT), DEFAULT)
-
 
 if __name__ == '__main__':
     unittest.main()

test/test_YoutubeDL.py

@@ -4,19 +4,16 @@
 import os
 import sys
 import unittest
-from unittest.mock import patch
-
-from yt_dlp.globals import all_plugins_loaded
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
-import contextlib
 import copy
 import json
 
 from test.helper import FakeYDL, assertRegexpMatches, try_rm
 from yt_dlp import YoutubeDL
+from yt_dlp.compat import compat_os_name
 from yt_dlp.extractor import YoutubeIE
 from yt_dlp.extractor.common import InfoExtractor
 from yt_dlp.postprocessor.common import PostProcessor
@@ -132,8 +129,8 @@ class TestFormatSelection(unittest.TestCase):
                 'allow_multiple_audio_streams': multi,
             })
             ydl.process_ie_result(info_dict.copy())
-            downloaded = [x['format_id'] for x in ydl.downloaded_info_dicts]
-            self.assertEqual(downloaded, list(expected))
+            downloaded = map(lambda x: x['format_id'], ydl.downloaded_info_dicts)
+            self.assertEqual(list(downloaded), list(expected))
 
         test('20/47', '47')
         test('20/71/worst', '35')
@@ -186,7 +183,7 @@ class TestFormatSelection(unittest.TestCase):
         ]
 
         info_dict = _make_result(formats)
-        ydl = YDL({'format': 'best', 'format_sort': ['abr', 'ext']})
+        ydl = YDL({'format': 'best'})
         ydl.sort_formats(info_dict)
         ydl.process_ie_result(copy.deepcopy(info_dict))
         downloaded = ydl.downloaded_info_dicts[0]
@@ -198,7 +195,7 @@ class TestFormatSelection(unittest.TestCase):
         downloaded = ydl.downloaded_info_dicts[0]
         self.assertEqual(downloaded['format_id'], 'mp3-64')
 
-        ydl = YDL({'prefer_free_formats': True, 'format_sort': ['abr', 'ext']})
+        ydl = YDL({'prefer_free_formats': True})
         ydl.sort_formats(info_dict)
         ydl.process_ie_result(copy.deepcopy(info_dict))
         downloaded = ydl.downloaded_info_dicts[0]
@@ -237,35 +234,6 @@ class TestFormatSelection(unittest.TestCase):
         downloaded = ydl.downloaded_info_dicts[0]
         self.assertEqual(downloaded['format_id'], 'vid-vcodec-dot')
 
-    def test_format_selection_by_vcodec_sort(self):
-        formats = [
-            {'format_id': 'av1-format', 'ext': 'mp4', 'vcodec': 'av1', 'acodec': 'none', 'url': TEST_URL},
-            {'format_id': 'vp9-hdr-format', 'ext': 'mp4', 'vcodec': 'vp09.02.50.10.01.09.18.09.00', 'acodec': 'none', 'url': TEST_URL},
-            {'format_id': 'vp9-sdr-format', 'ext': 'mp4', 'vcodec': 'vp09.00.50.08', 'acodec': 'none', 'url': TEST_URL},
-            {'format_id': 'h265-format', 'ext': 'mp4', 'vcodec': 'h265', 'acodec': 'none', 'url': TEST_URL},
-        ]
-        info_dict = _make_result(formats)
-
-        ydl = YDL({'format': 'bestvideo', 'format_sort': ['vcodec:vp9.2']})
-        ydl.process_ie_result(info_dict.copy())
-        downloaded = ydl.downloaded_info_dicts[0]
-        self.assertEqual(downloaded['format_id'], 'vp9-hdr-format')
-
-        ydl = YDL({'format': 'bestvideo', 'format_sort': ['vcodec:vp9']})
-        ydl.process_ie_result(info_dict.copy())
-        downloaded = ydl.downloaded_info_dicts[0]
-        self.assertEqual(downloaded['format_id'], 'vp9-sdr-format')
-
-        ydl = YDL({'format': 'bestvideo', 'format_sort': ['+vcodec:vp9.2']})
-        ydl.process_ie_result(info_dict.copy())
-        downloaded = ydl.downloaded_info_dicts[0]
-        self.assertEqual(downloaded['format_id'], 'vp9-hdr-format')
-
-        ydl = YDL({'format': 'bestvideo', 'format_sort': ['+vcodec:vp9']})
-        ydl.process_ie_result(info_dict.copy())
-        downloaded = ydl.downloaded_info_dicts[0]
-        self.assertEqual(downloaded['format_id'], 'vp9-sdr-format')
-
     def test_format_selection_string_ops(self):
         formats = [
             {'format_id': 'abc-cba', 'ext': 'mp4', 'url': TEST_URL},
@@ -488,11 +456,11 @@ class TestFormatSelection(unittest.TestCase):
 
     def test_format_filtering(self):
         formats = [
-            {'format_id': 'A', 'filesize': 500, 'width': 1000, 'aspect_ratio': 1.0},
-            {'format_id': 'B', 'filesize': 1000, 'width': 500, 'aspect_ratio': 1.33},
-            {'format_id': 'C', 'filesize': 1000, 'width': 400, 'aspect_ratio': 1.5},
-            {'format_id': 'D', 'filesize': 2000, 'width': 600, 'aspect_ratio': 1.78},
-            {'format_id': 'E', 'filesize': 3000, 'aspect_ratio': 0.56},
+            {'format_id': 'A', 'filesize': 500, 'width': 1000},
+            {'format_id': 'B', 'filesize': 1000, 'width': 500},
+            {'format_id': 'C', 'filesize': 1000, 'width': 400},
+            {'format_id': 'D', 'filesize': 2000, 'width': 600},
+            {'format_id': 'E', 'filesize': 3000},
             {'format_id': 'F'},
             {'format_id': 'G', 'filesize': 1000000},
         ]
@@ -547,76 +515,27 @@ class TestFormatSelection(unittest.TestCase):
         self.assertEqual(downloaded_ids, ['D', 'C', 'B'])
 
         ydl = YDL({'format': 'best[height<40]'})
-        with contextlib.suppress(ExtractorError):
+        try:
             ydl.process_ie_result(info_dict)
+        except ExtractorError:
+            pass
         self.assertEqual(ydl.downloaded_info_dicts, [])
 
-        ydl = YDL({'format': 'best[aspect_ratio=1]'})
-        ydl.process_ie_result(info_dict)
-        downloaded = ydl.downloaded_info_dicts[0]
-        self.assertEqual(downloaded['format_id'], 'A')
-
-        ydl = YDL({'format': 'all[aspect_ratio > 1.00]'})
-        ydl.process_ie_result(info_dict)
-        downloaded_ids = [info['format_id'] for info in ydl.downloaded_info_dicts]
-        self.assertEqual(downloaded_ids, ['D', 'C', 'B'])
-
-        ydl = YDL({'format': 'all[aspect_ratio < 1.00]'})
-        ydl.process_ie_result(info_dict)
-        downloaded_ids = [info['format_id'] for info in ydl.downloaded_info_dicts]
-        self.assertEqual(downloaded_ids, ['E'])
-
-        ydl = YDL({'format': 'best[aspect_ratio=1.5]'})
-        ydl.process_ie_result(info_dict)
-        downloaded = ydl.downloaded_info_dicts[0]
-        self.assertEqual(downloaded['format_id'], 'C')
-
-        ydl = YDL({'format': 'all[aspect_ratio!=1]'})
-        ydl.process_ie_result(info_dict)
-        downloaded_ids = [info['format_id'] for info in ydl.downloaded_info_dicts]
-        self.assertEqual(downloaded_ids, ['E', 'D', 'C', 'B'])
-
-    @patch('yt_dlp.postprocessor.ffmpeg.FFmpegMergerPP.available', False)
-    def test_default_format_spec_without_ffmpeg(self):
-        ydl = YDL({})
-        self.assertEqual(ydl._default_format_spec({}), 'best/bestvideo+bestaudio')
-
+    def test_default_format_spec(self):
         ydl = YDL({'simulate': True})
-        self.assertEqual(ydl._default_format_spec({}), 'best/bestvideo+bestaudio')
+        self.assertEqual(ydl._default_format_spec({}), 'bestvideo*+bestaudio/best')
 
         ydl = YDL({})
         self.assertEqual(ydl._default_format_spec({'is_live': True}), 'best/bestvideo+bestaudio')
 
         ydl = YDL({'simulate': True})
-        self.assertEqual(ydl._default_format_spec({'is_live': True}), 'best/bestvideo+bestaudio')
+        self.assertEqual(ydl._default_format_spec({'is_live': True}), 'bestvideo*+bestaudio/best')
 
         ydl = YDL({'outtmpl': '-'})
         self.assertEqual(ydl._default_format_spec({}), 'best/bestvideo+bestaudio')
 
         ydl = YDL({})
-        self.assertEqual(ydl._default_format_spec({}), 'best/bestvideo+bestaudio')
-        self.assertEqual(ydl._default_format_spec({'is_live': True}), 'best/bestvideo+bestaudio')
-
-    @patch('yt_dlp.postprocessor.ffmpeg.FFmpegMergerPP.available', True)
-    @patch('yt_dlp.postprocessor.ffmpeg.FFmpegMergerPP.can_merge', lambda _: True)
-    def test_default_format_spec_with_ffmpeg(self):
-        ydl = YDL({})
-        self.assertEqual(ydl._default_format_spec({}), 'bestvideo*+bestaudio/best')
-
-        ydl = YDL({'simulate': True})
-        self.assertEqual(ydl._default_format_spec({}), 'bestvideo*+bestaudio/best')
-
-        ydl = YDL({})
-        self.assertEqual(ydl._default_format_spec({'is_live': True}), 'best/bestvideo+bestaudio')
-
-        ydl = YDL({'simulate': True})
-        self.assertEqual(ydl._default_format_spec({'is_live': True}), 'best/bestvideo+bestaudio')
-
-        ydl = YDL({'outtmpl': '-'})
-        self.assertEqual(ydl._default_format_spec({}), 'best/bestvideo+bestaudio')
-
-        ydl = YDL({})
-        self.assertEqual(ydl._default_format_spec({}), 'bestvideo*+bestaudio/best')
+        self.assertEqual(ydl._default_format_spec({}, download=False), 'bestvideo*+bestaudio/best')
         self.assertEqual(ydl._default_format_spec({'is_live': True}), 'best/bestvideo+bestaudio')
 
 
@@ -733,8 +652,8 @@ class TestYoutubeDL(unittest.TestCase):
         'formats': [
             {'id': 'id 1', 'height': 1080, 'width': 1920},
             {'id': 'id 2', 'height': 720},
-            {'id': 'id 3'},
-        ],
+            {'id': 'id 3'}
+        ]
     }
 
     def test_prepare_outtmpl_and_filename(self):
@@ -788,13 +707,6 @@ class TestYoutubeDL(unittest.TestCase):
         test('%(width)06d.%%(ext)s', 'NA.%(ext)s')
         test('%%(width)06d.%(ext)s', '%(width)06d.mp4')
 
-        # Sanitization options
-        test('%(title3)s', (None, 'foo⧸bar⧹test'))
-        test('%(title5)s', (None, 'aei_A'), restrictfilenames=True)
-        test('%(title3)s', (None, 'foo_bar_test'), windowsfilenames=False, restrictfilenames=True)
-        if sys.platform != 'win32':
-            test('%(title3)s', (None, 'foo⧸bar\\test'), windowsfilenames=False)
-
         # ID sanitization
         test('%(id)s', '_abcd', info={'id': '_abcd'})
         test('%(some_id)s', '_abcd', info={'some_id': '_abcd'})
@@ -861,7 +773,7 @@ class TestYoutubeDL(unittest.TestCase):
         test('%(formats)j', (json.dumps(FORMATS), None))
         test('%(formats)#j', (
             json.dumps(FORMATS, indent=4),
-            json.dumps(FORMATS, indent=4).replace(':', '：').replace('"', '＂').replace('\n', ' '),
+            json.dumps(FORMATS, indent=4).replace(':', '：').replace('"', "＂").replace('\n', ' ')
         ))
         test('%(title5).3B', 'á')
         test('%(title5)U', 'áéí 𝐀')
@@ -872,8 +784,8 @@ class TestYoutubeDL(unittest.TestCase):
         test('%(filesize)#D', '1Ki')
         test('%(height)5.2D', ' 1.08k')
         test('%(title4)#S', 'foo_bar_test')
-        test('%(title4).10S', ('foo ＂bar＂ ', 'foo ＂bar＂' + ('#' if os.name == 'nt' else ' ')))
-        if os.name == 'nt':
+        test('%(title4).10S', ('foo ＂bar＂ ', 'foo ＂bar＂' + ('#' if compat_os_name == 'nt' else ' ')))
+        if compat_os_name == 'nt':
             test('%(title4)q', ('"foo ""bar"" test"', None))
             test('%(formats.:.id)#q', ('"id 1" "id 2" "id 3"', None))
             test('%(formats.0.id)#q', ('"id 1"', None))
@@ -931,14 +843,14 @@ class TestYoutubeDL(unittest.TestCase):
 
         # Empty filename
         test('%(foo|)s-%(bar|)s.%(ext)s', '-.mp4')
-        # test('%(foo|)s.%(ext)s', ('.mp4', '_.mp4'))  # FIXME: ?
-        # test('%(foo|)s', ('', '_'))  # FIXME: ?
+        # test('%(foo|)s.%(ext)s', ('.mp4', '_.mp4'))  # fixme
+        # test('%(foo|)s', ('', '_'))  # fixme
 
         # Environment variable expansion for prepare_filename
         os.environ['__yt_dlp_var'] = 'expanded'
-        envvar = '%__yt_dlp_var%' if os.name == 'nt' else '$__yt_dlp_var'
+        envvar = '%__yt_dlp_var%' if compat_os_name == 'nt' else '$__yt_dlp_var'
         test(envvar, (envvar, 'expanded'))
-        if os.name == 'nt':
+        if compat_os_name == 'nt':
             test('%s%', ('%s%', '%s%'))
             os.environ['s'] = 'expanded'
             test('%s%', ('%s%', 'expanded'))  # %s% should be expanded before escaping %s
@@ -949,7 +861,7 @@ class TestYoutubeDL(unittest.TestCase):
         test('Hello %(title1)s', 'Hello $PATH')
         test('Hello %(title2)s', 'Hello %PATH%')
         test('%(title3)s', ('foo/bar\\test', 'foo⧸bar⧹test'))
-        test('folder/%(title3)s', ('folder/foo/bar\\test', f'folder{os.path.sep}foo⧸bar⧹test'))
+        test('folder/%(title3)s', ('folder/foo/bar\\test', 'folder%sfoo⧸bar⧹test' % os.path.sep))
 
     def test_format_note(self):
         ydl = YoutubeDL()
@@ -971,22 +883,22 @@ class TestYoutubeDL(unittest.TestCase):
                     f.write('EXAMPLE')
                 return [info['filepath']], info
 
-        def run_pp(params, pp):
+        def run_pp(params, PP):
             with open(filename, 'w') as f:
                 f.write('EXAMPLE')
             ydl = YoutubeDL(params)
-            ydl.add_post_processor(pp())
+            ydl.add_post_processor(PP())
             ydl.post_process(filename, {'filepath': filename})
 
         run_pp({'keepvideo': True}, SimplePP)
-        self.assertTrue(os.path.exists(filename), f'{filename} doesn\'t exist')
-        self.assertTrue(os.path.exists(audiofile), f'{audiofile} doesn\'t exist')
+        self.assertTrue(os.path.exists(filename), '%s doesn\'t exist' % filename)
+        self.assertTrue(os.path.exists(audiofile), '%s doesn\'t exist' % audiofile)
         os.unlink(filename)
         os.unlink(audiofile)
 
         run_pp({'keepvideo': False}, SimplePP)
-        self.assertFalse(os.path.exists(filename), f'{filename} exists')
-        self.assertTrue(os.path.exists(audiofile), f'{audiofile} doesn\'t exist')
+        self.assertFalse(os.path.exists(filename), '%s exists' % filename)
+        self.assertTrue(os.path.exists(audiofile), '%s doesn\'t exist' % audiofile)
         os.unlink(audiofile)
 
         class ModifierPP(PostProcessor):
@@ -996,7 +908,7 @@ class TestYoutubeDL(unittest.TestCase):
                 return [], info
 
         run_pp({'keepvideo': False}, ModifierPP)
-        self.assertTrue(os.path.exists(filename), f'{filename} doesn\'t exist')
+        self.assertTrue(os.path.exists(filename), '%s doesn\'t exist' % filename)
         os.unlink(filename)
 
     def test_match_filter(self):
@@ -1008,7 +920,7 @@ class TestYoutubeDL(unittest.TestCase):
             'duration': 30,
             'filesize': 10 * 1024,
             'playlist_id': '42',
-            'uploader': '變態妍字幕版 太妍 тест',
+            'uploader': "變態妍字幕版 太妍 тест",
             'creator': "тест ' 123 ' тест--",
             'webpage_url': 'http://example.com/watch?v=shenanigans',
         }
@@ -1021,7 +933,7 @@ class TestYoutubeDL(unittest.TestCase):
             'description': 'foo',
             'filesize': 5 * 1024,
             'playlist_id': '43',
-            'uploader': 'тест 123',
+            'uploader': "тест 123",
             'webpage_url': 'http://example.com/watch?v=SHENANIGANS',
         }
         videos = [first, second]
@@ -1268,7 +1180,7 @@ class TestYoutubeDL(unittest.TestCase):
                     })
                 return {
                     'id': video_id,
-                    'title': f'Video {video_id}',
+                    'title': 'Video %s' % video_id,
                     'formats': formats,
                 }
 
@@ -1282,8 +1194,8 @@ class TestYoutubeDL(unittest.TestCase):
                         '_type': 'url_transparent',
                         'ie_key': VideoIE.ie_key(),
                         'id': video_id,
-                        'url': f'video:{video_id}',
-                        'title': f'Video Transparent {video_id}',
+                        'url': 'video:%s' % video_id,
+                        'title': 'Video Transparent %s' % video_id,
                     }
 
             def _real_extract(self, url):
@@ -1429,33 +1341,6 @@ class TestYoutubeDL(unittest.TestCase):
         self.assertFalse(result.get('cookies'), msg='Cookies set in cookies field for wrong domain')
         self.assertFalse(ydl.cookiejar.get_cookie_header(fmt['url']), msg='Cookies set in cookiejar for wrong domain')
 
-    def test_load_plugins_compat(self):
-        # Should try to reload plugins if they haven't already been loaded
-        all_plugins_loaded.value = False
-        FakeYDL().close()
-        assert all_plugins_loaded.value
-
-    def test_close_hooks(self):
-        # Should call all registered close hooks on close
-        close_hook_called = False
-        close_hook_two_called = False
-
-        def close_hook():
-            nonlocal close_hook_called
-            close_hook_called = True
-
-        def close_hook_two():
-            nonlocal close_hook_two_called
-            close_hook_two_called = True
-
-        ydl = FakeYDL()
-        ydl.add_close_hook(close_hook)
-        ydl.add_close_hook(close_hook_two)
-
-        ydl.close()
-        self.assertTrue(close_hook_called, 'Close hook was not called')
-        self.assertTrue(close_hook_two_called, 'Close hook two was not called')
-
 
 if __name__ == '__main__':
     unittest.main()

test/test_aes.py

@@ -27,6 +27,7 @@ from yt_dlp.aes import (
     pad_block,
 )
 from yt_dlp.dependencies import Cryptodome
+from yt_dlp.utils import bytes_to_intlist, intlist_to_bytes
 
 # the encrypted data can be generate with 'devscripts/generate_aes_testdata.py'
 
@@ -39,33 +40,33 @@ class TestAES(unittest.TestCase):
     def test_encrypt(self):
         msg = b'message'
         key = list(range(16))
-        encrypted = aes_encrypt(list(msg), key)
-        decrypted = bytes(aes_decrypt(encrypted, key))
+        encrypted = aes_encrypt(bytes_to_intlist(msg), key)
+        decrypted = intlist_to_bytes(aes_decrypt(encrypted, key))
         self.assertEqual(decrypted, msg)
 
     def test_cbc_decrypt(self):
         data = b'\x97\x92+\xe5\x0b\xc3\x18\x91ky9m&\xb3\xb5@\xe6\x27\xc2\x96.\xc8u\x88\xab9-[\x9e|\xf1\xcd'
-        decrypted = bytes(aes_cbc_decrypt(list(data), self.key, self.iv))
+        decrypted = intlist_to_bytes(aes_cbc_decrypt(bytes_to_intlist(data), self.key, self.iv))
         self.assertEqual(decrypted.rstrip(b'\x08'), self.secret_msg)
         if Cryptodome.AES:
-            decrypted = aes_cbc_decrypt_bytes(data, bytes(self.key), bytes(self.iv))
+            decrypted = aes_cbc_decrypt_bytes(data, intlist_to_bytes(self.key), intlist_to_bytes(self.iv))
             self.assertEqual(decrypted.rstrip(b'\x08'), self.secret_msg)
 
     def test_cbc_encrypt(self):
-        data = list(self.secret_msg)
-        encrypted = bytes(aes_cbc_encrypt(data, self.key, self.iv))
+        data = bytes_to_intlist(self.secret_msg)
+        encrypted = intlist_to_bytes(aes_cbc_encrypt(data, self.key, self.iv))
         self.assertEqual(
             encrypted,
             b'\x97\x92+\xe5\x0b\xc3\x18\x91ky9m&\xb3\xb5@\xe6\'\xc2\x96.\xc8u\x88\xab9-[\x9e|\xf1\xcd')
 
     def test_ctr_decrypt(self):
-        data = list(b'\x03\xc7\xdd\xd4\x8e\xb3\xbc\x1a*O\xdc1\x12+8Aio\xd1z\xb5#\xaf\x08')
-        decrypted = bytes(aes_ctr_decrypt(data, self.key, self.iv))
+        data = bytes_to_intlist(b'\x03\xc7\xdd\xd4\x8e\xb3\xbc\x1a*O\xdc1\x12+8Aio\xd1z\xb5#\xaf\x08')
+        decrypted = intlist_to_bytes(aes_ctr_decrypt(data, self.key, self.iv))
         self.assertEqual(decrypted.rstrip(b'\x08'), self.secret_msg)
 
     def test_ctr_encrypt(self):
-        data = list(self.secret_msg)
-        encrypted = bytes(aes_ctr_encrypt(data, self.key, self.iv))
+        data = bytes_to_intlist(self.secret_msg)
+        encrypted = intlist_to_bytes(aes_ctr_encrypt(data, self.key, self.iv))
         self.assertEqual(
             encrypted,
             b'\x03\xc7\xdd\xd4\x8e\xb3\xbc\x1a*O\xdc1\x12+8Aio\xd1z\xb5#\xaf\x08')
@@ -74,59 +75,47 @@ class TestAES(unittest.TestCase):
         data = b'\x159Y\xcf5eud\x90\x9c\x85&]\x14\x1d\x0f.\x08\xb4T\xe4/\x17\xbd'
         authentication_tag = b'\xe8&I\x80rI\x07\x9d}YWuU@:e'
 
-        decrypted = bytes(aes_gcm_decrypt_and_verify(
-            list(data), self.key, list(authentication_tag), self.iv[:12]))
+        decrypted = intlist_to_bytes(aes_gcm_decrypt_and_verify(
+            bytes_to_intlist(data), self.key, bytes_to_intlist(authentication_tag), self.iv[:12]))
         self.assertEqual(decrypted.rstrip(b'\x08'), self.secret_msg)
         if Cryptodome.AES:
             decrypted = aes_gcm_decrypt_and_verify_bytes(
-                data, bytes(self.key), authentication_tag, bytes(self.iv[:12]))
+                data, intlist_to_bytes(self.key), authentication_tag, intlist_to_bytes(self.iv[:12]))
             self.assertEqual(decrypted.rstrip(b'\x08'), self.secret_msg)
 
-    def test_gcm_aligned_decrypt(self):
-        data = b'\x159Y\xcf5eud\x90\x9c\x85&]\x14\x1d\x0f'
-        authentication_tag = b'\x08\xb1\x9d!&\x98\xd0\xeaRq\x90\xe6;\xb5]\xd8'
-
-        decrypted = bytes(aes_gcm_decrypt_and_verify(
-            list(data), self.key, list(authentication_tag), self.iv[:12]))
-        self.assertEqual(decrypted.rstrip(b'\x08'), self.secret_msg[:16])
-        if Cryptodome.AES:
-            decrypted = aes_gcm_decrypt_and_verify_bytes(
-                data, bytes(self.key), authentication_tag, bytes(self.iv[:12]))
-            self.assertEqual(decrypted.rstrip(b'\x08'), self.secret_msg[:16])
-
     def test_decrypt_text(self):
-        password = bytes(self.key).decode()
+        password = intlist_to_bytes(self.key).decode()
         encrypted = base64.b64encode(
-            bytes(self.iv[:8])
-            + b'\x17\x15\x93\xab\x8d\x80V\xcdV\xe0\t\xcdo\xc2\xa5\xd8ksM\r\xe27N\xae',
+            intlist_to_bytes(self.iv[:8])
+            + b'\x17\x15\x93\xab\x8d\x80V\xcdV\xe0\t\xcdo\xc2\xa5\xd8ksM\r\xe27N\xae'
         ).decode()
         decrypted = (aes_decrypt_text(encrypted, password, 16))
         self.assertEqual(decrypted, self.secret_msg)
 
-        password = bytes(self.key).decode()
+        password = intlist_to_bytes(self.key).decode()
         encrypted = base64.b64encode(
-            bytes(self.iv[:8])
-            + b'\x0b\xe6\xa4\xd9z\x0e\xb8\xb9\xd0\xd4i_\x85\x1d\x99\x98_\xe5\x80\xe7.\xbf\xa5\x83',
+            intlist_to_bytes(self.iv[:8])
+            + b'\x0b\xe6\xa4\xd9z\x0e\xb8\xb9\xd0\xd4i_\x85\x1d\x99\x98_\xe5\x80\xe7.\xbf\xa5\x83'
         ).decode()
         decrypted = (aes_decrypt_text(encrypted, password, 32))
         self.assertEqual(decrypted, self.secret_msg)
 
     def test_ecb_encrypt(self):
-        data = list(self.secret_msg)
-        encrypted = bytes(aes_ecb_encrypt(data, self.key))
+        data = bytes_to_intlist(self.secret_msg)
+        encrypted = intlist_to_bytes(aes_ecb_encrypt(data, self.key))
         self.assertEqual(
             encrypted,
             b'\xaa\x86]\x81\x97>\x02\x92\x9d\x1bR[[L/u\xd3&\xd1(h\xde{\x81\x94\xba\x02\xae\xbd\xa6\xd0:')
 
     def test_ecb_decrypt(self):
-        data = list(b'\xaa\x86]\x81\x97>\x02\x92\x9d\x1bR[[L/u\xd3&\xd1(h\xde{\x81\x94\xba\x02\xae\xbd\xa6\xd0:')
-        decrypted = bytes(aes_ecb_decrypt(data, self.key, self.iv))
+        data = bytes_to_intlist(b'\xaa\x86]\x81\x97>\x02\x92\x9d\x1bR[[L/u\xd3&\xd1(h\xde{\x81\x94\xba\x02\xae\xbd\xa6\xd0:')
+        decrypted = intlist_to_bytes(aes_ecb_decrypt(data, self.key, self.iv))
         self.assertEqual(decrypted.rstrip(b'\x08'), self.secret_msg)
 
     def test_key_expansion(self):
         key = '4f6bdaa39e2f8cb07f5e722d9edef314'
 
-        self.assertEqual(key_expansion(list(bytearray.fromhex(key))), [
+        self.assertEqual(key_expansion(bytes_to_intlist(bytearray.fromhex(key))), [
             0x4F, 0x6B, 0xDA, 0xA3, 0x9E, 0x2F, 0x8C, 0xB0, 0x7F, 0x5E, 0x72, 0x2D, 0x9E, 0xDE, 0xF3, 0x14,
             0x53, 0x66, 0x20, 0xA8, 0xCD, 0x49, 0xAC, 0x18, 0xB2, 0x17, 0xDE, 0x35, 0x2C, 0xC9, 0x2D, 0x21,
             0x8C, 0xBE, 0xDD, 0xD9, 0x41, 0xF7, 0x71, 0xC1, 0xF3, 0xE0, 0xAF, 0xF4, 0xDF, 0x29, 0x82, 0xD5,
@@ -143,16 +132,16 @@ class TestAES(unittest.TestCase):
         block = [0x21, 0xA0, 0x43, 0xFF]
 
         self.assertEqual(pad_block(block, 'pkcs7'),
-                         [*block, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C])
+                         block + [0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C])
 
         self.assertEqual(pad_block(block, 'iso7816'),
-                         [*block, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00])
+                         block + [0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00])
 
         self.assertEqual(pad_block(block, 'whitespace'),
-                         [*block, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20])
+                         block + [0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20])
 
         self.assertEqual(pad_block(block, 'zero'),
-                         [*block, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00])
+                         block + [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00])
 
         block = list(range(16))
         for mode in ('pkcs7', 'iso7816', 'whitespace', 'zero'):

test/test_compat.py

@@ -12,22 +12,27 @@ import struct
 
 from yt_dlp import compat
 from yt_dlp.compat import urllib  # isort: split
-from yt_dlp.compat import compat_etree_fromstring, compat_expanduser
+from yt_dlp.compat import (
+    compat_etree_fromstring,
+    compat_expanduser,
+    compat_urllib_parse_unquote,
+    compat_urllib_parse_urlencode,
+)
 from yt_dlp.compat.urllib.request import getproxies
 
 
 class TestCompat(unittest.TestCase):
     def test_compat_passthrough(self):
         with self.assertWarns(DeprecationWarning):
-            _ = compat.compat_basestring
+            compat.compat_basestring
 
         with self.assertWarns(DeprecationWarning):
-            _ = compat.WINDOWS_VT_MODE
+            compat.WINDOWS_VT_MODE
 
         self.assertEqual(urllib.request.getproxies, getproxies)
 
         with self.assertWarns(DeprecationWarning):
-            _ = compat.compat_pycrypto_AES  # Must not raise error
+            compat.compat_pycrypto_AES  # Must not raise error
 
     def test_compat_expanduser(self):
         old_home = os.environ.get('HOME')
@@ -38,6 +43,39 @@ class TestCompat(unittest.TestCase):
         finally:
             os.environ['HOME'] = old_home or ''
 
+    def test_compat_urllib_parse_unquote(self):
+        self.assertEqual(compat_urllib_parse_unquote('abc%20def'), 'abc def')
+        self.assertEqual(compat_urllib_parse_unquote('%7e/abc+def'), '~/abc+def')
+        self.assertEqual(compat_urllib_parse_unquote(''), '')
+        self.assertEqual(compat_urllib_parse_unquote('%'), '%')
+        self.assertEqual(compat_urllib_parse_unquote('%%'), '%%')
+        self.assertEqual(compat_urllib_parse_unquote('%%%'), '%%%')
+        self.assertEqual(compat_urllib_parse_unquote('%2F'), '/')
+        self.assertEqual(compat_urllib_parse_unquote('%2f'), '/')
+        self.assertEqual(compat_urllib_parse_unquote('%E6%B4%A5%E6%B3%A2'), '津波')
+        self.assertEqual(
+            compat_urllib_parse_unquote('''<meta property="og:description" content="%E2%96%81%E2%96%82%E2%96%83%E2%96%84%25%E2%96%85%E2%96%86%E2%96%87%E2%96%88" />
+%<a href="https://ar.wikipedia.org/wiki/%D8%AA%D8%B3%D9%88%D9%86%D8%A7%D9%85%D9%8A">%a'''),
+            '''<meta property="og:description" content="▁▂▃▄%▅▆▇█" />
+%<a href="https://ar.wikipedia.org/wiki/تسونامي">%a''')
+        self.assertEqual(
+            compat_urllib_parse_unquote('''%28%5E%E2%97%A3_%E2%97%A2%5E%29%E3%81%A3%EF%B8%BB%E3%83%87%E2%95%90%E4%B8%80    %E2%87%80    %E2%87%80    %E2%87%80    %E2%87%80    %E2%87%80    %E2%86%B6%I%Break%25Things%'''),
+            '''(^◣_◢^)っ︻デ═一    ⇀    ⇀    ⇀    ⇀    ⇀    ↶%I%Break%Things%''')
+
+    def test_compat_urllib_parse_unquote_plus(self):
+        self.assertEqual(urllib.parse.unquote_plus('abc%20def'), 'abc def')
+        self.assertEqual(urllib.parse.unquote_plus('%7e/abc+def'), '~/abc def')
+
+    def test_compat_urllib_parse_urlencode(self):
+        self.assertEqual(compat_urllib_parse_urlencode({'abc': 'def'}), 'abc=def')
+        self.assertEqual(compat_urllib_parse_urlencode({'abc': b'def'}), 'abc=def')
+        self.assertEqual(compat_urllib_parse_urlencode({b'abc': 'def'}), 'abc=def')
+        self.assertEqual(compat_urllib_parse_urlencode({b'abc': b'def'}), 'abc=def')
+        self.assertEqual(compat_urllib_parse_urlencode([('abc', 'def')]), 'abc=def')
+        self.assertEqual(compat_urllib_parse_urlencode([('abc', b'def')]), 'abc=def')
+        self.assertEqual(compat_urllib_parse_urlencode([(b'abc', 'def')]), 'abc=def')
+        self.assertEqual(compat_urllib_parse_urlencode([(b'abc', b'def')]), 'abc=def')
+
     def test_compat_etree_fromstring(self):
         xml = '''
             <root foo="bar" spam="中文">

test/test_config.py

@@ -71,7 +71,7 @@ def _generate_expected_groups():
             Path('/etc/yt-dlp.conf'),
             Path('/etc/yt-dlp/config'),
             Path('/etc/yt-dlp/config.txt'),
-        ],
+        ]
     }
 
 

test/test_cookies.py

@@ -1,5 +1,5 @@
-import datetime as dt
 import unittest
+from datetime import datetime, timezone
 
 from yt_dlp import cookies
 from yt_dlp.cookies import (
@@ -58,14 +58,6 @@ class TestCookies(unittest.TestCase):
             ({'DESKTOP_SESSION': 'kde'}, _LinuxDesktopEnvironment.KDE3),
             ({'DESKTOP_SESSION': 'xfce'}, _LinuxDesktopEnvironment.XFCE),
 
-            ({'XDG_CURRENT_DESKTOP': 'my_custom_de', 'DESKTOP_SESSION': 'gnome'}, _LinuxDesktopEnvironment.GNOME),
-            ({'XDG_CURRENT_DESKTOP': 'my_custom_de', 'DESKTOP_SESSION': 'mate'}, _LinuxDesktopEnvironment.GNOME),
-            ({'XDG_CURRENT_DESKTOP': 'my_custom_de', 'DESKTOP_SESSION': 'kde4'}, _LinuxDesktopEnvironment.KDE4),
-            ({'XDG_CURRENT_DESKTOP': 'my_custom_de', 'DESKTOP_SESSION': 'kde'}, _LinuxDesktopEnvironment.KDE3),
-            ({'XDG_CURRENT_DESKTOP': 'my_custom_de', 'DESKTOP_SESSION': 'xfce'}, _LinuxDesktopEnvironment.XFCE),
-
-            ({'XDG_CURRENT_DESKTOP': 'my_custom_de', 'DESKTOP_SESSION': 'my_custom_de', 'GNOME_DESKTOP_SESSION_ID': 1}, _LinuxDesktopEnvironment.GNOME),
-
             ({'GNOME_DESKTOP_SESSION_ID': 1}, _LinuxDesktopEnvironment.GNOME),
             ({'KDE_FULL_SESSION': 1}, _LinuxDesktopEnvironment.KDE3),
             ({'KDE_FULL_SESSION': 1, 'DESKTOP_SESSION': 'kde4'}, _LinuxDesktopEnvironment.KDE4),
@@ -75,7 +67,6 @@ class TestCookies(unittest.TestCase):
             ({'XDG_CURRENT_DESKTOP': 'GNOME'}, _LinuxDesktopEnvironment.GNOME),
             ({'XDG_CURRENT_DESKTOP': 'GNOME:GNOME-Classic'}, _LinuxDesktopEnvironment.GNOME),
             ({'XDG_CURRENT_DESKTOP': 'GNOME : GNOME-Classic'}, _LinuxDesktopEnvironment.GNOME),
-            ({'XDG_CURRENT_DESKTOP': 'ubuntu:GNOME'}, _LinuxDesktopEnvironment.GNOME),
 
             ({'XDG_CURRENT_DESKTOP': 'Unity', 'DESKTOP_SESSION': 'gnome-fallback'}, _LinuxDesktopEnvironment.GNOME),
             ({'XDG_CURRENT_DESKTOP': 'KDE', 'KDE_SESSION_VERSION': '5'}, _LinuxDesktopEnvironment.KDE5),
@@ -113,31 +104,15 @@ class TestCookies(unittest.TestCase):
             decryptor = LinuxChromeCookieDecryptor('Chrome', Logger())
             self.assertEqual(decryptor.decrypt(encrypted_value), value)
 
-    def test_chrome_cookie_decryptor_linux_v10_meta24(self):
-        with MonkeyPatch(cookies, {'_get_linux_keyring_password': lambda *args, **kwargs: b''}):
-            encrypted_value = b'v10\x1f\xe4\x0e[\x83\x0c\xcc*kPi \xce\x8d\x1d\xbb\x80\r\x11\t\xbb\x9e^Hy\x94\xf4\x963\x9f\x82\xba\xfe\xa1\xed\xb9\xf1)\x00710\x92\xc8/<\x96B'
-            value = 'DE'
-            decryptor = LinuxChromeCookieDecryptor('Chrome', Logger(), meta_version=24)
-            self.assertEqual(decryptor.decrypt(encrypted_value), value)
-
     def test_chrome_cookie_decryptor_windows_v10(self):
         with MonkeyPatch(cookies, {
-            '_get_windows_v10_key': lambda *args, **kwargs: b'Y\xef\xad\xad\xeerp\xf0Y\xe6\x9b\x12\xc2<z\x16]\n\xbb\xb8\xcb\xd7\x9bA\xc3\x14e\x99{\xd6\xf4&',
+            '_get_windows_v10_key': lambda *args, **kwargs: b'Y\xef\xad\xad\xeerp\xf0Y\xe6\x9b\x12\xc2<z\x16]\n\xbb\xb8\xcb\xd7\x9bA\xc3\x14e\x99{\xd6\xf4&'
         }):
             encrypted_value = b'v10T\xb8\xf3\xb8\x01\xa7TtcV\xfc\x88\xb8\xb8\xef\x05\xb5\xfd\x18\xc90\x009\xab\xb1\x893\x85)\x87\xe1\xa9-\xa3\xad='
             value = '32101439'
             decryptor = WindowsChromeCookieDecryptor('', Logger())
             self.assertEqual(decryptor.decrypt(encrypted_value), value)
 
-    def test_chrome_cookie_decryptor_windows_v10_meta24(self):
-        with MonkeyPatch(cookies, {
-            '_get_windows_v10_key': lambda *args, **kwargs: b'\xea\x8b\x02\xc3\xc6\xc5\x99\xc3\xa3[ j\xfa\xf6\xfcU\xac\x13u\xdc\x0c\x0e\xf1\x03\x90\xb6\xdf\xbb\x8fL\xb1\xb2',
-        }):
-            encrypted_value = b'v10dN\xe1\xacy\x84^\xe1I\xact\x03r\xfb\xe2\xce{^\x0e<(\xb0y\xeb\x01\xfb@"\x9e\x8c\xa53~\xdb*\x8f\xac\x8b\xe3\xfd3\x06\xe5\x93\x19OyOG\xb2\xfb\x1d$\xc0\xda\x13j\x9e\xfe\xc5\xa3\xa8\xfe\xd9'
-            value = '1234'
-            decryptor = WindowsChromeCookieDecryptor('', Logger(), meta_version=24)
-            self.assertEqual(decryptor.decrypt(encrypted_value), value)
-
     def test_chrome_cookie_decryptor_mac_v10(self):
         with MonkeyPatch(cookies, {'_get_mac_keyring_password': lambda *args, **kwargs: b'6eIDUdtKAacvlHwBVwvg/Q=='}):
             encrypted_value = b'v10\xb3\xbe\xad\xa1[\x9fC\xa1\x98\xe0\x9a\x01\xd9\xcf\xbfc'
@@ -146,24 +121,24 @@ class TestCookies(unittest.TestCase):
             self.assertEqual(decryptor.decrypt(encrypted_value), value)
 
     def test_safari_cookie_parsing(self):
-        cookies = (
-            b'cook\x00\x00\x00\x01\x00\x00\x00i\x00\x00\x01\x00\x01\x00\x00\x00\x10\x00\x00\x00\x00\x00\x00\x00Y'
-            b'\x00\x00\x00\x00\x00\x00\x00 \x00\x00\x00\x00\x00\x00\x008\x00\x00\x00B\x00\x00\x00F\x00\x00\x00H'
-            b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80\x03\xa5>\xc3A\x00\x00\x80\xc3\x07:\xc3A'
-            b'localhost\x00foo\x00/\x00test%20%3Bcookie\x00\x00\x00\x054\x07\x17 \x05\x00\x00\x00Kbplist00\xd1\x01'
-            b'\x02_\x10\x18NSHTTPCookieAcceptPolicy\x10\x02\x08\x0b&\x00\x00\x00\x00\x00\x00\x01\x01\x00\x00\x00'
-            b'\x00\x00\x00\x00\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00(')
+        cookies = \
+            b'cook\x00\x00\x00\x01\x00\x00\x00i\x00\x00\x01\x00\x01\x00\x00\x00\x10\x00\x00\x00\x00\x00\x00\x00Y' \
+            b'\x00\x00\x00\x00\x00\x00\x00 \x00\x00\x00\x00\x00\x00\x008\x00\x00\x00B\x00\x00\x00F\x00\x00\x00H' \
+            b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80\x03\xa5>\xc3A\x00\x00\x80\xc3\x07:\xc3A' \
+            b'localhost\x00foo\x00/\x00test%20%3Bcookie\x00\x00\x00\x054\x07\x17 \x05\x00\x00\x00Kbplist00\xd1\x01' \
+            b'\x02_\x10\x18NSHTTPCookieAcceptPolicy\x10\x02\x08\x0b&\x00\x00\x00\x00\x00\x00\x01\x01\x00\x00\x00' \
+            b'\x00\x00\x00\x00\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00('
 
         jar = parse_safari_cookies(cookies)
         self.assertEqual(len(jar), 1)
-        cookie = next(iter(jar))
+        cookie = list(jar)[0]
         self.assertEqual(cookie.domain, 'localhost')
         self.assertEqual(cookie.port, None)
         self.assertEqual(cookie.path, '/')
         self.assertEqual(cookie.name, 'foo')
         self.assertEqual(cookie.value, 'test%20%3Bcookie')
         self.assertFalse(cookie.secure)
-        expected_expiration = dt.datetime(2021, 6, 18, 21, 39, 19, tzinfo=dt.timezone.utc)
+        expected_expiration = datetime(2021, 6, 18, 21, 39, 19, tzinfo=timezone.utc)
         self.assertEqual(cookie.expires, int(expected_expiration.timestamp()))
 
     def test_pbkdf2_sha1(self):
@@ -189,7 +164,7 @@ class TestLenientSimpleCookie(unittest.TestCase):
                     attributes = {
                         key: value
                         for key, value in dict(morsel).items()
-                        if value != ''
+                        if value != ""
                     }
                     self.assertEqual(attributes, expected_attributes, message)
 
@@ -199,133 +174,133 @@ class TestLenientSimpleCookie(unittest.TestCase):
         self._run_tests(
             # Copied from https://github.com/python/cpython/blob/v3.10.7/Lib/test/test_http_cookies.py
             (
-                'Test basic cookie',
-                'chips=ahoy; vienna=finger',
-                {'chips': 'ahoy', 'vienna': 'finger'},
+                "Test basic cookie",
+                "chips=ahoy; vienna=finger",
+                {"chips": "ahoy", "vienna": "finger"},
             ),
             (
-                'Test quoted cookie',
+                "Test quoted cookie",
                 'keebler="E=mc2; L=\\"Loves\\"; fudge=\\012;"',
-                {'keebler': 'E=mc2; L="Loves"; fudge=\012;'},
+                {"keebler": 'E=mc2; L="Loves"; fudge=\012;'},
             ),
             (
                 "Allow '=' in an unquoted value",
-                'keebler=E=mc2',
-                {'keebler': 'E=mc2'},
+                "keebler=E=mc2",
+                {"keebler": "E=mc2"},
             ),
             (
                 "Allow cookies with ':' in their name",
-                'key:term=value:term',
-                {'key:term': 'value:term'},
+                "key:term=value:term",
+                {"key:term": "value:term"},
             ),
             (
                 "Allow '[' and ']' in cookie values",
-                'a=b; c=[; d=r; f=h',
-                {'a': 'b', 'c': '[', 'd': 'r', 'f': 'h'},
+                "a=b; c=[; d=r; f=h",
+                {"a": "b", "c": "[", "d": "r", "f": "h"},
             ),
             (
-                'Test basic cookie attributes',
+                "Test basic cookie attributes",
                 'Customer="WILE_E_COYOTE"; Version=1; Path=/acme',
-                {'Customer': ('WILE_E_COYOTE', {'version': '1', 'path': '/acme'})},
+                {"Customer": ("WILE_E_COYOTE", {"version": "1", "path": "/acme"})},
             ),
             (
-                'Test flag only cookie attributes',
+                "Test flag only cookie attributes",
                 'Customer="WILE_E_COYOTE"; HttpOnly; Secure',
-                {'Customer': ('WILE_E_COYOTE', {'httponly': True, 'secure': True})},
+                {"Customer": ("WILE_E_COYOTE", {"httponly": True, "secure": True})},
             ),
             (
-                'Test flag only attribute with values',
-                'eggs=scrambled; httponly=foo; secure=bar; Path=/bacon',
-                {'eggs': ('scrambled', {'httponly': 'foo', 'secure': 'bar', 'path': '/bacon'})},
+                "Test flag only attribute with values",
+                "eggs=scrambled; httponly=foo; secure=bar; Path=/bacon",
+                {"eggs": ("scrambled", {"httponly": "foo", "secure": "bar", "path": "/bacon"})},
             ),
             (
                 "Test special case for 'expires' attribute, 4 digit year",
                 'Customer="W"; expires=Wed, 01 Jan 2010 00:00:00 GMT',
-                {'Customer': ('W', {'expires': 'Wed, 01 Jan 2010 00:00:00 GMT'})},
+                {"Customer": ("W", {"expires": "Wed, 01 Jan 2010 00:00:00 GMT"})},
             ),
             (
                 "Test special case for 'expires' attribute, 2 digit year",
                 'Customer="W"; expires=Wed, 01 Jan 98 00:00:00 GMT',
-                {'Customer': ('W', {'expires': 'Wed, 01 Jan 98 00:00:00 GMT'})},
+                {"Customer": ("W", {"expires": "Wed, 01 Jan 98 00:00:00 GMT"})},
             ),
             (
-                'Test extra spaces in keys and values',
-                'eggs  =  scrambled  ;  secure  ;  path  =  bar   ; foo=foo   ',
-                {'eggs': ('scrambled', {'secure': True, 'path': 'bar'}), 'foo': 'foo'},
+                "Test extra spaces in keys and values",
+                "eggs  =  scrambled  ;  secure  ;  path  =  bar   ; foo=foo   ",
+                {"eggs": ("scrambled", {"secure": True, "path": "bar"}), "foo": "foo"},
             ),
             (
-                'Test quoted attributes',
+                "Test quoted attributes",
                 'Customer="WILE_E_COYOTE"; Version="1"; Path="/acme"',
-                {'Customer': ('WILE_E_COYOTE', {'version': '1', 'path': '/acme'})},
+                {"Customer": ("WILE_E_COYOTE", {"version": "1", "path": "/acme"})}
             ),
             # Our own tests that CPython passes
             (
                 "Allow ';' in quoted value",
                 'chips="a;hoy"; vienna=finger',
-                {'chips': 'a;hoy', 'vienna': 'finger'},
+                {"chips": "a;hoy", "vienna": "finger"},
             ),
             (
-                'Keep only the last set value',
-                'a=c; a=b',
-                {'a': 'b'},
+                "Keep only the last set value",
+                "a=c; a=b",
+                {"a": "b"},
             ),
         )
 
     def test_lenient_parsing(self):
         self._run_tests(
             (
-                'Ignore and try to skip invalid cookies',
+                "Ignore and try to skip invalid cookies",
                 'chips={"ahoy;": 1}; vienna="finger;"',
-                {'vienna': 'finger;'},
+                {"vienna": "finger;"},
             ),
             (
-                'Ignore cookies without a name',
-                'a=b; unnamed; c=d',
-                {'a': 'b', 'c': 'd'},
+                "Ignore cookies without a name",
+                "a=b; unnamed; c=d",
+                {"a": "b", "c": "d"},
             ),
             (
                 "Ignore '\"' cookie without name",
                 'a=b; "; c=d',
-                {'a': 'b', 'c': 'd'},
+                {"a": "b", "c": "d"},
             ),
             (
-                'Skip all space separated values',
-                'x a=b c=d x; e=f',
-                {'a': 'b', 'c': 'd', 'e': 'f'},
+                "Skip all space separated values",
+                "x a=b c=d x; e=f",
+                {"a": "b", "c": "d", "e": "f"},
             ),
             (
-                'Skip all space separated values',
+                "Skip all space separated values",
                 'x a=b; data={"complex": "json", "with": "key=value"}; x c=d x',
-                {'a': 'b', 'c': 'd'},
+                {"a": "b", "c": "d"},
             ),
             (
-                'Expect quote mending',
+                "Expect quote mending",
                 'a=b; invalid="; c=d',
-                {'a': 'b', 'c': 'd'},
+                {"a": "b", "c": "d"},
             ),
             (
-                'Reset morsel after invalid to not capture attributes',
-                'a=b; invalid; Version=1; c=d',
-                {'a': 'b', 'c': 'd'},
+                "Reset morsel after invalid to not capture attributes",
+                "a=b; invalid; Version=1; c=d",
+                {"a": "b", "c": "d"},
             ),
             (
-                'Reset morsel after invalid to not capture attributes',
-                'a=b; $invalid; $Version=1; c=d',
-                {'a': 'b', 'c': 'd'},
+                "Reset morsel after invalid to not capture attributes",
+                "a=b; $invalid; $Version=1; c=d",
+                {"a": "b", "c": "d"},
             ),
             (
-                'Continue after non-flag attribute without value',
-                'a=b; path; Version=1; c=d',
-                {'a': 'b', 'c': 'd'},
+                "Continue after non-flag attribute without value",
+                "a=b; path; Version=1; c=d",
+                {"a": "b", "c": "d"},
             ),
             (
-                'Allow cookie attributes with `$` prefix',
+                "Allow cookie attributes with `$` prefix",
                 'Customer="WILE_E_COYOTE"; $Version=1; $Secure; $Path=/acme',
-                {'Customer': ('WILE_E_COYOTE', {'version': '1', 'secure': True, 'path': '/acme'})},
+                {"Customer": ("WILE_E_COYOTE", {"version": "1", "secure": True, "path": "/acme"})},
             ),
             (
-                'Invalid Morsel keys should not result in an error',
-                'Key=Value; [Invalid]=Value; Another=Value',
-                {'Key': 'Value', 'Another': 'Value'},
+                "Invalid Morsel keys should not result in an error",
+                "Key=Value; [Invalid]=Value; Another=Value",
+                {"Key": "Value", "Another": "Value"},
             ),
         )

test/test_devalue.py

@@ -1,235 +0,0 @@
-#!/usr/bin/env python3
-
-# Allow direct execution
-import os
-import sys
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-
-import datetime as dt
-import json
-import math
-import re
-import unittest
-
-from yt_dlp.utils.jslib import devalue
-
-
-TEST_CASES_EQUALS = [{
-    'name': 'int',
-    'unparsed': [-42],
-    'parsed': -42,
-}, {
-    'name': 'str',
-    'unparsed': ['woo!!!'],
-    'parsed': 'woo!!!',
-}, {
-    'name': 'Number',
-    'unparsed': [['Object', 42]],
-    'parsed': 42,
-}, {
-    'name': 'String',
-    'unparsed': [['Object', 'yar']],
-    'parsed': 'yar',
-}, {
-    'name': 'Infinity',
-    'unparsed': -4,
-    'parsed': math.inf,
-}, {
-    'name': 'negative Infinity',
-    'unparsed': -5,
-    'parsed': -math.inf,
-}, {
-    'name': 'negative zero',
-    'unparsed': -6,
-    'parsed': -0.0,
-}, {
-    'name': 'RegExp',
-    'unparsed': [['RegExp', 'regexp', 'gim']],  # XXX: flags are ignored
-    'parsed': re.compile('regexp'),
-}, {
-    'name': 'Date',
-    'unparsed': [['Date', '2001-09-09T01:46:40.000Z']],
-    'parsed': dt.datetime.fromtimestamp(1e9, tz=dt.timezone.utc),
-}, {
-    'name': 'Array',
-    'unparsed': [[1, 2, 3], 'a', 'b', 'c'],
-    'parsed': ['a', 'b', 'c'],
-}, {
-    'name': 'Array (empty)',
-    'unparsed': [[]],
-    'parsed': [],
-}, {
-    'name': 'Array (sparse)',
-    'unparsed': [[-2, 1, -2], 'b'],
-    'parsed': [None, 'b', None],
-}, {
-    'name': 'Object',
-    'unparsed': [{'foo': 1, 'x-y': 2}, 'bar', 'z'],
-    'parsed': {'foo': 'bar', 'x-y': 'z'},
-}, {
-    'name': 'Set',
-    'unparsed': [['Set', 1, 2, 3], 1, 2, 3],
-    'parsed': [1, 2, 3],
-}, {
-    'name': 'Map',
-    'unparsed': [['Map', 1, 2], 'a', 'b'],
-    'parsed': [['a', 'b']],
-}, {
-    'name': 'BigInt',
-    'unparsed': [['BigInt', '1']],
-    'parsed': 1,
-}, {
-    'name': 'Uint8Array',
-    'unparsed': [['Uint8Array', 'AQID']],
-    'parsed': [1, 2, 3],
-}, {
-    'name': 'ArrayBuffer',
-    'unparsed': [['ArrayBuffer', 'AQID']],
-    'parsed': [1, 2, 3],
-}, {
-    'name': 'str (repetition)',
-    'unparsed': [[1, 1], 'a string'],
-    'parsed': ['a string', 'a string'],
-}, {
-    'name': 'None (repetition)',
-    'unparsed': [[1, 1], None],
-    'parsed': [None, None],
-}, {
-    'name': 'dict (repetition)',
-    'unparsed': [[1, 1], {}],
-    'parsed': [{}, {}],
-}, {
-    'name': 'Object without prototype',
-    'unparsed': [['null']],
-    'parsed': {},
-}, {
-    'name': 'cross-realm POJO',
-    'unparsed': [{}],
-    'parsed': {},
-}]
-
-TEST_CASES_IS = [{
-    'name': 'bool',
-    'unparsed': [True],
-    'parsed': True,
-}, {
-    'name': 'Boolean',
-    'unparsed': [['Object', False]],
-    'parsed': False,
-}, {
-    'name': 'undefined',
-    'unparsed': -1,
-    'parsed': None,
-}, {
-    'name': 'null',
-    'unparsed': [None],
-    'parsed': None,
-}, {
-    'name': 'NaN',
-    'unparsed': -3,
-    'parsed': math.nan,
-}]
-
-TEST_CASES_INVALID = [{
-    'name': 'empty string',
-    'unparsed': '',
-    'error': ValueError,
-    'pattern': r'expected int or list as input',
-}, {
-    'name': 'hole',
-    'unparsed': -2,
-    'error': ValueError,
-    'pattern': r'invalid integer input',
-}, {
-    'name': 'string',
-    'unparsed': 'hello',
-    'error': ValueError,
-    'pattern': r'expected int or list as input',
-}, {
-    'name': 'number',
-    'unparsed': 42,
-    'error': ValueError,
-    'pattern': r'invalid integer input',
-}, {
-    'name': 'boolean',
-    'unparsed': True,
-    'error': ValueError,
-    'pattern': r'expected int or list as input',
-}, {
-    'name': 'null',
-    'unparsed': None,
-    'error': ValueError,
-    'pattern': r'expected int or list as input',
-}, {
-    'name': 'object',
-    'unparsed': {},
-    'error': ValueError,
-    'pattern': r'expected int or list as input',
-}, {
-    'name': 'empty array',
-    'unparsed': [],
-    'error': ValueError,
-    'pattern': r'expected a non-empty list as input',
-}, {
-    'name': 'Python negative indexing',
-    'unparsed': [[1, 2, 3, 4, 5, 6, 7, -7], 1, 2, 3, 4, 5, 6, 7],
-    'error': IndexError,
-    'pattern': r'invalid index: -7',
-}]
-
-
-class TestDevalue(unittest.TestCase):
-    def test_devalue_parse_equals(self):
-        for tc in TEST_CASES_EQUALS:
-            self.assertEqual(devalue.parse(tc['unparsed']), tc['parsed'], tc['name'])
-
-    def test_devalue_parse_is(self):
-        for tc in TEST_CASES_IS:
-            self.assertIs(devalue.parse(tc['unparsed']), tc['parsed'], tc['name'])
-
-    def test_devalue_parse_invalid(self):
-        for tc in TEST_CASES_INVALID:
-            with self.assertRaisesRegex(tc['error'], tc['pattern'], msg=tc['name']):
-                devalue.parse(tc['unparsed'])
-
-    def test_devalue_parse_cyclical(self):
-        name = 'Map (cyclical)'
-        result = devalue.parse([['Map', 1, 0], 'self'])
-        self.assertEqual(result[0][0], 'self', name)
-        self.assertIs(result, result[0][1], name)
-
-        name = 'Set (cyclical)'
-        result = devalue.parse([['Set', 0, 1], 42])
-        self.assertEqual(result[1], 42, name)
-        self.assertIs(result, result[0], name)
-
-        result = devalue.parse([[0]])
-        self.assertIs(result, result[0], 'Array (cyclical)')
-
-        name = 'Object (cyclical)'
-        result = devalue.parse([{'self': 0}])
-        self.assertIs(result, result['self'], name)
-
-        name = 'Object with null prototype (cyclical)'
-        result = devalue.parse([['null', 'self', 0]])
-        self.assertIs(result, result['self'], name)
-
-        name = 'Objects (cyclical)'
-        result = devalue.parse([[1, 2], {'second': 2}, {'first': 1}])
-        self.assertIs(result[0], result[1]['first'], name)
-        self.assertIs(result[1], result[0]['second'], name)
-
-    def test_devalue_parse_revivers(self):
-        self.assertEqual(
-            devalue.parse([['indirect', 1], {'a': 2}, 'b'], revivers={'indirect': lambda x: x}),
-            {'a': 'b'}, 'revivers (indirect)')
-
-        self.assertEqual(
-            devalue.parse([['parse', 1], '{"a":0}'], revivers={'parse': lambda x: json.loads(x)}),
-            {'a': 0}, 'revivers (parse)')
-
-
-if __name__ == '__main__':
-    unittest.main()

test/test_download.py

@@ -20,6 +20,7 @@ from test.helper import (
     gettestcases,
     getwebpagetestcases,
     is_download_test,
+    report_warning,
     try_rm,
 )
 
@@ -93,7 +94,7 @@ def generator(test_case, tname):
             'playlist', [] if is_playlist else [test_case])
 
         def print_skipping(reason):
-            print('Skipping {}: {}'.format(test_case['name'], reason))
+            print('Skipping %s: %s' % (test_case['name'], reason))
             self.skipTest(reason)
 
         if not ie.working():
@@ -116,7 +117,7 @@ def generator(test_case, tname):
 
         for other_ie in other_ies:
             if not other_ie.working():
-                print_skipping(f'test depends on {other_ie.ie_key()}IE, marked as not WORKING')
+                print_skipping('test depends on %sIE, marked as not WORKING' % other_ie.ie_key())
 
         params = get_params(test_case.get('params', {}))
         params['outtmpl'] = tname + '_' + params['outtmpl']
@@ -147,7 +148,10 @@ def generator(test_case, tname):
                 return False
             if err.__class__.__name__ == expected_exception:
                 return True
-            return any(exc.__class__.__name__ == expected_exception for exc in err.exc_info)
+            for exc in err.exc_info:
+                if exc.__class__.__name__ == expected_exception:
+                    return True
+            return False
 
         def try_rm_tcs_files(tcs=None):
             if tcs is None:
@@ -177,7 +181,8 @@ def generator(test_case, tname):
                         raise
 
                     if try_num == RETRIES:
-                        raise
+                        report_warning('%s failed due to network errors, skipping...' % tname)
+                        return
 
                     print(f'Retrying: {try_num} failed tries\n\n##########\n\n')
 
@@ -239,8 +244,9 @@ def generator(test_case, tname):
                         got_fsize = os.path.getsize(tc_filename)
                         assertGreaterEqual(
                             self, got_fsize, expected_minsize,
-                            f'Expected {tc_filename} to be at least {format_bytes(expected_minsize)}, '
-                            f'but it\'s only {format_bytes(got_fsize)} ')
+                            'Expected %s to be at least %s, but it\'s only %s ' %
+                            (tc_filename, format_bytes(expected_minsize),
+                                format_bytes(got_fsize)))
                     if 'md5' in tc:
                         md5_for_file = _file_md5(tc_filename)
                         self.assertEqual(tc['md5'], md5_for_file)
@@ -249,7 +255,7 @@ def generator(test_case, tname):
                 info_json_fn = os.path.splitext(tc_filename)[0] + '.info.json'
                 self.assertTrue(
                     os.path.exists(info_json_fn),
-                    f'Missing info file {info_json_fn}')
+                    'Missing info file %s' % info_json_fn)
                 with open(info_json_fn, encoding='utf-8') as infof:
                     info_dict = json.load(infof)
                 expect_info_dict(self, info_dict, tc.get('info_dict', {}))

test/test_downloader_http.py

@@ -15,6 +15,7 @@ import threading
 from test.helper import http_server_port, try_rm
 from yt_dlp import YoutubeDL
 from yt_dlp.downloader.http import HttpFD
+from yt_dlp.utils import encodeFilename
 from yt_dlp.utils._utils import _YDLLogger as FakeLogger
 
 TEST_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -37,9 +38,9 @@ class HTTPTestRequestHandler(http.server.BaseHTTPRequestHandler):
                 end = int(mobj.group(2))
         valid_range = start is not None and end is not None
         if valid_range:
-            content_range = f'bytes {start}-{end}'
+            content_range = 'bytes %d-%d' % (start, end)
             if total:
-                content_range += f'/{total}'
+                content_range += '/%d' % total
             self.send_header('Content-Range', content_range)
         return (end - start + 1) if valid_range else total
 
@@ -81,12 +82,12 @@ class TestHttpFD(unittest.TestCase):
         ydl = YoutubeDL(params)
         downloader = HttpFD(ydl, params)
         filename = 'testfile.mp4'
-        try_rm(filename)
+        try_rm(encodeFilename(filename))
         self.assertTrue(downloader.real_download(filename, {
-            'url': f'http://127.0.0.1:{self.port}/{ep}',
+            'url': 'http://127.0.0.1:%d/%s' % (self.port, ep),
         }), ep)
-        self.assertEqual(os.path.getsize(filename), TEST_SIZE, ep)
-        try_rm(filename)
+        self.assertEqual(os.path.getsize(encodeFilename(filename)), TEST_SIZE, ep)
+        try_rm(encodeFilename(filename))
 
     def download_all(self, params):
         for ep in ('regular', 'no-content-length', 'no-range', 'no-range-no-content-length'):

test/test_http_proxy.py

@@ -1,376 +0,0 @@
-import abc
-import base64
-import contextlib
-import functools
-import json
-import os
-import random
-import ssl
-import threading
-from http.server import BaseHTTPRequestHandler
-from socketserver import ThreadingTCPServer
-
-import pytest
-
-from test.helper import http_server_port, verify_address_availability
-from test.test_networking import TEST_DIR
-from test.test_socks import IPv6ThreadingTCPServer
-from yt_dlp.dependencies import urllib3
-from yt_dlp.networking import Request
-from yt_dlp.networking.exceptions import HTTPError, ProxyError, SSLError
-
-
-class HTTPProxyAuthMixin:
-
-    def proxy_auth_error(self):
-        self.send_response(407)
-        self.send_header('Proxy-Authenticate', 'Basic realm="test http proxy"')
-        self.end_headers()
-        return False
-
-    def do_proxy_auth(self, username, password):
-        if username is None and password is None:
-            return True
-
-        proxy_auth_header = self.headers.get('Proxy-Authorization', None)
-        if proxy_auth_header is None:
-            return self.proxy_auth_error()
-
-        if not proxy_auth_header.startswith('Basic '):
-            return self.proxy_auth_error()
-
-        auth = proxy_auth_header[6:]
-
-        try:
-            auth_username, auth_password = base64.b64decode(auth).decode().split(':', 1)
-        except Exception:
-            return self.proxy_auth_error()
-
-        if auth_username != (username or '') or auth_password != (password or ''):
-            return self.proxy_auth_error()
-        return True
-
-
-class HTTPProxyHandler(BaseHTTPRequestHandler, HTTPProxyAuthMixin):
-    def __init__(self, *args, proxy_info=None, username=None, password=None, request_handler=None, **kwargs):
-        self.username = username
-        self.password = password
-        self.proxy_info = proxy_info
-        super().__init__(*args, **kwargs)
-
-    def do_GET(self):
-        if not self.do_proxy_auth(self.username, self.password):
-            self.server.close_request(self.request)
-            return
-        if self.path.endswith('/proxy_info'):
-            payload = json.dumps(self.proxy_info or {
-                'client_address': self.client_address,
-                'connect': False,
-                'connect_host': None,
-                'connect_port': None,
-                'headers': dict(self.headers),
-                'path': self.path,
-                'proxy': ':'.join(str(y) for y in self.connection.getsockname()),
-            })
-            self.send_response(200)
-            self.send_header('Content-Type', 'application/json; charset=utf-8')
-            self.send_header('Content-Length', str(len(payload)))
-            self.end_headers()
-            self.wfile.write(payload.encode())
-        else:
-            self.send_response(404)
-            self.end_headers()
-
-        self.server.close_request(self.request)
-
-
-if urllib3:
-    import urllib3.util.ssltransport
-
-    class SSLTransport(urllib3.util.ssltransport.SSLTransport):
-        """
-        Modified version of urllib3 SSLTransport to support server side SSL
-
-        This allows us to chain multiple TLS connections.
-        """
-
-        def __init__(self, socket, ssl_context, server_hostname=None, suppress_ragged_eofs=True, server_side=False):
-            self.incoming = ssl.MemoryBIO()
-            self.outgoing = ssl.MemoryBIO()
-
-            self.suppress_ragged_eofs = suppress_ragged_eofs
-            self.socket = socket
-
-            self.sslobj = ssl_context.wrap_bio(
-                self.incoming,
-                self.outgoing,
-                server_hostname=server_hostname,
-                server_side=server_side,
-            )
-            self._ssl_io_loop(self.sslobj.do_handshake)
-
-        @property
-        def _io_refs(self):
-            return self.socket._io_refs
-
-        @_io_refs.setter
-        def _io_refs(self, value):
-            self.socket._io_refs = value
-
-        def shutdown(self, *args, **kwargs):
-            self.socket.shutdown(*args, **kwargs)
-else:
-    SSLTransport = None
-
-
-class HTTPSProxyHandler(HTTPProxyHandler):
-    def __init__(self, request, *args, **kwargs):
-        certfn = os.path.join(TEST_DIR, 'testcert.pem')
-        sslctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
-        sslctx.load_cert_chain(certfn, None)
-        if isinstance(request, ssl.SSLSocket):
-            request = SSLTransport(request, ssl_context=sslctx, server_side=True)
-        else:
-            request = sslctx.wrap_socket(request, server_side=True)
-        super().__init__(request, *args, **kwargs)
-
-
-class HTTPConnectProxyHandler(BaseHTTPRequestHandler, HTTPProxyAuthMixin):
-    protocol_version = 'HTTP/1.1'
-    default_request_version = 'HTTP/1.1'
-
-    def __init__(self, *args, username=None, password=None, request_handler=None, **kwargs):
-        self.username = username
-        self.password = password
-        self.request_handler = request_handler
-        super().__init__(*args, **kwargs)
-
-    def do_CONNECT(self):
-        if not self.do_proxy_auth(self.username, self.password):
-            self.server.close_request(self.request)
-            return
-        self.send_response(200)
-        self.end_headers()
-        proxy_info = {
-            'client_address': self.client_address,
-            'connect': True,
-            'connect_host': self.path.split(':')[0],
-            'connect_port': int(self.path.split(':')[1]),
-            'headers': dict(self.headers),
-            'path': self.path,
-            'proxy': ':'.join(str(y) for y in self.connection.getsockname()),
-        }
-        self.request_handler(self.request, self.client_address, self.server, proxy_info=proxy_info)
-        self.server.close_request(self.request)
-
-
-class HTTPSConnectProxyHandler(HTTPConnectProxyHandler):
-    def __init__(self, request, *args, **kwargs):
-        certfn = os.path.join(TEST_DIR, 'testcert.pem')
-        sslctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
-        sslctx.load_cert_chain(certfn, None)
-        request = sslctx.wrap_socket(request, server_side=True)
-        self._original_request = request
-        super().__init__(request, *args, **kwargs)
-
-    def do_CONNECT(self):
-        super().do_CONNECT()
-        self.server.close_request(self._original_request)
-
-
-@contextlib.contextmanager
-def proxy_server(proxy_server_class, request_handler, bind_ip=None, **proxy_server_kwargs):
-    server = server_thread = None
-    try:
-        bind_address = bind_ip or '127.0.0.1'
-        server_type = ThreadingTCPServer if '.' in bind_address else IPv6ThreadingTCPServer
-        server = server_type(
-            (bind_address, 0), functools.partial(proxy_server_class, request_handler=request_handler, **proxy_server_kwargs))
-        server_port = http_server_port(server)
-        server_thread = threading.Thread(target=server.serve_forever)
-        server_thread.daemon = True
-        server_thread.start()
-        if '.' not in bind_address:
-            yield f'[{bind_address}]:{server_port}'
-        else:
-            yield f'{bind_address}:{server_port}'
-    finally:
-        server.shutdown()
-        server.server_close()
-        server_thread.join(2.0)
-
-
-class HTTPProxyTestContext(abc.ABC):
-    REQUEST_HANDLER_CLASS = None
-    REQUEST_PROTO = None
-
-    def http_server(self, server_class, *args, **kwargs):
-        return proxy_server(server_class, self.REQUEST_HANDLER_CLASS, *args, **kwargs)
-
-    @abc.abstractmethod
-    def proxy_info_request(self, handler, target_domain=None, target_port=None, **req_kwargs) -> dict:
-        """return a dict of proxy_info"""
-
-
-class HTTPProxyHTTPTestContext(HTTPProxyTestContext):
-    # Standard HTTP Proxy for http requests
-    REQUEST_HANDLER_CLASS = HTTPProxyHandler
-    REQUEST_PROTO = 'http'
-
-    def proxy_info_request(self, handler, target_domain=None, target_port=None, **req_kwargs):
-        request = Request(f'http://{target_domain or "127.0.0.1"}:{target_port or "40000"}/proxy_info', **req_kwargs)
-        handler.validate(request)
-        return json.loads(handler.send(request).read().decode())
-
-
-class HTTPProxyHTTPSTestContext(HTTPProxyTestContext):
-    # HTTP Connect proxy, for https requests
-    REQUEST_HANDLER_CLASS = HTTPSProxyHandler
-    REQUEST_PROTO = 'https'
-
-    def proxy_info_request(self, handler, target_domain=None, target_port=None, **req_kwargs):
-        request = Request(f'https://{target_domain or "127.0.0.1"}:{target_port or "40000"}/proxy_info', **req_kwargs)
-        handler.validate(request)
-        return json.loads(handler.send(request).read().decode())
-
-
-CTX_MAP = {
-    'http': HTTPProxyHTTPTestContext,
-    'https': HTTPProxyHTTPSTestContext,
-}
-
-
-@pytest.fixture(scope='module')
-def ctx(request):
-    return CTX_MAP[request.param]()
-
-
-@pytest.mark.parametrize(
-    'handler', ['Urllib', 'Requests', 'CurlCFFI'], indirect=True)
-@pytest.mark.parametrize('ctx', ['http'], indirect=True)  # pure http proxy can only support http
-class TestHTTPProxy:
-    def test_http_no_auth(self, handler, ctx):
-        with ctx.http_server(HTTPProxyHandler) as server_address:
-            with handler(proxies={ctx.REQUEST_PROTO: f'http://{server_address}'}) as rh:
-                proxy_info = ctx.proxy_info_request(rh)
-                assert proxy_info['proxy'] == server_address
-                assert proxy_info['connect'] is False
-                assert 'Proxy-Authorization' not in proxy_info['headers']
-
-    def test_http_auth(self, handler, ctx):
-        with ctx.http_server(HTTPProxyHandler, username='test', password='test') as server_address:
-            with handler(proxies={ctx.REQUEST_PROTO: f'http://test:test@{server_address}'}) as rh:
-                proxy_info = ctx.proxy_info_request(rh)
-                assert proxy_info['proxy'] == server_address
-                assert 'Proxy-Authorization' in proxy_info['headers']
-
-    def test_http_bad_auth(self, handler, ctx):
-        with ctx.http_server(HTTPProxyHandler, username='test', password='test') as server_address:
-            with handler(proxies={ctx.REQUEST_PROTO: f'http://test:bad@{server_address}'}) as rh:
-                with pytest.raises(HTTPError) as exc_info:
-                    ctx.proxy_info_request(rh)
-                assert exc_info.value.response.status == 407
-                exc_info.value.response.close()
-
-    def test_http_source_address(self, handler, ctx):
-        with ctx.http_server(HTTPProxyHandler) as server_address:
-            source_address = f'127.0.0.{random.randint(5, 255)}'
-            verify_address_availability(source_address)
-            with handler(proxies={ctx.REQUEST_PROTO: f'http://{server_address}'},
-                         source_address=source_address) as rh:
-                proxy_info = ctx.proxy_info_request(rh)
-                assert proxy_info['proxy'] == server_address
-                assert proxy_info['client_address'][0] == source_address
-
-    @pytest.mark.skip_handler('Urllib', 'urllib does not support https proxies')
-    def test_https(self, handler, ctx):
-        with ctx.http_server(HTTPSProxyHandler) as server_address:
-            with handler(verify=False, proxies={ctx.REQUEST_PROTO: f'https://{server_address}'}) as rh:
-                proxy_info = ctx.proxy_info_request(rh)
-                assert proxy_info['proxy'] == server_address
-                assert proxy_info['connect'] is False
-                assert 'Proxy-Authorization' not in proxy_info['headers']
-
-    @pytest.mark.skip_handler('Urllib', 'urllib does not support https proxies')
-    def test_https_verify_failed(self, handler, ctx):
-        with ctx.http_server(HTTPSProxyHandler) as server_address:
-            with handler(verify=True, proxies={ctx.REQUEST_PROTO: f'https://{server_address}'}) as rh:
-                # Accept SSLError as may not be feasible to tell if it is proxy or request error.
-                # note: if request proto also does ssl verification, this may also be the error of the request.
-                # Until we can support passing custom cacerts to handlers, we cannot properly test this for all cases.
-                with pytest.raises((ProxyError, SSLError)):
-                    ctx.proxy_info_request(rh)
-
-    def test_http_with_idn(self, handler, ctx):
-        with ctx.http_server(HTTPProxyHandler) as server_address:
-            with handler(proxies={ctx.REQUEST_PROTO: f'http://{server_address}'}) as rh:
-                proxy_info = ctx.proxy_info_request(rh, target_domain='中文.tw')
-                assert proxy_info['proxy'] == server_address
-                assert proxy_info['path'].startswith('http://xn--fiq228c.tw')
-                assert proxy_info['headers']['Host'].split(':', 1)[0] == 'xn--fiq228c.tw'
-
-
-@pytest.mark.parametrize(
-    'handler,ctx', [
-        ('Requests', 'https'),
-        ('CurlCFFI', 'https'),
-    ], indirect=True)
-class TestHTTPConnectProxy:
-    def test_http_connect_no_auth(self, handler, ctx):
-        with ctx.http_server(HTTPConnectProxyHandler) as server_address:
-            with handler(verify=False, proxies={ctx.REQUEST_PROTO: f'http://{server_address}'}) as rh:
-                proxy_info = ctx.proxy_info_request(rh)
-                assert proxy_info['proxy'] == server_address
-                assert proxy_info['connect'] is True
-                assert 'Proxy-Authorization' not in proxy_info['headers']
-
-    def test_http_connect_auth(self, handler, ctx):
-        with ctx.http_server(HTTPConnectProxyHandler, username='test', password='test') as server_address:
-            with handler(verify=False, proxies={ctx.REQUEST_PROTO: f'http://test:test@{server_address}'}) as rh:
-                proxy_info = ctx.proxy_info_request(rh)
-                assert proxy_info['proxy'] == server_address
-                assert 'Proxy-Authorization' in proxy_info['headers']
-
-    def test_http_connect_bad_auth(self, handler, ctx):
-        with ctx.http_server(HTTPConnectProxyHandler, username='test', password='test') as server_address:
-            with handler(verify=False, proxies={ctx.REQUEST_PROTO: f'http://test:bad@{server_address}'}) as rh:
-                with pytest.raises(ProxyError):
-                    ctx.proxy_info_request(rh)
-
-    def test_http_connect_source_address(self, handler, ctx):
-        with ctx.http_server(HTTPConnectProxyHandler) as server_address:
-            source_address = f'127.0.0.{random.randint(5, 255)}'
-            verify_address_availability(source_address)
-            with handler(proxies={ctx.REQUEST_PROTO: f'http://{server_address}'},
-                         source_address=source_address,
-                         verify=False) as rh:
-                proxy_info = ctx.proxy_info_request(rh)
-                assert proxy_info['proxy'] == server_address
-                assert proxy_info['client_address'][0] == source_address
-
-    @pytest.mark.skipif(urllib3 is None, reason='requires urllib3 to test')
-    def test_https_connect_proxy(self, handler, ctx):
-        with ctx.http_server(HTTPSConnectProxyHandler) as server_address:
-            with handler(verify=False, proxies={ctx.REQUEST_PROTO: f'https://{server_address}'}) as rh:
-                proxy_info = ctx.proxy_info_request(rh)
-                assert proxy_info['proxy'] == server_address
-                assert proxy_info['connect'] is True
-                assert 'Proxy-Authorization' not in proxy_info['headers']
-
-    @pytest.mark.skipif(urllib3 is None, reason='requires urllib3 to test')
-    def test_https_connect_verify_failed(self, handler, ctx):
-        with ctx.http_server(HTTPSConnectProxyHandler) as server_address:
-            with handler(verify=True, proxies={ctx.REQUEST_PROTO: f'https://{server_address}'}) as rh:
-                # Accept SSLError as may not be feasible to tell if it is proxy or request error.
-                # note: if request proto also does ssl verification, this may also be the error of the request.
-                # Until we can support passing custom cacerts to handlers, we cannot properly test this for all cases.
-                with pytest.raises((ProxyError, SSLError)):
-                    ctx.proxy_info_request(rh)
-
-    @pytest.mark.skipif(urllib3 is None, reason='requires urllib3 to test')
-    def test_https_connect_proxy_auth(self, handler, ctx):
-        with ctx.http_server(HTTPSConnectProxyHandler, username='test', password='test') as server_address:
-            with handler(verify=False, proxies={ctx.REQUEST_PROTO: f'https://test:test@{server_address}'}) as rh:
-                proxy_info = ctx.proxy_info_request(rh)
-                assert proxy_info['proxy'] == server_address
-                assert 'Proxy-Authorization' in proxy_info['headers']

test/test_iqiyi_sdk_interpreter.py

@@ -29,11 +29,11 @@ class WarningLogger:
 @is_download_test
 class TestIqiyiSDKInterpreter(unittest.TestCase):
     def test_iqiyi_sdk_interpreter(self):
-        """
+        '''
         Test the functionality of IqiyiSDKInterpreter by trying to log in
 
         If `sign` is incorrect, /validate call throws an HTTP 556 error
-        """
+        '''
         logger = WarningLogger()
         ie = IqiyiIE(FakeYDL({'logger': logger}))
         ie._perform_login('foo', 'bar')

test/test_jsinterp.py

@@ -9,7 +9,7 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 import math
 
-from yt_dlp.jsinterp import JS_Undefined, JSInterpreter, js_number_to_string
+from yt_dlp.jsinterp import JS_Undefined, JSInterpreter
 
 
 class NaN:
@@ -92,17 +92,6 @@ class TestJSInterpreter(unittest.TestCase):
         self._test('function f(){return 0 && 1 || 2;}', 2)
         self._test('function f(){return 0 ?? 42;}', 0)
         self._test('function f(){return "life, the universe and everything" < 42;}', False)
-        self._test('function f(){return 0  - 7 * - 6;}', 42)
-        self._test('function f(){return true << "5";}', 32)
-        self._test('function f(){return true << true;}', 2)
-        self._test('function f(){return "19" & "21.9";}', 17)
-        self._test('function f(){return "19" & false;}', 0)
-        self._test('function f(){return "11.0" >> "2.1";}', 2)
-        self._test('function f(){return 5 ^ 9;}', 12)
-        self._test('function f(){return 0.0 << NaN}', 0)
-        self._test('function f(){return null << undefined}', 0)
-        # TODO: Does not work due to number too large
-        # self._test('function f(){return 21 << 4294967297}', 42)
 
     def test_array_access(self):
         self._test('function f(){var x = [1,2,3]; x[0] = 4; x[0] = 5; x[2.0] = 7; return x;}', [5, 2, 7])
@@ -118,7 +107,6 @@ class TestJSInterpreter(unittest.TestCase):
         self._test('function f(){var x = 20; x = 30 + 1; return x;}', 31)
         self._test('function f(){var x = 20; x += 30 + 1; return x;}', 51)
         self._test('function f(){var x = 20; x -= 30 + 1; return x;}', -11)
-        self._test('function f(){var x = 2; var y = ["a", "b"]; y[x%y["length"]]="z"; return y}', ['z', 'b'])
 
     @unittest.skip('Not implemented')
     def test_comments(self):
@@ -385,110 +373,7 @@ class TestJSInterpreter(unittest.TestCase):
     @unittest.skip('Not implemented')
     def test_packed(self):
         jsi = JSInterpreter('''function f(p,a,c,k,e,d){while(c--)if(k[c])p=p.replace(new RegExp('\\b'+c.toString(a)+'\\b','g'),k[c]);return p}''')
-        self.assertEqual(jsi.call_function('f', '''h 7=g("1j");7.7h({7g:[{33:"w://7f-7e-7d-7c.v.7b/7a/79/78/77/76.74?t=73&s=2s&e=72&f=2t&71=70.0.0.1&6z=6y&6x=6w"}],6v:"w://32.v.u/6u.31",16:"r%",15:"r%",6t:"6s",6r:"",6q:"l",6p:"l",6o:"6n",6m:\'6l\',6k:"6j",9:[{33:"/2u?b=6i&n=50&6h=w://32.v.u/6g.31",6f:"6e"}],1y:{6d:1,6c:\'#6b\',6a:\'#69\',68:"67",66:30,65:r,},"64":{63:"%62 2m%m%61%5z%5y%5x.u%5w%5v%5u.2y%22 2k%m%1o%22 5t%m%1o%22 5s%m%1o%22 2j%m%5r%22 16%m%5q%22 15%m%5p%22 5o%2z%5n%5m%2z",5l:"w://v.u/d/1k/5k.2y",5j:[]},\'5i\':{"5h":"5g"},5f:"5e",5d:"w://v.u",5c:{},5b:l,1x:[0.25,0.50,0.75,1,1.25,1.5,2]});h 1m,1n,5a;h 59=0,58=0;h 7=g("1j");h 2x=0,57=0,56=0;$.55({54:{\'53-52\':\'2i-51\'}});7.j(\'4z\',6(x){c(5>0&&x.1l>=5&&1n!=1){1n=1;$(\'q.4y\').4x(\'4w\')}});7.j(\'13\',6(x){2x=x.1l});7.j(\'2g\',6(x){2w(x)});7.j(\'4v\',6(){$(\'q.2v\').4u()});6 2w(x){$(\'q.2v\').4t();c(1m)19;1m=1;17=0;c(4s.4r===l){17=1}$.4q(\'/2u?b=4p&2l=1k&4o=2t-4n-4m-2s-4l&4k=&4j=&4i=&17=\'+17,6(2r){$(\'#4h\').4g(2r)});$(\'.3-8-4f-4e:4d("4c")\').2h(6(e){2q();g().4b(0);g().4a(l)});6 2q(){h $14=$("<q />").2p({1l:"49",16:"r%",15:"r%",48:0,2n:0,2o:47,46:"45(10%, 10%, 10%, 0.4)","44-43":"42"});$("<41 />").2p({16:"60%",15:"60%",2o:40,"3z-2n":"3y"}).3x({\'2m\':\'/?b=3w&2l=1k\',\'2k\':\'0\',\'2j\':\'2i\'}).2f($14);$14.2h(6(){$(3v).3u();g().2g()});$14.2f($(\'#1j\'))}g().13(0);}6 3t(){h 9=7.1b(2e);2d.2c(9);c(9.n>1){1r(i=0;i<9.n;i++){c(9[i].1a==2e){2d.2c(\'!!=\'+i);7.1p(i)}}}}7.j(\'3s\',6(){g().1h("/2a/3r.29","3q 10 28",6(){g().13(g().27()+10)},"2b");$("q[26=2b]").23().21(\'.3-20-1z\');g().1h("/2a/3p.29","3o 10 28",6(){h 12=g().27()-10;c(12<0)12=0;g().13(12)},"24");$("q[26=24]").23().21(\'.3-20-1z\');});6 1i(){}7.j(\'3n\',6(){1i()});7.j(\'3m\',6(){1i()});7.j("k",6(y){h 9=7.1b();c(9.n<2)19;$(\'.3-8-3l-3k\').3j(6(){$(\'#3-8-a-k\').1e(\'3-8-a-z\');$(\'.3-a-k\').p(\'o-1f\',\'11\')});7.1h("/3i/3h.3g","3f 3e",6(){$(\'.3-1w\').3d(\'3-8-1v\');$(\'.3-8-1y, .3-8-1x\').p(\'o-1g\',\'11\');c($(\'.3-1w\').3c(\'3-8-1v\')){$(\'.3-a-k\').p(\'o-1g\',\'l\');$(\'.3-a-k\').p(\'o-1f\',\'l\');$(\'.3-8-a\').1e(\'3-8-a-z\');$(\'.3-8-a:1u\').3b(\'3-8-a-z\')}3a{$(\'.3-a-k\').p(\'o-1g\',\'11\');$(\'.3-a-k\').p(\'o-1f\',\'11\');$(\'.3-8-a:1u\').1e(\'3-8-a-z\')}},"39");7.j("38",6(y){1d.37(\'1c\',y.9[y.36].1a)});c(1d.1t(\'1c\')){35("1s(1d.1t(\'1c\'));",34)}});h 18;6 1s(1q){h 9=7.1b();c(9.n>1){1r(i=0;i<9.n;i++){c(9[i].1a==1q){c(i==18){19}18=i;7.1p(i)}}}}',36,270,'|||jw|||function|player|settings|tracks|submenu||if||||jwplayer|var||on|audioTracks|true|3D|length|aria|attr|div|100|||sx|filemoon|https||event|active||false|tt|seek|dd|height|width|adb|current_audio|return|name|getAudioTracks|default_audio|localStorage|removeClass|expanded|checked|addButton|callMeMaybe|vplayer|0fxcyc2ajhp1|position|vvplay|vvad|220|setCurrentAudioTrack|audio_name|for|audio_set|getItem|last|open|controls|playbackRates|captions|rewind|icon|insertAfter||detach|ff00||button|getPosition|sec|png|player8|ff11|log|console|track_name|appendTo|play|click|no|scrolling|frameborder|file_code|src|top|zIndex|css|showCCform|data|1662367683|383371|dl|video_ad|doPlay|prevt|mp4|3E||jpg|thumbs|file|300|setTimeout|currentTrack|setItem|audioTrackChanged|dualSound|else|addClass|hasClass|toggleClass|Track|Audio|svg|dualy|images|mousedown|buttons|topbar|playAttemptFailed|beforePlay|Rewind|fr|Forward|ff|ready|set_audio_track|remove|this|upload_srt|prop|50px|margin|1000001|iframe|center|align|text|rgba|background|1000000|left|absolute|pause|setCurrentCaptions|Upload|contains|item|content|html|fviews|referer|prem|embed|3e57249ef633e0d03bf76ceb8d8a4b65|216|83|hash|view|get|TokenZir|window|hide|show|complete|slow|fadeIn|video_ad_fadein|time||cache|Cache|Content|headers|ajaxSetup|v2done|tott|vastdone2|vastdone1|vvbefore|playbackRateControls|cast|aboutlink|FileMoon|abouttext|UHD|1870|qualityLabels|sites|GNOME_POWER|link|2Fiframe|3C|allowfullscreen|22360|22640|22no|marginheight|marginwidth|2FGNOME_POWER|2F0fxcyc2ajhp1|2Fe|2Ffilemoon|2F|3A||22https|3Ciframe|code|sharing|fontOpacity|backgroundOpacity|Tahoma|fontFamily|303030|backgroundColor|FFFFFF|color|userFontScale|thumbnails|kind|0fxcyc2ajhp10000|url|get_slides|start|startparam|none|preload|html5|primary|hlshtml|androidhls|duration|uniform|stretching|0fxcyc2ajhp1_xt|image|2048|sp|6871|asn|127|srv|43200|_g3XlBcu2lmD9oDexD2NLWSmah2Nu3XcDrl93m9PwXY|m3u8||master|0fxcyc2ajhp1_x|00076|01|hls2|to|s01|delivery|storage|moon|sources|setup'''.split('|')))  # noqa: SIM905
-
-    def test_join(self):
-        test_input = list('test')
-        tests = [
-            'function f(a, b){return a.join(b)}',
-            'function f(a, b){return Array.prototype.join.call(a, b)}',
-            'function f(a, b){return Array.prototype.join.apply(a, [b])}',
-        ]
-        for test in tests:
-            jsi = JSInterpreter(test)
-            self._test(jsi, 'test', args=[test_input, ''])
-            self._test(jsi, 't-e-s-t', args=[test_input, '-'])
-            self._test(jsi, '', args=[[], '-'])
-
-    def test_split(self):
-        test_result = list('test')
-        tests = [
-            'function f(a, b){return a.split(b)}',
-            'function f(a, b){return a["split"](b)}',
-            'function f(a, b){let x = ["split"]; return a[x[0]](b)}',
-            'function f(a, b){return String.prototype.split.call(a, b)}',
-            'function f(a, b){return String.prototype.split.apply(a, [b])}',
-        ]
-        for test in tests:
-            jsi = JSInterpreter(test)
-            self._test(jsi, test_result, args=['test', ''])
-            self._test(jsi, test_result, args=['t-e-s-t', '-'])
-            self._test(jsi, [''], args=['', '-'])
-            self._test(jsi, [], args=['', ''])
-
-    def test_slice(self):
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice()}', [0, 1, 2, 3, 4, 5, 6, 7, 8])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(0)}', [0, 1, 2, 3, 4, 5, 6, 7, 8])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(5)}', [5, 6, 7, 8])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(99)}', [])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(-2)}', [7, 8])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(-99)}', [0, 1, 2, 3, 4, 5, 6, 7, 8])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(0, 0)}', [])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(1, 0)}', [])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(0, 1)}', [0])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(3, 6)}', [3, 4, 5])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(1, -1)}', [1, 2, 3, 4, 5, 6, 7])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(-1, 1)}', [])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(-3, -1)}', [6, 7])
-        self._test('function f(){return "012345678".slice()}', '012345678')
-        self._test('function f(){return "012345678".slice(0)}', '012345678')
-        self._test('function f(){return "012345678".slice(5)}', '5678')
-        self._test('function f(){return "012345678".slice(99)}', '')
-        self._test('function f(){return "012345678".slice(-2)}', '78')
-        self._test('function f(){return "012345678".slice(-99)}', '012345678')
-        self._test('function f(){return "012345678".slice(0, 0)}', '')
-        self._test('function f(){return "012345678".slice(1, 0)}', '')
-        self._test('function f(){return "012345678".slice(0, 1)}', '0')
-        self._test('function f(){return "012345678".slice(3, 6)}', '345')
-        self._test('function f(){return "012345678".slice(1, -1)}', '1234567')
-        self._test('function f(){return "012345678".slice(-1, 1)}', '')
-        self._test('function f(){return "012345678".slice(-3, -1)}', '67')
-
-    def test_splice(self):
-        self._test('function f(){var T = ["0", "1", "2"]; T["splice"](2, 1, "0")[0]; return T }', ['0', '1', '0'])
-
-    def test_js_number_to_string(self):
-        for test, radix, expected in [
-            (0, None, '0'),
-            (-0, None, '0'),
-            (0.0, None, '0'),
-            (-0.0, None, '0'),
-            (math.nan, None, 'NaN'),
-            (-math.nan, None, 'NaN'),
-            (math.inf, None, 'Infinity'),
-            (-math.inf, None, '-Infinity'),
-            (10 ** 21.5, 8, '526665530627250154000000'),
-            (6, 2, '110'),
-            (254, 16, 'fe'),
-            (-10, 2, '-1010'),
-            (-0xff, 2, '-11111111'),
-            (0.1 + 0.2, 16, '0.4cccccccccccd'),
-            (1234.1234, 10, '1234.1234'),
-            # (1000000000000000128, 10, '1000000000000000100')
-        ]:
-            assert js_number_to_string(test, radix) == expected
-
-    def test_extract_function(self):
-        jsi = JSInterpreter('function a(b) { return b + 1; }')
-        func = jsi.extract_function('a')
-        self.assertEqual(func([2]), 3)
-
-    def test_extract_function_with_global_stack(self):
-        jsi = JSInterpreter('function c(d) { return d + e + f + g; }')
-        func = jsi.extract_function('c', {'e': 10}, {'f': 100, 'g': 1000})
-        self.assertEqual(func([1]), 1111)
-
-    def test_extract_object(self):
-        jsi = JSInterpreter('var a={};a.xy={};var xy;var zxy={};xy={z:function(){return "abc"}};')
-        self.assertTrue('z' in jsi.extract_object('xy', None))
-
-    def test_increment_decrement(self):
-        self._test('function f() { var x = 1; return ++x; }', 2)
-        self._test('function f() { var x = 1; return x++; }', 1)
-        self._test('function f() { var x = 1; x--; return x }', 0)
-        self._test('function f() { var y; var x = 1; x++, --x, x--, x--, y="z", "abc", x++; return --x }', -1)
-        self._test('function f() { var a = "test--"; return a; }', 'test--')
-        self._test('function f() { var b = 1; var a = "b--"; return a; }', 'b--')
+        self.assertEqual(jsi.call_function('f', '''h 7=g("1j");7.7h({7g:[{33:"w://7f-7e-7d-7c.v.7b/7a/79/78/77/76.74?t=73&s=2s&e=72&f=2t&71=70.0.0.1&6z=6y&6x=6w"}],6v:"w://32.v.u/6u.31",16:"r%",15:"r%",6t:"6s",6r:"",6q:"l",6p:"l",6o:"6n",6m:\'6l\',6k:"6j",9:[{33:"/2u?b=6i&n=50&6h=w://32.v.u/6g.31",6f:"6e"}],1y:{6d:1,6c:\'#6b\',6a:\'#69\',68:"67",66:30,65:r,},"64":{63:"%62 2m%m%61%5z%5y%5x.u%5w%5v%5u.2y%22 2k%m%1o%22 5t%m%1o%22 5s%m%1o%22 2j%m%5r%22 16%m%5q%22 15%m%5p%22 5o%2z%5n%5m%2z",5l:"w://v.u/d/1k/5k.2y",5j:[]},\'5i\':{"5h":"5g"},5f:"5e",5d:"w://v.u",5c:{},5b:l,1x:[0.25,0.50,0.75,1,1.25,1.5,2]});h 1m,1n,5a;h 59=0,58=0;h 7=g("1j");h 2x=0,57=0,56=0;$.55({54:{\'53-52\':\'2i-51\'}});7.j(\'4z\',6(x){c(5>0&&x.1l>=5&&1n!=1){1n=1;$(\'q.4y\').4x(\'4w\')}});7.j(\'13\',6(x){2x=x.1l});7.j(\'2g\',6(x){2w(x)});7.j(\'4v\',6(){$(\'q.2v\').4u()});6 2w(x){$(\'q.2v\').4t();c(1m)19;1m=1;17=0;c(4s.4r===l){17=1}$.4q(\'/2u?b=4p&2l=1k&4o=2t-4n-4m-2s-4l&4k=&4j=&4i=&17=\'+17,6(2r){$(\'#4h\').4g(2r)});$(\'.3-8-4f-4e:4d("4c")\').2h(6(e){2q();g().4b(0);g().4a(l)});6 2q(){h $14=$("<q />").2p({1l:"49",16:"r%",15:"r%",48:0,2n:0,2o:47,46:"45(10%, 10%, 10%, 0.4)","44-43":"42"});$("<41 />").2p({16:"60%",15:"60%",2o:40,"3z-2n":"3y"}).3x({\'2m\':\'/?b=3w&2l=1k\',\'2k\':\'0\',\'2j\':\'2i\'}).2f($14);$14.2h(6(){$(3v).3u();g().2g()});$14.2f($(\'#1j\'))}g().13(0);}6 3t(){h 9=7.1b(2e);2d.2c(9);c(9.n>1){1r(i=0;i<9.n;i++){c(9[i].1a==2e){2d.2c(\'!!=\'+i);7.1p(i)}}}}7.j(\'3s\',6(){g().1h("/2a/3r.29","3q 10 28",6(){g().13(g().27()+10)},"2b");$("q[26=2b]").23().21(\'.3-20-1z\');g().1h("/2a/3p.29","3o 10 28",6(){h 12=g().27()-10;c(12<0)12=0;g().13(12)},"24");$("q[26=24]").23().21(\'.3-20-1z\');});6 1i(){}7.j(\'3n\',6(){1i()});7.j(\'3m\',6(){1i()});7.j("k",6(y){h 9=7.1b();c(9.n<2)19;$(\'.3-8-3l-3k\').3j(6(){$(\'#3-8-a-k\').1e(\'3-8-a-z\');$(\'.3-a-k\').p(\'o-1f\',\'11\')});7.1h("/3i/3h.3g","3f 3e",6(){$(\'.3-1w\').3d(\'3-8-1v\');$(\'.3-8-1y, .3-8-1x\').p(\'o-1g\',\'11\');c($(\'.3-1w\').3c(\'3-8-1v\')){$(\'.3-a-k\').p(\'o-1g\',\'l\');$(\'.3-a-k\').p(\'o-1f\',\'l\');$(\'.3-8-a\').1e(\'3-8-a-z\');$(\'.3-8-a:1u\').3b(\'3-8-a-z\')}3a{$(\'.3-a-k\').p(\'o-1g\',\'11\');$(\'.3-a-k\').p(\'o-1f\',\'11\');$(\'.3-8-a:1u\').1e(\'3-8-a-z\')}},"39");7.j("38",6(y){1d.37(\'1c\',y.9[y.36].1a)});c(1d.1t(\'1c\')){35("1s(1d.1t(\'1c\'));",34)}});h 18;6 1s(1q){h 9=7.1b();c(9.n>1){1r(i=0;i<9.n;i++){c(9[i].1a==1q){c(i==18){19}18=i;7.1p(i)}}}}',36,270,'|||jw|||function|player|settings|tracks|submenu||if||||jwplayer|var||on|audioTracks|true|3D|length|aria|attr|div|100|||sx|filemoon|https||event|active||false|tt|seek|dd|height|width|adb|current_audio|return|name|getAudioTracks|default_audio|localStorage|removeClass|expanded|checked|addButton|callMeMaybe|vplayer|0fxcyc2ajhp1|position|vvplay|vvad|220|setCurrentAudioTrack|audio_name|for|audio_set|getItem|last|open|controls|playbackRates|captions|rewind|icon|insertAfter||detach|ff00||button|getPosition|sec|png|player8|ff11|log|console|track_name|appendTo|play|click|no|scrolling|frameborder|file_code|src|top|zIndex|css|showCCform|data|1662367683|383371|dl|video_ad|doPlay|prevt|mp4|3E||jpg|thumbs|file|300|setTimeout|currentTrack|setItem|audioTrackChanged|dualSound|else|addClass|hasClass|toggleClass|Track|Audio|svg|dualy|images|mousedown|buttons|topbar|playAttemptFailed|beforePlay|Rewind|fr|Forward|ff|ready|set_audio_track|remove|this|upload_srt|prop|50px|margin|1000001|iframe|center|align|text|rgba|background|1000000|left|absolute|pause|setCurrentCaptions|Upload|contains|item|content|html|fviews|referer|prem|embed|3e57249ef633e0d03bf76ceb8d8a4b65|216|83|hash|view|get|TokenZir|window|hide|show|complete|slow|fadeIn|video_ad_fadein|time||cache|Cache|Content|headers|ajaxSetup|v2done|tott|vastdone2|vastdone1|vvbefore|playbackRateControls|cast|aboutlink|FileMoon|abouttext|UHD|1870|qualityLabels|sites|GNOME_POWER|link|2Fiframe|3C|allowfullscreen|22360|22640|22no|marginheight|marginwidth|2FGNOME_POWER|2F0fxcyc2ajhp1|2Fe|2Ffilemoon|2F|3A||22https|3Ciframe|code|sharing|fontOpacity|backgroundOpacity|Tahoma|fontFamily|303030|backgroundColor|FFFFFF|color|userFontScale|thumbnails|kind|0fxcyc2ajhp10000|url|get_slides|start|startparam|none|preload|html5|primary|hlshtml|androidhls|duration|uniform|stretching|0fxcyc2ajhp1_xt|image|2048|sp|6871|asn|127|srv|43200|_g3XlBcu2lmD9oDexD2NLWSmah2Nu3XcDrl93m9PwXY|m3u8||master|0fxcyc2ajhp1_x|00076|01|hls2|to|s01|delivery|storage|moon|sources|setup'''.split('|')))
 
 
 if __name__ == '__main__':

test/test_netrc.py

@@ -21,7 +21,7 @@ class TestNetRc(unittest.TestCase):
                 continue
             self.assertTrue(
                 ie._NETRC_MACHINE,
-                f'Extractor {ie.IE_NAME} supports login, but is missing a _NETRC_MACHINE property')
+                'Extractor %s supports login, but is missing a _NETRC_MACHINE property' % ie.IE_NAME)
 
 
 if __name__ == '__main__':

test/test_networking_utils.py

@@ -20,6 +20,7 @@ from yt_dlp.networking._helper import (
     add_accept_encoding_header,
     get_redirect_method,
     make_socks_proxy_opts,
+    select_proxy,
     ssl_load_certs,
 )
 from yt_dlp.networking.exceptions import (
@@ -27,7 +28,7 @@ from yt_dlp.networking.exceptions import (
     IncompleteRead,
 )
 from yt_dlp.socks import ProxyType
-from yt_dlp.utils.networking import HTTPHeaderDict, select_proxy
+from yt_dlp.utils.networking import HTTPHeaderDict
 
 TEST_DIR = os.path.dirname(os.path.abspath(__file__))
 
@@ -38,7 +39,7 @@ class TestNetworkingUtils:
         proxies = {
             'all': 'socks5://example.com',
             'http': 'http://example.com:1080',
-            'no': 'bypass.example.com,yt-dl.org',
+            'no': 'bypass.example.com,yt-dl.org'
         }
 
         assert select_proxy('https://example.com', proxies) == proxies['all']
@@ -53,7 +54,7 @@ class TestNetworkingUtils:
             'port': 1080,
             'rdns': True,
             'username': None,
-            'password': None,
+            'password': None
         }),
         ('socks5://user:@example.com:5555', {
             'proxytype': ProxyType.SOCKS5,
@@ -61,7 +62,7 @@ class TestNetworkingUtils:
             'port': 5555,
             'rdns': False,
             'username': 'user',
-            'password': '',
+            'password': ''
         }),
         ('socks4://u%40ser:pa%20ss@127.0.0.1:1080', {
             'proxytype': ProxyType.SOCKS4,
@@ -69,7 +70,7 @@ class TestNetworkingUtils:
             'port': 1080,
             'rdns': False,
             'username': 'u@ser',
-            'password': 'pa ss',
+            'password': 'pa ss'
         }),
         ('socks4a://:pa%20ss@127.0.0.1', {
             'proxytype': ProxyType.SOCKS4A,
@@ -77,8 +78,8 @@ class TestNetworkingUtils:
             'port': 1080,
             'rdns': True,
             'username': '',
-            'password': 'pa ss',
-        }),
+            'password': 'pa ss'
+        })
     ])
     def test_make_socks_proxy_opts(self, socks_proxy, expected):
         assert make_socks_proxy_opts(socks_proxy) == expected

test/test_overwrites.py

@@ -27,7 +27,7 @@ class TestOverwrites(unittest.TestCase):
             [
                 sys.executable, 'yt_dlp/__main__.py',
                 '-o', 'test.webm',
-                'https://www.youtube.com/watch?v=jNQXAC9IVRw',
+                'https://www.youtube.com/watch?v=jNQXAC9IVRw'
             ], cwd=root_dir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         sout, serr = outp.communicate()
         self.assertTrue(b'has already been downloaded' in sout)
@@ -39,7 +39,7 @@ class TestOverwrites(unittest.TestCase):
             [
                 sys.executable, 'yt_dlp/__main__.py', '--yes-overwrites',
                 '-o', 'test.webm',
-                'https://www.youtube.com/watch?v=jNQXAC9IVRw',
+                'https://www.youtube.com/watch?v=jNQXAC9IVRw'
             ], cwd=root_dir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         sout, serr = outp.communicate()
         self.assertTrue(b'has already been downloaded' not in sout)

test/test_plugins.py

@@ -10,103 +10,41 @@ TEST_DATA_DIR = Path(os.path.dirname(os.path.abspath(__file__)), 'testdata')
 sys.path.append(str(TEST_DATA_DIR))
 importlib.invalidate_caches()
 
-from yt_dlp.plugins import (
-    PACKAGE_NAME,
-    PluginSpec,
-    directories,
-    load_plugins,
-    load_all_plugins,
-    register_plugin_spec,
-)
-
-from yt_dlp.globals import (
-    extractors,
-    postprocessors,
-    plugin_dirs,
-    plugin_ies,
-    plugin_pps,
-    all_plugins_loaded,
-    plugin_specs,
-)
-
-
-EXTRACTOR_PLUGIN_SPEC = PluginSpec(
-    module_name='extractor',
-    suffix='IE',
-    destination=extractors,
-    plugin_destination=plugin_ies,
-)
-
-POSTPROCESSOR_PLUGIN_SPEC = PluginSpec(
-    module_name='postprocessor',
-    suffix='PP',
-    destination=postprocessors,
-    plugin_destination=plugin_pps,
-)
-
-
-def reset_plugins():
-    plugin_ies.value = {}
-    plugin_pps.value = {}
-    plugin_dirs.value = ['default']
-    plugin_specs.value = {}
-    all_plugins_loaded.value = False
-    # Clearing override plugins is probably difficult
-    for module_name in tuple(sys.modules):
-        for plugin_type in ('extractor', 'postprocessor'):
-            if module_name.startswith(f'{PACKAGE_NAME}.{plugin_type}.'):
-                del sys.modules[module_name]
-
-    importlib.invalidate_caches()
+from yt_dlp.plugins import PACKAGE_NAME, directories, load_plugins
 
 
 class TestPlugins(unittest.TestCase):
 
     TEST_PLUGIN_DIR = TEST_DATA_DIR / PACKAGE_NAME
 
-    def setUp(self):
-        reset_plugins()
-
-    def tearDown(self):
-        reset_plugins()
-
     def test_directories_containing_plugins(self):
         self.assertIn(self.TEST_PLUGIN_DIR, map(Path, directories()))
 
     def test_extractor_classes(self):
-        plugins_ie = load_plugins(EXTRACTOR_PLUGIN_SPEC)
+        for module_name in tuple(sys.modules):
+            if module_name.startswith(f'{PACKAGE_NAME}.extractor'):
+                del sys.modules[module_name]
+        plugins_ie = load_plugins('extractor', 'IE')
 
         self.assertIn(f'{PACKAGE_NAME}.extractor.normal', sys.modules.keys())
         self.assertIn('NormalPluginIE', plugins_ie.keys())
 
         # don't load modules with underscore prefix
         self.assertFalse(
-            f'{PACKAGE_NAME}.extractor._ignore' in sys.modules,
+            f'{PACKAGE_NAME}.extractor._ignore' in sys.modules.keys(),
             'loaded module beginning with underscore')
         self.assertNotIn('IgnorePluginIE', plugins_ie.keys())
-        self.assertNotIn('IgnorePluginIE', plugin_ies.value)
 
         # Don't load extractors with underscore prefix
         self.assertNotIn('_IgnoreUnderscorePluginIE', plugins_ie.keys())
-        self.assertNotIn('_IgnoreUnderscorePluginIE', plugin_ies.value)
 
         # Don't load extractors not specified in __all__ (if supplied)
         self.assertNotIn('IgnoreNotInAllPluginIE', plugins_ie.keys())
-        self.assertNotIn('IgnoreNotInAllPluginIE', plugin_ies.value)
         self.assertIn('InAllPluginIE', plugins_ie.keys())
-        self.assertIn('InAllPluginIE', plugin_ies.value)
-
-        # Don't load override extractors
-        self.assertNotIn('OverrideGenericIE', plugins_ie.keys())
-        self.assertNotIn('OverrideGenericIE', plugin_ies.value)
-        self.assertNotIn('_UnderscoreOverrideGenericIE', plugins_ie.keys())
-        self.assertNotIn('_UnderscoreOverrideGenericIE', plugin_ies.value)
 
     def test_postprocessor_classes(self):
-        plugins_pp = load_plugins(POSTPROCESSOR_PLUGIN_SPEC)
+        plugins_pp = load_plugins('postprocessor', 'PP')
         self.assertIn('NormalPluginPP', plugins_pp.keys())
-        self.assertIn(f'{PACKAGE_NAME}.postprocessor.normal', sys.modules.keys())
-        self.assertIn('NormalPluginPP', plugin_pps.value)
 
     def test_importing_zipped_module(self):
         zip_path = TEST_DATA_DIR / 'zipped_plugins.zip'
@@ -119,10 +57,10 @@ class TestPlugins(unittest.TestCase):
                 package = importlib.import_module(f'{PACKAGE_NAME}.{plugin_type}')
                 self.assertIn(zip_path / PACKAGE_NAME / plugin_type, map(Path, package.__path__))
 
-            plugins_ie = load_plugins(EXTRACTOR_PLUGIN_SPEC)
+            plugins_ie = load_plugins('extractor', 'IE')
             self.assertIn('ZippedPluginIE', plugins_ie.keys())
 
-            plugins_pp = load_plugins(POSTPROCESSOR_PLUGIN_SPEC)
+            plugins_pp = load_plugins('postprocessor', 'PP')
             self.assertIn('ZippedPluginPP', plugins_pp.keys())
 
         finally:
@@ -130,117 +68,6 @@ class TestPlugins(unittest.TestCase):
             os.remove(zip_path)
             importlib.invalidate_caches()  # reset the import caches
 
-    def test_reloading_plugins(self):
-        reload_plugins_path = TEST_DATA_DIR / 'reload_plugins'
-        load_plugins(EXTRACTOR_PLUGIN_SPEC)
-        load_plugins(POSTPROCESSOR_PLUGIN_SPEC)
-
-        # Remove default folder and add reload_plugin path
-        sys.path.remove(str(TEST_DATA_DIR))
-        sys.path.append(str(reload_plugins_path))
-        importlib.invalidate_caches()
-        try:
-            for plugin_type in ('extractor', 'postprocessor'):
-                package = importlib.import_module(f'{PACKAGE_NAME}.{plugin_type}')
-                self.assertIn(reload_plugins_path / PACKAGE_NAME / plugin_type, map(Path, package.__path__))
-
-            plugins_ie = load_plugins(EXTRACTOR_PLUGIN_SPEC)
-            self.assertIn('NormalPluginIE', plugins_ie.keys())
-            self.assertTrue(
-                plugins_ie['NormalPluginIE'].REPLACED,
-                msg='Reloading has not replaced original extractor plugin')
-            self.assertTrue(
-                extractors.value['NormalPluginIE'].REPLACED,
-                msg='Reloading has not replaced original extractor plugin globally')
-
-            plugins_pp = load_plugins(POSTPROCESSOR_PLUGIN_SPEC)
-            self.assertIn('NormalPluginPP', plugins_pp.keys())
-            self.assertTrue(plugins_pp['NormalPluginPP'].REPLACED,
-                            msg='Reloading has not replaced original postprocessor plugin')
-            self.assertTrue(
-                postprocessors.value['NormalPluginPP'].REPLACED,
-                msg='Reloading has not replaced original postprocessor plugin globally')
-
-        finally:
-            sys.path.remove(str(reload_plugins_path))
-            sys.path.append(str(TEST_DATA_DIR))
-            importlib.invalidate_caches()
-
-    def test_extractor_override_plugin(self):
-        load_plugins(EXTRACTOR_PLUGIN_SPEC)
-
-        from yt_dlp.extractor.generic import GenericIE
-
-        self.assertEqual(GenericIE.TEST_FIELD, 'override')
-        self.assertEqual(GenericIE.SECONDARY_TEST_FIELD, 'underscore-override')
-
-        self.assertEqual(GenericIE.IE_NAME, 'generic+override+underscore-override')
-        importlib.invalidate_caches()
-        #  test that loading a second time doesn't wrap a second time
-        load_plugins(EXTRACTOR_PLUGIN_SPEC)
-        from yt_dlp.extractor.generic import GenericIE
-        self.assertEqual(GenericIE.IE_NAME, 'generic+override+underscore-override')
-
-    def test_load_all_plugin_types(self):
-
-        # no plugin specs registered
-        load_all_plugins()
-
-        self.assertNotIn(f'{PACKAGE_NAME}.extractor.normal', sys.modules.keys())
-        self.assertNotIn(f'{PACKAGE_NAME}.postprocessor.normal', sys.modules.keys())
-
-        register_plugin_spec(EXTRACTOR_PLUGIN_SPEC)
-        register_plugin_spec(POSTPROCESSOR_PLUGIN_SPEC)
-        load_all_plugins()
-        self.assertTrue(all_plugins_loaded.value)
-
-        self.assertIn(f'{PACKAGE_NAME}.extractor.normal', sys.modules.keys())
-        self.assertIn(f'{PACKAGE_NAME}.postprocessor.normal', sys.modules.keys())
-
-    def test_no_plugin_dirs(self):
-        register_plugin_spec(EXTRACTOR_PLUGIN_SPEC)
-        register_plugin_spec(POSTPROCESSOR_PLUGIN_SPEC)
-
-        plugin_dirs.value = []
-        load_all_plugins()
-
-        self.assertNotIn(f'{PACKAGE_NAME}.extractor.normal', sys.modules.keys())
-        self.assertNotIn(f'{PACKAGE_NAME}.postprocessor.normal', sys.modules.keys())
-
-    def test_set_plugin_dirs(self):
-        custom_plugin_dir = str(TEST_DATA_DIR / 'plugin_packages')
-        plugin_dirs.value = [custom_plugin_dir]
-
-        load_plugins(EXTRACTOR_PLUGIN_SPEC)
-
-        self.assertIn(f'{PACKAGE_NAME}.extractor.package', sys.modules.keys())
-        self.assertIn('PackagePluginIE', plugin_ies.value)
-
-    def test_invalid_plugin_dir(self):
-        plugin_dirs.value = ['invalid_dir']
-        with self.assertRaises(ValueError):
-            load_plugins(EXTRACTOR_PLUGIN_SPEC)
-
-    def test_append_plugin_dirs(self):
-        custom_plugin_dir = str(TEST_DATA_DIR / 'plugin_packages')
-
-        self.assertEqual(plugin_dirs.value, ['default'])
-        plugin_dirs.value.append(custom_plugin_dir)
-        self.assertEqual(plugin_dirs.value, ['default', custom_plugin_dir])
-
-        load_plugins(EXTRACTOR_PLUGIN_SPEC)
-
-        self.assertIn(f'{PACKAGE_NAME}.extractor.package', sys.modules.keys())
-        self.assertIn('PackagePluginIE', plugin_ies.value)
-
-    def test_get_plugin_spec(self):
-        register_plugin_spec(EXTRACTOR_PLUGIN_SPEC)
-        register_plugin_spec(POSTPROCESSOR_PLUGIN_SPEC)
-
-        self.assertEqual(plugin_specs.value.get('extractor'), EXTRACTOR_PLUGIN_SPEC)
-        self.assertEqual(plugin_specs.value.get('postprocessor'), POSTPROCESSOR_PLUGIN_SPEC)
-        self.assertIsNone(plugin_specs.value.get('invalid'))
-
 
 if __name__ == '__main__':
     unittest.main()

test/test_post_hooks.py

@@ -59,7 +59,7 @@ class TestPostHooks(unittest.TestCase):
 
     def hook_three(self, filename):
         self.files.append(filename)
-        raise Exception(f'Test exception for \'{filename}\'')
+        raise Exception('Test exception for \'%s\'' % filename)
 
     def tearDown(self):
         for f in self.files:

test/test_postprocessors.py

@@ -8,10 +8,8 @@ import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
-import subprocess
-
 from yt_dlp import YoutubeDL
-from yt_dlp.utils import shell_quote
+from yt_dlp.compat import compat_shlex_quote
 from yt_dlp.postprocessor import (
     ExecPP,
     FFmpegThumbnailsConvertorPP,
@@ -49,18 +47,7 @@ class TestConvertThumbnail(unittest.TestCase):
             print('Skipping: ffmpeg not found')
             return
 
-        test_data_dir = 'test/testdata/thumbnails'
-        generated_file = f'{test_data_dir}/empty.webp'
-
-        subprocess.check_call([
-            pp.executable, '-y', '-f', 'lavfi', '-i', 'color=c=black:s=320x320',
-            '-c:v', 'libwebp', '-pix_fmt', 'yuv420p', '-vframes', '1', generated_file,
-        ], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
-
-        file = test_data_dir + '/foo %d bar/foo_%d.{}'
-        initial_file = file.format('webp')
-        os.replace(generated_file, initial_file)
-
+        file = 'test/testdata/thumbnails/foo %d bar/foo_%d.{}'
         tests = (('webp', 'png'), ('png', 'jpg'))
 
         for inp, out in tests:
@@ -68,19 +55,17 @@ class TestConvertThumbnail(unittest.TestCase):
             if os.path.exists(out_file):
                 os.remove(out_file)
             pp.convert_thumbnail(file.format(inp), out)
-            self.assertTrue(os.path.exists(out_file))
+            assert os.path.exists(out_file)
 
         for _, out in tests:
             os.remove(file.format(out))
 
-        os.remove(initial_file)
-
 
 class TestExec(unittest.TestCase):
     def test_parse_cmd(self):
         pp = ExecPP(YoutubeDL(), '')
         info = {'filepath': 'file name'}
-        cmd = 'echo {}'.format(shell_quote(info['filepath']))
+        cmd = 'echo %s' % compat_shlex_quote(info['filepath'])
 
         self.assertEqual(pp.parse_cmd('echo', info), cmd)
         self.assertEqual(pp.parse_cmd('echo {}', info), cmd)
@@ -140,8 +125,7 @@ class TestModifyChaptersPP(unittest.TestCase):
         self._remove_marked_arrange_sponsors_test_impl(chapters, chapters, [])
 
     def test_remove_marked_arrange_sponsors_ChapterWithSponsors(self):
-        chapters = [
-            *self._chapters([70], ['c']),
+        chapters = self._chapters([70], ['c']) + [
             self._sponsor_chapter(10, 20, 'sponsor'),
             self._sponsor_chapter(30, 40, 'preview'),
             self._sponsor_chapter(50, 60, 'filler')]
@@ -152,8 +136,7 @@ class TestModifyChaptersPP(unittest.TestCase):
         self._remove_marked_arrange_sponsors_test_impl(chapters, expected, [])
 
     def test_remove_marked_arrange_sponsors_SponsorBlockChapters(self):
-        chapters = [
-            *self._chapters([70], ['c']),
+        chapters = self._chapters([70], ['c']) + [
             self._sponsor_chapter(10, 20, 'chapter', title='sb c1'),
             self._sponsor_chapter(15, 16, 'chapter', title='sb c2'),
             self._sponsor_chapter(30, 40, 'preview'),
@@ -166,14 +149,10 @@ class TestModifyChaptersPP(unittest.TestCase):
         self._remove_marked_arrange_sponsors_test_impl(chapters, expected, [])
 
     def test_remove_marked_arrange_sponsors_UniqueNamesForOverlappingSponsors(self):
-        chapters = [
-            *self._chapters([120], ['c']),
-            self._sponsor_chapter(10, 45, 'sponsor'),
-            self._sponsor_chapter(20, 40, 'selfpromo'),
-            self._sponsor_chapter(50, 70, 'sponsor'),
-            self._sponsor_chapter(60, 85, 'selfpromo'),
-            self._sponsor_chapter(90, 120, 'selfpromo'),
-            self._sponsor_chapter(100, 110, 'sponsor')]
+        chapters = self._chapters([120], ['c']) + [
+            self._sponsor_chapter(10, 45, 'sponsor'), self._sponsor_chapter(20, 40, 'selfpromo'),
+            self._sponsor_chapter(50, 70, 'sponsor'), self._sponsor_chapter(60, 85, 'selfpromo'),
+            self._sponsor_chapter(90, 120, 'selfpromo'), self._sponsor_chapter(100, 110, 'sponsor')]
         expected = self._chapters(
             [10, 20, 40, 45, 50, 60, 70, 85, 90, 100, 110, 120],
             ['c', '[SponsorBlock]: Sponsor', '[SponsorBlock]: Sponsor, Unpaid/Self Promotion',
@@ -193,8 +172,7 @@ class TestModifyChaptersPP(unittest.TestCase):
             chapters, self._chapters([40], ['c']), cuts)
 
     def test_remove_marked_arrange_sponsors_ChapterWithSponsorsAndCuts(self):
-        chapters = [
-            *self._chapters([70], ['c']),
+        chapters = self._chapters([70], ['c']) + [
             self._sponsor_chapter(10, 20, 'sponsor'),
             self._sponsor_chapter(30, 40, 'selfpromo', remove=True),
             self._sponsor_chapter(50, 60, 'interaction')]
@@ -207,29 +185,24 @@ class TestModifyChaptersPP(unittest.TestCase):
     def test_remove_marked_arrange_sponsors_ChapterWithSponsorCutInTheMiddle(self):
         cuts = [self._sponsor_chapter(20, 30, 'selfpromo', remove=True),
                 self._chapter(40, 50, remove=True)]
-        chapters = [
-            *self._chapters([70], ['c']),
-            self._sponsor_chapter(10, 60, 'sponsor'),
-            *cuts]
+        chapters = self._chapters([70], ['c']) + [self._sponsor_chapter(10, 60, 'sponsor')] + cuts
         expected = self._chapters(
             [10, 40, 50], ['c', '[SponsorBlock]: Sponsor', 'c'])
         self._remove_marked_arrange_sponsors_test_impl(chapters, expected, cuts)
 
     def test_remove_marked_arrange_sponsors_ChapterWithCutHidingSponsor(self):
         cuts = [self._sponsor_chapter(20, 50, 'selfpromo', remove=True)]
-        chapters = [
-            *self._chapters([60], ['c']),
+        chapters = self._chapters([60], ['c']) + [
             self._sponsor_chapter(10, 20, 'intro'),
             self._sponsor_chapter(30, 40, 'sponsor'),
             self._sponsor_chapter(50, 60, 'outro'),
-            *cuts]
+        ] + cuts
         expected = self._chapters(
             [10, 20, 30], ['c', '[SponsorBlock]: Intermission/Intro Animation', '[SponsorBlock]: Endcards/Credits'])
         self._remove_marked_arrange_sponsors_test_impl(chapters, expected, cuts)
 
     def test_remove_marked_arrange_sponsors_ChapterWithAdjacentSponsors(self):
-        chapters = [
-            *self._chapters([70], ['c']),
+        chapters = self._chapters([70], ['c']) + [
             self._sponsor_chapter(10, 20, 'sponsor'),
             self._sponsor_chapter(20, 30, 'selfpromo'),
             self._sponsor_chapter(30, 40, 'interaction')]
@@ -240,8 +213,7 @@ class TestModifyChaptersPP(unittest.TestCase):
         self._remove_marked_arrange_sponsors_test_impl(chapters, expected, [])
 
     def test_remove_marked_arrange_sponsors_ChapterWithAdjacentCuts(self):
-        chapters = [
-            *self._chapters([70], ['c']),
+        chapters = self._chapters([70], ['c']) + [
             self._sponsor_chapter(10, 20, 'sponsor'),
             self._sponsor_chapter(20, 30, 'interaction', remove=True),
             self._chapter(30, 40, remove=True),
@@ -254,8 +226,7 @@ class TestModifyChaptersPP(unittest.TestCase):
             chapters, expected, [self._chapter(20, 50, remove=True)])
 
     def test_remove_marked_arrange_sponsors_ChapterWithOverlappingSponsors(self):
-        chapters = [
-            *self._chapters([70], ['c']),
+        chapters = self._chapters([70], ['c']) + [
             self._sponsor_chapter(10, 30, 'sponsor'),
             self._sponsor_chapter(20, 50, 'selfpromo'),
             self._sponsor_chapter(40, 60, 'interaction')]
@@ -267,8 +238,7 @@ class TestModifyChaptersPP(unittest.TestCase):
         self._remove_marked_arrange_sponsors_test_impl(chapters, expected, [])
 
     def test_remove_marked_arrange_sponsors_ChapterWithOverlappingCuts(self):
-        chapters = [
-            *self._chapters([70], ['c']),
+        chapters = self._chapters([70], ['c']) + [
             self._sponsor_chapter(10, 30, 'sponsor', remove=True),
             self._sponsor_chapter(20, 50, 'selfpromo', remove=True),
             self._sponsor_chapter(40, 60, 'interaction', remove=True)]
@@ -276,8 +246,7 @@ class TestModifyChaptersPP(unittest.TestCase):
             chapters, self._chapters([20], ['c']), [self._chapter(10, 60, remove=True)])
 
     def test_remove_marked_arrange_sponsors_ChapterWithRunsOfOverlappingSponsors(self):
-        chapters = [
-            *self._chapters([170], ['c']),
+        chapters = self._chapters([170], ['c']) + [
             self._sponsor_chapter(0, 30, 'intro'),
             self._sponsor_chapter(20, 50, 'sponsor'),
             self._sponsor_chapter(40, 60, 'selfpromo'),
@@ -298,8 +267,7 @@ class TestModifyChaptersPP(unittest.TestCase):
         self._remove_marked_arrange_sponsors_test_impl(chapters, expected, [])
 
     def test_remove_marked_arrange_sponsors_ChapterWithRunsOfOverlappingCuts(self):
-        chapters = [
-            *self._chapters([170], ['c']),
+        chapters = self._chapters([170], ['c']) + [
             self._chapter(0, 30, remove=True),
             self._sponsor_chapter(20, 50, 'sponsor', remove=True),
             self._chapter(40, 60, remove=True),
@@ -316,8 +284,7 @@ class TestModifyChaptersPP(unittest.TestCase):
             chapters, self._chapters([20], ['c']), expected_cuts)
 
     def test_remove_marked_arrange_sponsors_OverlappingSponsorsDifferentTitlesAfterCut(self):
-        chapters = [
-            *self._chapters([60], ['c']),
+        chapters = self._chapters([60], ['c']) + [
             self._sponsor_chapter(10, 60, 'sponsor'),
             self._sponsor_chapter(10, 40, 'intro'),
             self._sponsor_chapter(30, 50, 'interaction'),
@@ -330,8 +297,7 @@ class TestModifyChaptersPP(unittest.TestCase):
             chapters, expected, [self._chapter(30, 50, remove=True)])
 
     def test_remove_marked_arrange_sponsors_SponsorsNoLongerOverlapAfterCut(self):
-        chapters = [
-            *self._chapters([70], ['c']),
+        chapters = self._chapters([70], ['c']) + [
             self._sponsor_chapter(10, 30, 'sponsor'),
             self._sponsor_chapter(20, 50, 'interaction'),
             self._sponsor_chapter(30, 50, 'selfpromo', remove=True),
@@ -344,8 +310,7 @@ class TestModifyChaptersPP(unittest.TestCase):
             chapters, expected, [self._chapter(30, 50, remove=True)])
 
     def test_remove_marked_arrange_sponsors_SponsorsStillOverlapAfterCut(self):
-        chapters = [
-            *self._chapters([70], ['c']),
+        chapters = self._chapters([70], ['c']) + [
             self._sponsor_chapter(10, 60, 'sponsor'),
             self._sponsor_chapter(20, 60, 'interaction'),
             self._sponsor_chapter(30, 50, 'selfpromo', remove=True)]
@@ -356,8 +321,7 @@ class TestModifyChaptersPP(unittest.TestCase):
             chapters, expected, [self._chapter(30, 50, remove=True)])
 
     def test_remove_marked_arrange_sponsors_ChapterWithRunsOfOverlappingSponsorsAndCuts(self):
-        chapters = [
-            *self._chapters([200], ['c']),
+        chapters = self._chapters([200], ['c']) + [
             self._sponsor_chapter(10, 40, 'sponsor'),
             self._sponsor_chapter(10, 30, 'intro'),
             self._chapter(20, 30, remove=True),
@@ -383,9 +347,8 @@ class TestModifyChaptersPP(unittest.TestCase):
         self._remove_marked_arrange_sponsors_test_impl(chapters, expected, expected_cuts)
 
     def test_remove_marked_arrange_sponsors_SponsorOverlapsMultipleChapters(self):
-        chapters = [
-            *self._chapters([20, 40, 60, 80, 100], ['c1', 'c2', 'c3', 'c4', 'c5']),
-            self._sponsor_chapter(10, 90, 'sponsor')]
+        chapters = (self._chapters([20, 40, 60, 80, 100], ['c1', 'c2', 'c3', 'c4', 'c5'])
+                    + [self._sponsor_chapter(10, 90, 'sponsor')])
         expected = self._chapters([10, 90, 100], ['c1', '[SponsorBlock]: Sponsor', 'c5'])
         self._remove_marked_arrange_sponsors_test_impl(chapters, expected, [])
 
@@ -396,10 +359,9 @@ class TestModifyChaptersPP(unittest.TestCase):
         self._remove_marked_arrange_sponsors_test_impl(chapters, expected, cuts)
 
     def test_remove_marked_arrange_sponsors_SponsorsWithinSomeChaptersAndOverlappingOthers(self):
-        chapters = [
-            *self._chapters([10, 40, 60, 80], ['c1', 'c2', 'c3', 'c4']),
-            self._sponsor_chapter(20, 30, 'sponsor'),
-            self._sponsor_chapter(50, 70, 'selfpromo')]
+        chapters = (self._chapters([10, 40, 60, 80], ['c1', 'c2', 'c3', 'c4'])
+                    + [self._sponsor_chapter(20, 30, 'sponsor'),
+                       self._sponsor_chapter(50, 70, 'selfpromo')])
         expected = self._chapters([10, 20, 30, 40, 50, 70, 80],
                                   ['c1', 'c2', '[SponsorBlock]: Sponsor', 'c2', 'c3',
                                    '[SponsorBlock]: Unpaid/Self Promotion', 'c4'])
@@ -412,9 +374,8 @@ class TestModifyChaptersPP(unittest.TestCase):
         self._remove_marked_arrange_sponsors_test_impl(chapters, expected, cuts)
 
     def test_remove_marked_arrange_sponsors_ChaptersAfterLastSponsor(self):
-        chapters = [
-            *self._chapters([20, 40, 50, 60], ['c1', 'c2', 'c3', 'c4']),
-            self._sponsor_chapter(10, 30, 'music_offtopic')]
+        chapters = (self._chapters([20, 40, 50, 60], ['c1', 'c2', 'c3', 'c4'])
+                    + [self._sponsor_chapter(10, 30, 'music_offtopic')])
         expected = self._chapters(
             [10, 30, 40, 50, 60],
             ['c1', '[SponsorBlock]: Non-Music Section', 'c2', 'c3', 'c4'])
@@ -427,9 +388,8 @@ class TestModifyChaptersPP(unittest.TestCase):
         self._remove_marked_arrange_sponsors_test_impl(chapters, expected, cuts)
 
     def test_remove_marked_arrange_sponsors_SponsorStartsAtChapterStart(self):
-        chapters = [
-            *self._chapters([10, 20, 40], ['c1', 'c2', 'c3']),
-            self._sponsor_chapter(20, 30, 'sponsor')]
+        chapters = (self._chapters([10, 20, 40], ['c1', 'c2', 'c3'])
+                    + [self._sponsor_chapter(20, 30, 'sponsor')])
         expected = self._chapters([10, 20, 30, 40], ['c1', 'c2', '[SponsorBlock]: Sponsor', 'c3'])
         self._remove_marked_arrange_sponsors_test_impl(chapters, expected, [])
 
@@ -440,9 +400,8 @@ class TestModifyChaptersPP(unittest.TestCase):
         self._remove_marked_arrange_sponsors_test_impl(chapters, expected, cuts)
 
     def test_remove_marked_arrange_sponsors_SponsorEndsAtChapterEnd(self):
-        chapters = [
-            *self._chapters([10, 30, 40], ['c1', 'c2', 'c3']),
-            self._sponsor_chapter(20, 30, 'sponsor')]
+        chapters = (self._chapters([10, 30, 40], ['c1', 'c2', 'c3'])
+                    + [self._sponsor_chapter(20, 30, 'sponsor')])
         expected = self._chapters([10, 20, 30, 40], ['c1', 'c2', '[SponsorBlock]: Sponsor', 'c3'])
         self._remove_marked_arrange_sponsors_test_impl(chapters, expected, [])
 
@@ -453,9 +412,8 @@ class TestModifyChaptersPP(unittest.TestCase):
         self._remove_marked_arrange_sponsors_test_impl(chapters, expected, cuts)
 
     def test_remove_marked_arrange_sponsors_SponsorCoincidesWithChapters(self):
-        chapters = [
-            *self._chapters([10, 20, 30, 40], ['c1', 'c2', 'c3', 'c4']),
-            self._sponsor_chapter(10, 30, 'sponsor')]
+        chapters = (self._chapters([10, 20, 30, 40], ['c1', 'c2', 'c3', 'c4'])
+                    + [self._sponsor_chapter(10, 30, 'sponsor')])
         expected = self._chapters([10, 30, 40], ['c1', '[SponsorBlock]: Sponsor', 'c4'])
         self._remove_marked_arrange_sponsors_test_impl(chapters, expected, [])
 
@@ -466,9 +424,8 @@ class TestModifyChaptersPP(unittest.TestCase):
         self._remove_marked_arrange_sponsors_test_impl(chapters, expected, cuts)
 
     def test_remove_marked_arrange_sponsors_SponsorsAtVideoBoundaries(self):
-        chapters = [
-            *self._chapters([20, 40, 60], ['c1', 'c2', 'c3']),
-            self._sponsor_chapter(0, 10, 'intro'), self._sponsor_chapter(50, 60, 'outro')]
+        chapters = (self._chapters([20, 40, 60], ['c1', 'c2', 'c3'])
+                    + [self._sponsor_chapter(0, 10, 'intro'), self._sponsor_chapter(50, 60, 'outro')])
         expected = self._chapters(
             [10, 20, 40, 50, 60], ['[SponsorBlock]: Intermission/Intro Animation', 'c1', 'c2', 'c3', '[SponsorBlock]: Endcards/Credits'])
         self._remove_marked_arrange_sponsors_test_impl(chapters, expected, [])
@@ -480,10 +437,8 @@ class TestModifyChaptersPP(unittest.TestCase):
         self._remove_marked_arrange_sponsors_test_impl(chapters, expected, cuts)
 
     def test_remove_marked_arrange_sponsors_SponsorsOverlapChaptersAtVideoBoundaries(self):
-        chapters = [
-            *self._chapters([10, 40, 50], ['c1', 'c2', 'c3']),
-            self._sponsor_chapter(0, 20, 'intro'),
-            self._sponsor_chapter(30, 50, 'outro')]
+        chapters = (self._chapters([10, 40, 50], ['c1', 'c2', 'c3'])
+                    + [self._sponsor_chapter(0, 20, 'intro'), self._sponsor_chapter(30, 50, 'outro')])
         expected = self._chapters(
             [20, 30, 50], ['[SponsorBlock]: Intermission/Intro Animation', 'c2', '[SponsorBlock]: Endcards/Credits'])
         self._remove_marked_arrange_sponsors_test_impl(chapters, expected, [])
@@ -495,10 +450,8 @@ class TestModifyChaptersPP(unittest.TestCase):
         self._remove_marked_arrange_sponsors_test_impl(chapters, expected, cuts)
 
     def test_remove_marked_arrange_sponsors_EverythingSponsored(self):
-        chapters = [
-            *self._chapters([10, 20, 30, 40], ['c1', 'c2', 'c3', 'c4']),
-            self._sponsor_chapter(0, 20, 'intro'),
-            self._sponsor_chapter(20, 40, 'outro')]
+        chapters = (self._chapters([10, 20, 30, 40], ['c1', 'c2', 'c3', 'c4'])
+                    + [self._sponsor_chapter(0, 20, 'intro'), self._sponsor_chapter(20, 40, 'outro')])
         expected = self._chapters([20, 40], ['[SponsorBlock]: Intermission/Intro Animation', '[SponsorBlock]: Endcards/Credits'])
         self._remove_marked_arrange_sponsors_test_impl(chapters, expected, [])
 
@@ -538,39 +491,38 @@ class TestModifyChaptersPP(unittest.TestCase):
             chapters, self._chapters([2.5], ['c2']), cuts)
 
     def test_remove_marked_arrange_sponsors_TinyChaptersResultingFromSponsorOverlapAreIgnored(self):
-        chapters = [
-            *self._chapters([1, 3, 4], ['c1', 'c2', 'c3']),
+        chapters = self._chapters([1, 3, 4], ['c1', 'c2', 'c3']) + [
             self._sponsor_chapter(1.5, 2.5, 'sponsor')]
         self._remove_marked_arrange_sponsors_test_impl(
             chapters, self._chapters([1.5, 2.5, 4], ['c1', '[SponsorBlock]: Sponsor', 'c3']), [])
 
     def test_remove_marked_arrange_sponsors_TinySponsorsOverlapsAreIgnored(self):
-        chapters = [
-            *self._chapters([2, 3, 5], ['c1', 'c2', 'c3']),
+        chapters = self._chapters([2, 3, 5], ['c1', 'c2', 'c3']) + [
             self._sponsor_chapter(1, 3, 'sponsor'),
-            self._sponsor_chapter(2.5, 4, 'selfpromo')]
+            self._sponsor_chapter(2.5, 4, 'selfpromo')
+        ]
         self._remove_marked_arrange_sponsors_test_impl(
             chapters, self._chapters([1, 3, 4, 5], [
                 'c1', '[SponsorBlock]: Sponsor', '[SponsorBlock]: Unpaid/Self Promotion', 'c3']), [])
 
     def test_remove_marked_arrange_sponsors_TinySponsorsPrependedToTheNextSponsor(self):
-        chapters = [
-            *self._chapters([4], ['c']),
+        chapters = self._chapters([4], ['c']) + [
             self._sponsor_chapter(1.5, 2, 'sponsor'),
-            self._sponsor_chapter(2, 4, 'selfpromo')]
+            self._sponsor_chapter(2, 4, 'selfpromo')
+        ]
         self._remove_marked_arrange_sponsors_test_impl(
             chapters, self._chapters([1.5, 4], ['c', '[SponsorBlock]: Unpaid/Self Promotion']), [])
 
     def test_remove_marked_arrange_sponsors_SmallestSponsorInTheOverlapGetsNamed(self):
         self._pp._sponsorblock_chapter_title = '[SponsorBlock]: %(name)s'
-        chapters = [
-            *self._chapters([10], ['c']),
+        chapters = self._chapters([10], ['c']) + [
             self._sponsor_chapter(2, 8, 'sponsor'),
-            self._sponsor_chapter(4, 6, 'selfpromo')]
+            self._sponsor_chapter(4, 6, 'selfpromo')
+        ]
         self._remove_marked_arrange_sponsors_test_impl(
             chapters, self._chapters([2, 4, 6, 8, 10], [
                 'c', '[SponsorBlock]: Sponsor', '[SponsorBlock]: Unpaid/Self Promotion',
-                '[SponsorBlock]: Sponsor', 'c',
+                '[SponsorBlock]: Sponsor', 'c'
             ]), [])
 
     def test_make_concat_opts_CommonCase(self):
@@ -625,7 +577,3 @@ outpoint 10.000000
         self.assertEqual(
             r"'special '\'' characters '\'' galore'\'\'\'",
             self._pp._quote_for_ffmpeg("special ' characters ' galore'''"))
-
-
-if __name__ == '__main__':
-    unittest.main()

test/test_pot/conftest.py

@@ -1,71 +0,0 @@
-import collections
-
-import pytest
-
-from yt_dlp import YoutubeDL
-from yt_dlp.cookies import YoutubeDLCookieJar
-from yt_dlp.extractor.common import InfoExtractor
-from yt_dlp.extractor.youtube.pot._provider import IEContentProviderLogger
-from yt_dlp.extractor.youtube.pot.provider import PoTokenRequest, PoTokenContext
-from yt_dlp.utils.networking import HTTPHeaderDict
-
-
-class MockLogger(IEContentProviderLogger):
-
-    log_level = IEContentProviderLogger.LogLevel.TRACE
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.messages = collections.defaultdict(list)
-
-    def trace(self, message: str):
-        self.messages['trace'].append(message)
-
-    def debug(self, message: str):
-        self.messages['debug'].append(message)
-
-    def info(self, message: str):
-        self.messages['info'].append(message)
-
-    def warning(self, message: str, *, once=False):
-        self.messages['warning'].append(message)
-
-    def error(self, message: str):
-        self.messages['error'].append(message)
-
-
-@pytest.fixture
-def ie() -> InfoExtractor:
-    ydl = YoutubeDL()
-    return ydl.get_info_extractor('Youtube')
-
-
-@pytest.fixture
-def logger() -> MockLogger:
-    return MockLogger()
-
-
-@pytest.fixture()
-def pot_request() -> PoTokenRequest:
-    return PoTokenRequest(
-        context=PoTokenContext.GVS,
-        innertube_context={'client': {'clientName': 'WEB'}},
-        innertube_host='youtube.com',
-        session_index=None,
-        player_url=None,
-        is_authenticated=False,
-        video_webpage=None,
-
-        visitor_data='example-visitor-data',
-        data_sync_id='example-data-sync-id',
-        video_id='example-video-id',
-
-        request_cookiejar=YoutubeDLCookieJar(),
-        request_proxy=None,
-        request_headers=HTTPHeaderDict(),
-        request_timeout=None,
-        request_source_address=None,
-        request_verify_tls=True,
-
-        bypass_cache=False,
-    )

test/test_pot/test_pot_builtin_memorycache.py

@@ -1,117 +0,0 @@
-import threading
-import time
-from collections import OrderedDict
-import pytest
-from yt_dlp.extractor.youtube.pot._provider import IEContentProvider, BuiltinIEContentProvider
-from yt_dlp.utils import bug_reports_message
-from yt_dlp.extractor.youtube.pot._builtin.memory_cache import MemoryLRUPCP, memorylru_preference, initialize_global_cache
-from yt_dlp.version import __version__
-from yt_dlp.extractor.youtube.pot._registry import _pot_cache_providers, _pot_memory_cache
-
-
-class TestMemoryLRUPCS:
-
-    def test_base_type(self):
-        assert issubclass(MemoryLRUPCP, IEContentProvider)
-        assert issubclass(MemoryLRUPCP, BuiltinIEContentProvider)
-
-    @pytest.fixture
-    def pcp(self, ie, logger) -> MemoryLRUPCP:
-        return MemoryLRUPCP(ie, logger, {}, initialize_cache=lambda max_size: (OrderedDict(), threading.Lock(), max_size))
-
-    def test_is_registered(self):
-        assert _pot_cache_providers.value.get('MemoryLRU') == MemoryLRUPCP
-
-    def test_initialization(self, pcp):
-        assert pcp.PROVIDER_NAME == 'memory'
-        assert pcp.PROVIDER_VERSION == __version__
-        assert pcp.BUG_REPORT_MESSAGE == bug_reports_message(before='')
-        assert pcp.is_available()
-
-    def test_store_and_get(self, pcp):
-        pcp.store('key1', 'value1', int(time.time()) + 60)
-        assert pcp.get('key1') == 'value1'
-        assert len(pcp.cache) == 1
-
-    def test_store_ignore_expired(self, pcp):
-        pcp.store('key1', 'value1', int(time.time()) - 1)
-        assert len(pcp.cache) == 0
-        assert pcp.get('key1') is None
-        assert len(pcp.cache) == 0
-
-    def test_store_override_existing_key(self, ie, logger):
-        MAX_SIZE = 2
-        pcp = MemoryLRUPCP(ie, logger, {}, initialize_cache=lambda max_size: (OrderedDict(), threading.Lock(), MAX_SIZE))
-        pcp.store('key1', 'value1', int(time.time()) + 60)
-        pcp.store('key2', 'value2', int(time.time()) + 60)
-        assert len(pcp.cache) == 2
-        pcp.store('key1', 'value2', int(time.time()) + 60)
-        # Ensure that the override key gets added to the end of the cache instead of in the same position
-        pcp.store('key3', 'value3', int(time.time()) + 60)
-        assert pcp.get('key1') == 'value2'
-
-    def test_store_ignore_expired_existing_key(self, pcp):
-        pcp.store('key1', 'value2', int(time.time()) + 60)
-        pcp.store('key1', 'value1', int(time.time()) - 1)
-        assert len(pcp.cache) == 1
-        assert pcp.get('key1') == 'value2'
-        assert len(pcp.cache) == 1
-
-    def test_get_key_expired(self, pcp):
-        pcp.store('key1', 'value1', int(time.time()) + 60)
-        assert pcp.get('key1') == 'value1'
-        assert len(pcp.cache) == 1
-        pcp.cache['key1'] = ('value1', int(time.time()) - 1)
-        assert pcp.get('key1') is None
-        assert len(pcp.cache) == 0
-
-    def test_lru_eviction(self, ie, logger):
-        MAX_SIZE = 2
-        provider = MemoryLRUPCP(ie, logger, {}, initialize_cache=lambda max_size: (OrderedDict(), threading.Lock(), MAX_SIZE))
-        provider.store('key1', 'value1', int(time.time()) + 5)
-        provider.store('key2', 'value2', int(time.time()) + 5)
-        assert len(provider.cache) == 2
-
-        assert provider.get('key1') == 'value1'
-
-        provider.store('key3', 'value3', int(time.time()) + 5)
-        assert len(provider.cache) == 2
-
-        assert provider.get('key2') is None
-
-        provider.store('key4', 'value4', int(time.time()) + 5)
-        assert len(provider.cache) == 2
-
-        assert provider.get('key1') is None
-        assert provider.get('key3') == 'value3'
-        assert provider.get('key4') == 'value4'
-
-    def test_delete(self, pcp):
-        pcp.store('key1', 'value1', int(time.time()) + 5)
-        assert len(pcp.cache) == 1
-        assert pcp.get('key1') == 'value1'
-        pcp.delete('key1')
-        assert len(pcp.cache) == 0
-        assert pcp.get('key1') is None
-
-    def test_use_global_cache_default(self, ie, logger):
-        pcp = MemoryLRUPCP(ie, logger, {})
-        assert pcp.max_size == _pot_memory_cache.value['max_size'] == 25
-        assert pcp.cache is _pot_memory_cache.value['cache']
-        assert pcp.lock is _pot_memory_cache.value['lock']
-
-        pcp2 = MemoryLRUPCP(ie, logger, {})
-        assert pcp.max_size == pcp2.max_size == _pot_memory_cache.value['max_size'] == 25
-        assert pcp.cache is pcp2.cache is _pot_memory_cache.value['cache']
-        assert pcp.lock is pcp2.lock is _pot_memory_cache.value['lock']
-
-    def test_fail_max_size_change_global(self, ie, logger):
-        pcp = MemoryLRUPCP(ie, logger, {})
-        assert pcp.max_size == _pot_memory_cache.value['max_size'] == 25
-        with pytest.raises(ValueError, match='Cannot change max_size of initialized global memory cache'):
-            initialize_global_cache(50)
-
-        assert pcp.max_size == _pot_memory_cache.value['max_size'] == 25
-
-    def test_memory_lru_preference(self, pcp, ie, pot_request):
-        assert memorylru_preference(pcp, pot_request) == 10000

test/test_pot/test_pot_builtin_utils.py

@@ -1,47 +0,0 @@
-import pytest
-from yt_dlp.extractor.youtube.pot.provider import (
-    PoTokenContext,
-
-)
-
-from yt_dlp.extractor.youtube.pot.utils import get_webpo_content_binding, ContentBindingType
-
-
-class TestGetWebPoContentBinding:
-
-    @pytest.mark.parametrize('client_name, context, is_authenticated, expected', [
-        *[(client, context, is_authenticated, expected) for client in [
-            'WEB', 'MWEB', 'TVHTML5', 'WEB_EMBEDDED_PLAYER', 'WEB_CREATOR', 'TVHTML5_SIMPLY_EMBEDDED_PLAYER', 'TVHTML5_SIMPLY']
-          for context, is_authenticated, expected in [
-            (PoTokenContext.GVS, False, ('example-visitor-data', ContentBindingType.VISITOR_DATA)),
-            (PoTokenContext.PLAYER, False, ('example-video-id', ContentBindingType.VIDEO_ID)),
-            (PoTokenContext.SUBS, False, ('example-video-id', ContentBindingType.VIDEO_ID)),
-            (PoTokenContext.GVS, True, ('example-data-sync-id', ContentBindingType.DATASYNC_ID)),
-        ]],
-        ('WEB_REMIX', PoTokenContext.GVS, False, ('example-visitor-data', ContentBindingType.VISITOR_DATA)),
-        ('WEB_REMIX', PoTokenContext.PLAYER, False, ('example-visitor-data', ContentBindingType.VISITOR_DATA)),
-        ('ANDROID', PoTokenContext.GVS, False, (None, None)),
-        ('IOS', PoTokenContext.GVS, False, (None, None)),
-    ])
-    def test_get_webpo_content_binding(self, pot_request, client_name, context, is_authenticated, expected):
-        pot_request.innertube_context['client']['clientName'] = client_name
-        pot_request.context = context
-        pot_request.is_authenticated = is_authenticated
-        assert get_webpo_content_binding(pot_request) == expected
-
-    def test_extract_visitor_id(self, pot_request):
-        pot_request.visitor_data = 'CgsxMjNhYmNYWVpfLSiA4s%2DqBg%3D%3D'
-        assert get_webpo_content_binding(pot_request, bind_to_visitor_id=True) == ('123abcXYZ_-', ContentBindingType.VISITOR_ID)
-
-    def test_invalid_visitor_id(self, pot_request):
-        # visitor id not alphanumeric (i.e. protobuf extraction failed)
-        pot_request.visitor_data = 'CggxMjM0NTY3OCiA4s-qBg%3D%3D'
-        assert get_webpo_content_binding(pot_request, bind_to_visitor_id=True) == (pot_request.visitor_data, ContentBindingType.VISITOR_DATA)
-
-    def test_no_visitor_id(self, pot_request):
-        pot_request.visitor_data = 'KIDiz6oG'
-        assert get_webpo_content_binding(pot_request, bind_to_visitor_id=True) == (pot_request.visitor_data, ContentBindingType.VISITOR_DATA)
-
-    def test_invalid_base64(self, pot_request):
-        pot_request.visitor_data = 'invalid-base64'
-        assert get_webpo_content_binding(pot_request, bind_to_visitor_id=True) == (pot_request.visitor_data, ContentBindingType.VISITOR_DATA)

test/test_pot/test_pot_builtin_webpospec.py

@@ -1,92 +0,0 @@
-import pytest
-
-from yt_dlp.extractor.youtube.pot._provider import IEContentProvider, BuiltinIEContentProvider
-from yt_dlp.extractor.youtube.pot.cache import CacheProviderWritePolicy
-from yt_dlp.utils import bug_reports_message
-from yt_dlp.extractor.youtube.pot.provider import (
-    PoTokenRequest,
-    PoTokenContext,
-
-)
-from yt_dlp.version import __version__
-
-from yt_dlp.extractor.youtube.pot._builtin.webpo_cachespec import WebPoPCSP
-from yt_dlp.extractor.youtube.pot._registry import _pot_pcs_providers
-
-
-@pytest.fixture()
-def pot_request(pot_request) -> PoTokenRequest:
-    pot_request.visitor_data = 'CgsxMjNhYmNYWVpfLSiA4s%2DqBg%3D%3D'  # visitor_id=123abcXYZ_-
-    return pot_request
-
-
-class TestWebPoPCSP:
-    def test_base_type(self):
-        assert issubclass(WebPoPCSP, IEContentProvider)
-        assert issubclass(WebPoPCSP, BuiltinIEContentProvider)
-
-    def test_init(self, ie, logger):
-        pcs = WebPoPCSP(ie=ie, logger=logger, settings={})
-        assert pcs.PROVIDER_NAME == 'webpo'
-        assert pcs.PROVIDER_VERSION == __version__
-        assert pcs.BUG_REPORT_MESSAGE == bug_reports_message(before='')
-        assert pcs.is_available()
-
-    def test_is_registered(self):
-        assert _pot_pcs_providers.value.get('WebPo') == WebPoPCSP
-
-    @pytest.mark.parametrize('client_name, context, is_authenticated', [
-        ('ANDROID', PoTokenContext.GVS, False),
-        ('IOS', PoTokenContext.GVS, False),
-        ('IOS', PoTokenContext.PLAYER, False),
-    ])
-    def test_not_supports(self, ie, logger, pot_request, client_name, context, is_authenticated):
-        pcs = WebPoPCSP(ie=ie, logger=logger, settings={})
-        pot_request.innertube_context['client']['clientName'] = client_name
-        pot_request.context = context
-        pot_request.is_authenticated = is_authenticated
-        assert pcs.generate_cache_spec(pot_request) is None
-
-    @pytest.mark.parametrize('client_name, context, is_authenticated, remote_host, source_address, request_proxy, expected', [
-        *[(client, context, is_authenticated, remote_host, source_address, request_proxy, expected) for client in [
-            'WEB', 'MWEB', 'TVHTML5', 'WEB_EMBEDDED_PLAYER', 'WEB_CREATOR', 'TVHTML5_SIMPLY_EMBEDDED_PLAYER', 'TVHTML5_SIMPLY']
-          for context, is_authenticated, remote_host, source_address, request_proxy, expected in [
-            (PoTokenContext.GVS, False, 'example-remote-host', 'example-source-address', 'example-request-proxy', {'t': 'webpo', 'ip': 'example-remote-host', 'sa': 'example-source-address', 'px': 'example-request-proxy', 'cb': '123abcXYZ_-', 'cbt': 'visitor_id'}),
-            (PoTokenContext.PLAYER, False, 'example-remote-host', 'example-source-address', 'example-request-proxy', {'t': 'webpo', 'ip': 'example-remote-host', 'sa': 'example-source-address', 'px': 'example-request-proxy', 'cb': '123abcXYZ_-', 'cbt': 'video_id'}),
-            (PoTokenContext.GVS, True, 'example-remote-host', 'example-source-address', 'example-request-proxy', {'t': 'webpo', 'ip': 'example-remote-host', 'sa': 'example-source-address', 'px': 'example-request-proxy', 'cb': 'example-data-sync-id', 'cbt': 'datasync_id'}),
-        ]],
-        ('WEB_REMIX', PoTokenContext.PLAYER, False, 'example-remote-host', 'example-source-address', 'example-request-proxy', {'t': 'webpo', 'ip': 'example-remote-host', 'sa': 'example-source-address', 'px': 'example-request-proxy', 'cb': '123abcXYZ_-', 'cbt': 'visitor_id'}),
-        ('WEB', PoTokenContext.GVS, False, None, None, None, {'t': 'webpo', 'cb': '123abcXYZ_-', 'cbt': 'visitor_id', 'ip': None, 'sa': None, 'px': None}),
-        ('TVHTML5', PoTokenContext.PLAYER, False, None, None, 'http://example.com', {'t': 'webpo', 'cb': '123abcXYZ_-', 'cbt': 'video_id', 'ip': None, 'sa': None, 'px': 'http://example.com'}),
-
-    ])
-    def test_generate_key_bindings(self, ie, logger, pot_request, client_name, context, is_authenticated, remote_host, source_address, request_proxy, expected):
-        pcs = WebPoPCSP(ie=ie, logger=logger, settings={})
-        pot_request.innertube_context['client']['clientName'] = client_name
-        pot_request.context = context
-        pot_request.is_authenticated = is_authenticated
-        pot_request.innertube_context['client']['remoteHost'] = remote_host
-        pot_request.request_source_address = source_address
-        pot_request.request_proxy = request_proxy
-        pot_request.video_id = '123abcXYZ_-'  # same as visitor id to test type
-
-        assert pcs.generate_cache_spec(pot_request).key_bindings == expected
-
-    def test_no_bind_visitor_id(self, ie, logger, pot_request):
-        # Should not bind to visitor id if setting is set to False
-        pcs = WebPoPCSP(ie=ie, logger=logger, settings={'bind_to_visitor_id': ['false']})
-        pot_request.innertube_context['client']['clientName'] = 'WEB'
-        pot_request.context = PoTokenContext.GVS
-        pot_request.is_authenticated = False
-        assert pcs.generate_cache_spec(pot_request).key_bindings == {'t': 'webpo', 'ip': None, 'sa': None, 'px': None, 'cb': 'CgsxMjNhYmNYWVpfLSiA4s%2DqBg%3D%3D', 'cbt': 'visitor_data'}
-
-    def test_default_ttl(self, ie, logger, pot_request):
-        pcs = WebPoPCSP(ie=ie, logger=logger, settings={})
-        assert pcs.generate_cache_spec(pot_request).default_ttl == 6 * 60 * 60  # should default to 6 hours
-
-    def test_write_policy(self, ie, logger, pot_request):
-        pcs = WebPoPCSP(ie=ie, logger=logger, settings={})
-        pot_request.context = PoTokenContext.GVS
-        assert pcs.generate_cache_spec(pot_request).write_policy == CacheProviderWritePolicy.WRITE_ALL
-        pot_request.context = PoTokenContext.PLAYER
-        assert pcs.generate_cache_spec(pot_request).write_policy == CacheProviderWritePolicy.WRITE_FIRST

test/test_pot/test_pot_framework.py

@@ -1,629 +0,0 @@
-import pytest
-
-from yt_dlp.extractor.youtube.pot._provider import IEContentProvider
-from yt_dlp.cookies import YoutubeDLCookieJar
-from yt_dlp.utils.networking import HTTPHeaderDict
-from yt_dlp.extractor.youtube.pot.provider import (
-    PoTokenRequest,
-    PoTokenContext,
-    ExternalRequestFeature,
-
-)
-
-from yt_dlp.extractor.youtube.pot.cache import (
-    PoTokenCacheProvider,
-    PoTokenCacheSpec,
-    PoTokenCacheSpecProvider,
-    CacheProviderWritePolicy,
-)
-
-import yt_dlp.extractor.youtube.pot.cache as cache
-
-from yt_dlp.networking import Request
-from yt_dlp.extractor.youtube.pot.provider import (
-    PoTokenResponse,
-    PoTokenProvider,
-    PoTokenProviderRejectedRequest,
-    provider_bug_report_message,
-    register_provider,
-    register_preference,
-)
-
-from yt_dlp.extractor.youtube.pot._registry import _pot_providers, _ptp_preferences, _pot_pcs_providers, _pot_cache_providers, _pot_cache_provider_preferences
-
-
-class ExamplePTP(PoTokenProvider):
-    PROVIDER_NAME = 'example'
-    PROVIDER_VERSION = '0.0.1'
-    BUG_REPORT_LOCATION = 'https://example.com/issues'
-
-    _SUPPORTED_CLIENTS = ('WEB',)
-    _SUPPORTED_CONTEXTS = (PoTokenContext.GVS, )
-
-    _SUPPORTED_EXTERNAL_REQUEST_FEATURES = (
-        ExternalRequestFeature.PROXY_SCHEME_HTTP,
-        ExternalRequestFeature.PROXY_SCHEME_SOCKS5H,
-    )
-
-    def is_available(self) -> bool:
-        return True
-
-    def _real_request_pot(self, request: PoTokenRequest) -> PoTokenResponse:
-        return PoTokenResponse('example-token', expires_at=123)
-
-
-class ExampleCacheProviderPCP(PoTokenCacheProvider):
-
-    PROVIDER_NAME = 'example'
-    PROVIDER_VERSION = '0.0.1'
-    BUG_REPORT_LOCATION = 'https://example.com/issues'
-
-    def is_available(self) -> bool:
-        return True
-
-    def get(self, key: str):
-        return 'example-cache'
-
-    def store(self, key: str, value: str, expires_at: int):
-        pass
-
-    def delete(self, key: str):
-        pass
-
-
-class ExampleCacheSpecProviderPCSP(PoTokenCacheSpecProvider):
-
-    PROVIDER_NAME = 'example'
-    PROVIDER_VERSION = '0.0.1'
-    BUG_REPORT_LOCATION = 'https://example.com/issues'
-
-    def generate_cache_spec(self, request: PoTokenRequest):
-        return PoTokenCacheSpec(
-            key_bindings={'field': 'example-key'},
-            default_ttl=60,
-            write_policy=CacheProviderWritePolicy.WRITE_FIRST,
-        )
-
-
-class TestPoTokenProvider:
-
-    def test_base_type(self):
-        assert issubclass(PoTokenProvider, IEContentProvider)
-
-    def test_create_provider_missing_fetch_method(self, ie, logger):
-        class MissingMethodsPTP(PoTokenProvider):
-            def is_available(self) -> bool:
-                return True
-
-        with pytest.raises(TypeError):
-            MissingMethodsPTP(ie=ie, logger=logger, settings={})
-
-    def test_create_provider_missing_available_method(self, ie, logger):
-        class MissingMethodsPTP(PoTokenProvider):
-            def _real_request_pot(self, request: PoTokenRequest) -> PoTokenResponse:
-                raise PoTokenProviderRejectedRequest('Not implemented')
-
-        with pytest.raises(TypeError):
-            MissingMethodsPTP(ie=ie, logger=logger, settings={})
-
-    def test_barebones_provider(self, ie, logger):
-        class BarebonesProviderPTP(PoTokenProvider):
-            def is_available(self) -> bool:
-                return True
-
-            def _real_request_pot(self, request: PoTokenRequest) -> PoTokenResponse:
-                raise PoTokenProviderRejectedRequest('Not implemented')
-
-        provider = BarebonesProviderPTP(ie=ie, logger=logger, settings={})
-        assert provider.PROVIDER_NAME == 'BarebonesProvider'
-        assert provider.PROVIDER_KEY == 'BarebonesProvider'
-        assert provider.PROVIDER_VERSION == '0.0.0'
-        assert provider.BUG_REPORT_MESSAGE == 'please report this issue to the provider developer at  (developer has not provided a bug report location)  .'
-
-    def test_example_provider_success(self, ie, logger, pot_request):
-        provider = ExamplePTP(ie=ie, logger=logger, settings={})
-        assert provider.PROVIDER_NAME == 'example'
-        assert provider.PROVIDER_KEY == 'Example'
-        assert provider.PROVIDER_VERSION == '0.0.1'
-        assert provider.BUG_REPORT_MESSAGE == 'please report this issue to the provider developer at  https://example.com/issues  .'
-        assert provider.is_available()
-
-        response = provider.request_pot(pot_request)
-
-        assert response.po_token == 'example-token'
-        assert response.expires_at == 123
-
-    def test_provider_unsupported_context(self, ie, logger, pot_request):
-        provider = ExamplePTP(ie=ie, logger=logger, settings={})
-        pot_request.context = PoTokenContext.PLAYER
-
-        with pytest.raises(PoTokenProviderRejectedRequest):
-            provider.request_pot(pot_request)
-
-    def test_provider_unsupported_client(self, ie, logger, pot_request):
-        provider = ExamplePTP(ie=ie, logger=logger, settings={})
-        pot_request.innertube_context['client']['clientName'] = 'ANDROID'
-
-        with pytest.raises(PoTokenProviderRejectedRequest):
-            provider.request_pot(pot_request)
-
-    def test_provider_unsupported_proxy_scheme(self, ie, logger, pot_request):
-        provider = ExamplePTP(ie=ie, logger=logger, settings={})
-        pot_request.request_proxy = 'socks4://example.com'
-
-        with pytest.raises(
-            PoTokenProviderRejectedRequest,
-            match='External requests by "example" provider do not support proxy scheme "socks4". Supported proxy '
-            'schemes: http, socks5h',
-        ):
-            provider.request_pot(pot_request)
-
-        pot_request.request_proxy = 'http://example.com'
-
-        assert provider.request_pot(pot_request)
-
-    def test_provider_ignore_external_request_features(self, ie, logger, pot_request):
-        class InternalPTP(ExamplePTP):
-            _SUPPORTED_EXTERNAL_REQUEST_FEATURES = None
-
-        provider = InternalPTP(ie=ie, logger=logger, settings={})
-
-        pot_request.request_proxy = 'socks5://example.com'
-        assert provider.request_pot(pot_request)
-        pot_request.request_source_address = '0.0.0.0'
-        assert provider.request_pot(pot_request)
-
-    def test_provider_unsupported_external_request_source_address(self, ie, logger, pot_request):
-        class InternalPTP(ExamplePTP):
-            _SUPPORTED_EXTERNAL_REQUEST_FEATURES = tuple()
-
-        provider = InternalPTP(ie=ie, logger=logger, settings={})
-
-        pot_request.request_source_address = None
-        assert provider.request_pot(pot_request)
-
-        pot_request.request_source_address = '0.0.0.0'
-        with pytest.raises(
-            PoTokenProviderRejectedRequest,
-            match='External requests by "example" provider do not support setting source address',
-        ):
-            provider.request_pot(pot_request)
-
-    def test_provider_supported_external_request_source_address(self, ie, logger, pot_request):
-        class InternalPTP(ExamplePTP):
-            _SUPPORTED_EXTERNAL_REQUEST_FEATURES = (
-                ExternalRequestFeature.SOURCE_ADDRESS,
-            )
-
-        provider = InternalPTP(ie=ie, logger=logger, settings={})
-
-        pot_request.request_source_address = None
-        assert provider.request_pot(pot_request)
-
-        pot_request.request_source_address = '0.0.0.0'
-        assert provider.request_pot(pot_request)
-
-    def test_provider_unsupported_external_request_tls_verification(self, ie, logger, pot_request):
-        class InternalPTP(ExamplePTP):
-            _SUPPORTED_EXTERNAL_REQUEST_FEATURES = tuple()
-
-        provider = InternalPTP(ie=ie, logger=logger, settings={})
-
-        pot_request.request_verify_tls = True
-        assert provider.request_pot(pot_request)
-
-        pot_request.request_verify_tls = False
-        with pytest.raises(
-            PoTokenProviderRejectedRequest,
-            match='External requests by "example" provider do not support ignoring TLS certificate failures',
-        ):
-            provider.request_pot(pot_request)
-
-    def test_provider_supported_external_request_tls_verification(self, ie, logger, pot_request):
-        class InternalPTP(ExamplePTP):
-            _SUPPORTED_EXTERNAL_REQUEST_FEATURES = (
-                ExternalRequestFeature.DISABLE_TLS_VERIFICATION,
-            )
-
-        provider = InternalPTP(ie=ie, logger=logger, settings={})
-
-        pot_request.request_verify_tls = True
-        assert provider.request_pot(pot_request)
-
-        pot_request.request_verify_tls = False
-        assert provider.request_pot(pot_request)
-
-    def test_provider_request_webpage(self, ie, logger, pot_request):
-        provider = ExamplePTP(ie=ie, logger=logger, settings={})
-
-        cookiejar = YoutubeDLCookieJar()
-        pot_request.request_headers = HTTPHeaderDict({'User-Agent': 'example-user-agent'})
-        pot_request.request_proxy = 'socks5://example-proxy.com'
-        pot_request.request_cookiejar = cookiejar
-
-        def mock_urlopen(request):
-            return request
-
-        ie._downloader.urlopen = mock_urlopen
-
-        sent_request = provider._request_webpage(Request(
-            'https://example.com',
-        ), pot_request=pot_request)
-
-        assert sent_request.url == 'https://example.com'
-        assert sent_request.headers['User-Agent'] == 'example-user-agent'
-        assert sent_request.proxies == {'all': 'socks5://example-proxy.com'}
-        assert sent_request.extensions['cookiejar'] is cookiejar
-        assert 'Requesting webpage' in logger.messages['info']
-
-    def test_provider_request_webpage_override(self, ie, logger, pot_request):
-        provider = ExamplePTP(ie=ie, logger=logger, settings={})
-
-        cookiejar_request = YoutubeDLCookieJar()
-        pot_request.request_headers = HTTPHeaderDict({'User-Agent': 'example-user-agent'})
-        pot_request.request_proxy = 'socks5://example-proxy.com'
-        pot_request.request_cookiejar = cookiejar_request
-
-        def mock_urlopen(request):
-            return request
-
-        ie._downloader.urlopen = mock_urlopen
-
-        sent_request = provider._request_webpage(Request(
-            'https://example.com',
-            headers={'User-Agent': 'override-user-agent-override'},
-            proxies={'http': 'http://example-proxy-override.com'},
-            extensions={'cookiejar': YoutubeDLCookieJar()},
-        ), pot_request=pot_request, note='Custom requesting webpage')
-
-        assert sent_request.url == 'https://example.com'
-        assert sent_request.headers['User-Agent'] == 'override-user-agent-override'
-        assert sent_request.proxies == {'http': 'http://example-proxy-override.com'}
-        assert sent_request.extensions['cookiejar'] is not cookiejar_request
-        assert 'Custom requesting webpage' in logger.messages['info']
-
-    def test_provider_request_webpage_no_log(self, ie, logger, pot_request):
-        provider = ExamplePTP(ie=ie, logger=logger, settings={})
-
-        def mock_urlopen(request):
-            return request
-
-        ie._downloader.urlopen = mock_urlopen
-
-        sent_request = provider._request_webpage(Request(
-            'https://example.com',
-        ), note=False)
-
-        assert sent_request.url == 'https://example.com'
-        assert 'info' not in logger.messages
-
-    def test_provider_request_webpage_no_pot_request(self, ie, logger):
-        provider = ExamplePTP(ie=ie, logger=logger, settings={})
-
-        def mock_urlopen(request):
-            return request
-
-        ie._downloader.urlopen = mock_urlopen
-
-        sent_request = provider._request_webpage(Request(
-            'https://example.com',
-        ), pot_request=None)
-
-        assert sent_request.url == 'https://example.com'
-
-    def test_get_config_arg(self, ie, logger):
-        provider = ExamplePTP(ie=ie, logger=logger, settings={'abc': ['123D'], 'xyz': ['456a', '789B']})
-
-        assert provider._configuration_arg('abc') == ['123d']
-        assert provider._configuration_arg('abc', default=['default']) == ['123d']
-        assert provider._configuration_arg('ABC', default=['default']) == ['default']
-        assert provider._configuration_arg('abc', casesense=True) == ['123D']
-        assert provider._configuration_arg('xyz', casesense=False) == ['456a', '789b']
-
-    def test_require_class_end_with_suffix(self, ie, logger):
-        class InvalidSuffix(PoTokenProvider):
-            PROVIDER_NAME = 'invalid-suffix'
-
-            def _real_request_pot(self, request: PoTokenRequest) -> PoTokenResponse:
-                raise PoTokenProviderRejectedRequest('Not implemented')
-
-            def is_available(self) -> bool:
-                return True
-
-        provider = InvalidSuffix(ie=ie, logger=logger, settings={})
-
-        with pytest.raises(AssertionError):
-            provider.PROVIDER_KEY  # noqa: B018
-
-
-class TestPoTokenCacheProvider:
-
-    def test_base_type(self):
-        assert issubclass(PoTokenCacheProvider, IEContentProvider)
-
-    def test_create_provider_missing_get_method(self, ie, logger):
-        class MissingMethodsPCP(PoTokenCacheProvider):
-            def store(self, key: str, value: str, expires_at: int):
-                pass
-
-            def delete(self, key: str):
-                pass
-
-                def is_available(self) -> bool:
-                    return True
-
-        with pytest.raises(TypeError):
-            MissingMethodsPCP(ie=ie, logger=logger, settings={})
-
-    def test_create_provider_missing_store_method(self, ie, logger):
-        class MissingMethodsPCP(PoTokenCacheProvider):
-            def get(self, key: str):
-                pass
-
-            def delete(self, key: str):
-                pass
-
-            def is_available(self) -> bool:
-                return True
-
-        with pytest.raises(TypeError):
-            MissingMethodsPCP(ie=ie, logger=logger, settings={})
-
-    def test_create_provider_missing_delete_method(self, ie, logger):
-        class MissingMethodsPCP(PoTokenCacheProvider):
-            def get(self, key: str):
-                pass
-
-            def store(self, key: str, value: str, expires_at: int):
-                pass
-
-            def is_available(self) -> bool:
-                return True
-
-        with pytest.raises(TypeError):
-            MissingMethodsPCP(ie=ie, logger=logger, settings={})
-
-    def test_create_provider_missing_is_available_method(self, ie, logger):
-        class MissingMethodsPCP(PoTokenCacheProvider):
-            def get(self, key: str):
-                pass
-
-            def store(self, key: str, value: str, expires_at: int):
-                pass
-
-            def delete(self, key: str):
-                pass
-
-        with pytest.raises(TypeError):
-            MissingMethodsPCP(ie=ie, logger=logger, settings={})
-
-    def test_barebones_provider(self, ie, logger):
-        class BarebonesProviderPCP(PoTokenCacheProvider):
-
-            def is_available(self) -> bool:
-                return True
-
-            def get(self, key: str):
-                return 'example-cache'
-
-            def store(self, key: str, value: str, expires_at: int):
-                pass
-
-            def delete(self, key: str):
-                pass
-
-        provider = BarebonesProviderPCP(ie=ie, logger=logger, settings={})
-        assert provider.PROVIDER_NAME == 'BarebonesProvider'
-        assert provider.PROVIDER_KEY == 'BarebonesProvider'
-        assert provider.PROVIDER_VERSION == '0.0.0'
-        assert provider.BUG_REPORT_MESSAGE == 'please report this issue to the provider developer at  (developer has not provided a bug report location)  .'
-
-    def test_create_provider_example(self, ie, logger):
-        provider = ExampleCacheProviderPCP(ie=ie, logger=logger, settings={})
-        assert provider.PROVIDER_NAME == 'example'
-        assert provider.PROVIDER_KEY == 'ExampleCacheProvider'
-        assert provider.PROVIDER_VERSION == '0.0.1'
-        assert provider.BUG_REPORT_MESSAGE == 'please report this issue to the provider developer at  https://example.com/issues  .'
-        assert provider.is_available()
-
-    def test_get_config_arg(self, ie, logger):
-        provider = ExampleCacheProviderPCP(ie=ie, logger=logger, settings={'abc': ['123D'], 'xyz': ['456a', '789B']})
-        assert provider._configuration_arg('abc') == ['123d']
-        assert provider._configuration_arg('abc', default=['default']) == ['123d']
-        assert provider._configuration_arg('ABC', default=['default']) == ['default']
-        assert provider._configuration_arg('abc', casesense=True) == ['123D']
-        assert provider._configuration_arg('xyz', casesense=False) == ['456a', '789b']
-
-    def test_require_class_end_with_suffix(self, ie, logger):
-        class InvalidSuffix(PoTokenCacheProvider):
-            def get(self, key: str):
-                return 'example-cache'
-
-            def store(self, key: str, value: str, expires_at: int):
-                pass
-
-            def delete(self, key: str):
-                pass
-
-            def is_available(self) -> bool:
-                return True
-
-        provider = InvalidSuffix(ie=ie, logger=logger, settings={})
-
-        with pytest.raises(AssertionError):
-            provider.PROVIDER_KEY  # noqa: B018
-
-
-class TestPoTokenCacheSpecProvider:
-
-    def test_base_type(self):
-        assert issubclass(PoTokenCacheSpecProvider, IEContentProvider)
-
-    def test_create_provider_missing_supports_method(self, ie, logger):
-        class MissingMethodsPCS(PoTokenCacheSpecProvider):
-            pass
-
-        with pytest.raises(TypeError):
-            MissingMethodsPCS(ie=ie, logger=logger, settings={})
-
-    def test_create_provider_barebones(self, ie, pot_request, logger):
-        class BarebonesProviderPCSP(PoTokenCacheSpecProvider):
-            def generate_cache_spec(self, request: PoTokenRequest):
-                return PoTokenCacheSpec(
-                    default_ttl=100,
-                    key_bindings={},
-                )
-
-        provider = BarebonesProviderPCSP(ie=ie, logger=logger, settings={})
-        assert provider.PROVIDER_NAME == 'BarebonesProvider'
-        assert provider.PROVIDER_KEY == 'BarebonesProvider'
-        assert provider.PROVIDER_VERSION == '0.0.0'
-        assert provider.BUG_REPORT_MESSAGE == 'please report this issue to the provider developer at  (developer has not provided a bug report location)  .'
-        assert provider.is_available()
-        assert provider.generate_cache_spec(request=pot_request).default_ttl == 100
-        assert provider.generate_cache_spec(request=pot_request).key_bindings == {}
-        assert provider.generate_cache_spec(request=pot_request).write_policy == CacheProviderWritePolicy.WRITE_ALL
-
-    def test_create_provider_example(self, ie, pot_request, logger):
-        provider = ExampleCacheSpecProviderPCSP(ie=ie, logger=logger, settings={})
-        assert provider.PROVIDER_NAME == 'example'
-        assert provider.PROVIDER_KEY == 'ExampleCacheSpecProvider'
-        assert provider.PROVIDER_VERSION == '0.0.1'
-        assert provider.BUG_REPORT_MESSAGE == 'please report this issue to the provider developer at  https://example.com/issues  .'
-        assert provider.is_available()
-        assert provider.generate_cache_spec(pot_request)
-        assert provider.generate_cache_spec(pot_request).key_bindings == {'field': 'example-key'}
-        assert provider.generate_cache_spec(pot_request).default_ttl == 60
-        assert provider.generate_cache_spec(pot_request).write_policy == CacheProviderWritePolicy.WRITE_FIRST
-
-    def test_get_config_arg(self, ie, logger):
-        provider = ExampleCacheSpecProviderPCSP(ie=ie, logger=logger, settings={'abc': ['123D'], 'xyz': ['456a', '789B']})
-
-        assert provider._configuration_arg('abc') == ['123d']
-        assert provider._configuration_arg('abc', default=['default']) == ['123d']
-        assert provider._configuration_arg('ABC', default=['default']) == ['default']
-        assert provider._configuration_arg('abc', casesense=True) == ['123D']
-        assert provider._configuration_arg('xyz', casesense=False) == ['456a', '789b']
-
-    def test_require_class_end_with_suffix(self, ie, logger):
-        class InvalidSuffix(PoTokenCacheSpecProvider):
-            def generate_cache_spec(self, request: PoTokenRequest):
-                return None
-
-        provider = InvalidSuffix(ie=ie, logger=logger, settings={})
-
-        with pytest.raises(AssertionError):
-            provider.PROVIDER_KEY  # noqa: B018
-
-
-class TestPoTokenRequest:
-    def test_copy_request(self, pot_request):
-        copied_request = pot_request.copy()
-
-        assert copied_request is not pot_request
-        assert copied_request.context == pot_request.context
-        assert copied_request.innertube_context == pot_request.innertube_context
-        assert copied_request.innertube_context is not pot_request.innertube_context
-        copied_request.innertube_context['client']['clientName'] = 'ANDROID'
-        assert pot_request.innertube_context['client']['clientName'] != 'ANDROID'
-        assert copied_request.innertube_host == pot_request.innertube_host
-        assert copied_request.session_index == pot_request.session_index
-        assert copied_request.player_url == pot_request.player_url
-        assert copied_request.is_authenticated == pot_request.is_authenticated
-        assert copied_request.visitor_data == pot_request.visitor_data
-        assert copied_request.data_sync_id == pot_request.data_sync_id
-        assert copied_request.video_id == pot_request.video_id
-        assert copied_request.request_cookiejar is pot_request.request_cookiejar
-        assert copied_request.request_proxy == pot_request.request_proxy
-        assert copied_request.request_headers == pot_request.request_headers
-        assert copied_request.request_headers is not pot_request.request_headers
-        assert copied_request.request_timeout == pot_request.request_timeout
-        assert copied_request.request_source_address == pot_request.request_source_address
-        assert copied_request.request_verify_tls == pot_request.request_verify_tls
-        assert copied_request.bypass_cache == pot_request.bypass_cache
-
-
-def test_provider_bug_report_message(ie, logger):
-    provider = ExamplePTP(ie=ie, logger=logger, settings={})
-    assert provider.BUG_REPORT_MESSAGE == 'please report this issue to the provider developer at  https://example.com/issues  .'
-
-    message = provider_bug_report_message(provider)
-    assert message == '; please report this issue to the provider developer at  https://example.com/issues  .'
-
-    message_before = provider_bug_report_message(provider, before='custom message!')
-    assert message_before == 'custom message! Please report this issue to the provider developer at  https://example.com/issues  .'
-
-
-def test_register_provider(ie):
-
-    @register_provider
-    class UnavailableProviderPTP(PoTokenProvider):
-        def is_available(self) -> bool:
-            return False
-
-        def _real_request_pot(self, request: PoTokenRequest) -> PoTokenResponse:
-            raise PoTokenProviderRejectedRequest('Not implemented')
-
-    assert _pot_providers.value.get('UnavailableProvider') == UnavailableProviderPTP
-    _pot_providers.value.pop('UnavailableProvider')
-
-
-def test_register_pot_preference(ie):
-    before = len(_ptp_preferences.value)
-
-    @register_preference(ExamplePTP)
-    def unavailable_preference(provider: PoTokenProvider, request: PoTokenRequest):
-        return 1
-
-    assert len(_ptp_preferences.value) == before + 1
-
-
-def test_register_cache_provider(ie):
-
-    @cache.register_provider
-    class UnavailableCacheProviderPCP(PoTokenCacheProvider):
-        def is_available(self) -> bool:
-            return False
-
-        def get(self, key: str):
-            return 'example-cache'
-
-        def store(self, key: str, value: str, expires_at: int):
-            pass
-
-        def delete(self, key: str):
-            pass
-
-    assert _pot_cache_providers.value.get('UnavailableCacheProvider') == UnavailableCacheProviderPCP
-    _pot_cache_providers.value.pop('UnavailableCacheProvider')
-
-
-def test_register_cache_provider_spec(ie):
-
-    @cache.register_spec
-    class UnavailableCacheProviderPCSP(PoTokenCacheSpecProvider):
-        def is_available(self) -> bool:
-            return False
-
-        def generate_cache_spec(self, request: PoTokenRequest):
-            return None
-
-    assert _pot_pcs_providers.value.get('UnavailableCacheProvider') == UnavailableCacheProviderPCSP
-    _pot_pcs_providers.value.pop('UnavailableCacheProvider')
-
-
-def test_register_cache_provider_preference(ie):
-    before = len(_pot_cache_provider_preferences.value)
-
-    @cache.register_preference(ExampleCacheProviderPCP)
-    def unavailable_preference(provider: PoTokenCacheProvider, request: PoTokenRequest):
-        return 1
-
-    assert len(_pot_cache_provider_preferences.value) == before + 1
-
-
-def test_logger_log_level(logger):
-    assert logger.LogLevel('INFO') == logger.LogLevel.INFO
-    assert logger.LogLevel('debuG') == logger.LogLevel.DEBUG
-    assert logger.LogLevel(10) == logger.LogLevel.DEBUG
-    assert logger.LogLevel('UNKNOWN') == logger.LogLevel.INFO

test/test_socks.py

@@ -95,7 +95,7 @@ class Socks5ProxyHandler(StreamRequestHandler, SocksProxyHandler):
             return
 
         elif Socks5Auth.AUTH_USER_PASS in methods:
-            self.connection.sendall(struct.pack('!BB', SOCKS5_VERSION, Socks5Auth.AUTH_USER_PASS))
+            self.connection.sendall(struct.pack("!BB", SOCKS5_VERSION, Socks5Auth.AUTH_USER_PASS))
 
             _, user_len = struct.unpack('!BB', self.connection.recv(2))
             username = self.connection.recv(user_len).decode()
@@ -174,7 +174,7 @@ class Socks4ProxyHandler(StreamRequestHandler, SocksProxyHandler):
         if 0x0 < dest_ip <= 0xFF:
             use_remote_dns = True
         else:
-            socks_info['ipv4_address'] = socket.inet_ntoa(struct.pack('!I', dest_ip))
+            socks_info['ipv4_address'] = socket.inet_ntoa(struct.pack("!I", dest_ip))
 
         user_id = self._read_until_null().decode()
         if user_id != (self.socks_kwargs.get('user_id') or ''):
@@ -216,9 +216,7 @@ class SocksWebSocketTestRequestHandler(SocksTestRequestHandler):
         protocol = websockets.ServerProtocol()
         connection = websockets.sync.server.ServerConnection(socket=self.request, protocol=protocol, close_timeout=0)
         connection.handshake()
-        for message in connection:
-            if message == 'socks_info':
-                connection.send(json.dumps(self.socks_info))
+        connection.send(json.dumps(self.socks_info))
         connection.close()
 
 
@@ -288,14 +286,8 @@ def ctx(request):
     return CTX_MAP[request.param]()
 
 
-@pytest.mark.parametrize(
-    'handler,ctx', [
-        ('Urllib', 'http'),
-        ('Requests', 'http'),
-        ('Websockets', 'ws'),
-        ('CurlCFFI', 'http'),
-    ], indirect=True)
 class TestSocks4Proxy:
+    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http'), ('Websockets', 'ws')], indirect=True)
     def test_socks4_no_auth(self, handler, ctx):
         with handler() as rh:
             with ctx.socks_server(Socks4ProxyHandler) as server_address:
@@ -303,6 +295,7 @@ class TestSocks4Proxy:
                     rh, proxies={'all': f'socks4://{server_address}'})
                 assert response['version'] == 4
 
+    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http'), ('Websockets', 'ws')], indirect=True)
     def test_socks4_auth(self, handler, ctx):
         with handler() as rh:
             with ctx.socks_server(Socks4ProxyHandler, user_id='user') as server_address:
@@ -312,6 +305,7 @@ class TestSocks4Proxy:
                     rh, proxies={'all': f'socks4://user:@{server_address}'})
                 assert response['version'] == 4
 
+    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http'), ('Websockets', 'ws')], indirect=True)
     def test_socks4a_ipv4_target(self, handler, ctx):
         with ctx.socks_server(Socks4ProxyHandler) as server_address:
             with handler(proxies={'all': f'socks4a://{server_address}'}) as rh:
@@ -319,6 +313,7 @@ class TestSocks4Proxy:
                 assert response['version'] == 4
                 assert (response['ipv4_address'] == '127.0.0.1') != (response['domain_address'] == '127.0.0.1')
 
+    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http'), ('Websockets', 'ws')], indirect=True)
     def test_socks4a_domain_target(self, handler, ctx):
         with ctx.socks_server(Socks4ProxyHandler) as server_address:
             with handler(proxies={'all': f'socks4a://{server_address}'}) as rh:
@@ -327,6 +322,7 @@ class TestSocks4Proxy:
                 assert response['ipv4_address'] is None
                 assert response['domain_address'] == 'localhost'
 
+    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http'), ('Websockets', 'ws')], indirect=True)
     def test_ipv4_client_source_address(self, handler, ctx):
         with ctx.socks_server(Socks4ProxyHandler) as server_address:
             source_address = f'127.0.0.{random.randint(5, 255)}'
@@ -337,6 +333,7 @@ class TestSocks4Proxy:
                 assert response['client_address'][0] == source_address
                 assert response['version'] == 4
 
+    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http'), ('Websockets', 'ws')], indirect=True)
     @pytest.mark.parametrize('reply_code', [
         Socks4CD.REQUEST_REJECTED_OR_FAILED,
         Socks4CD.REQUEST_REJECTED_CANNOT_CONNECT_TO_IDENTD,
@@ -348,6 +345,7 @@ class TestSocks4Proxy:
                 with pytest.raises(ProxyError):
                     ctx.socks_info_request(rh)
 
+    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http'), ('Websockets', 'ws')], indirect=True)
     def test_ipv6_socks4_proxy(self, handler, ctx):
         with ctx.socks_server(Socks4ProxyHandler, bind_ip='::1') as server_address:
             with handler(proxies={'all': f'socks4://{server_address}'}) as rh:
@@ -356,6 +354,7 @@ class TestSocks4Proxy:
                 assert response['ipv4_address'] == '127.0.0.1'
                 assert response['version'] == 4
 
+    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http'), ('Websockets', 'ws')], indirect=True)
     def test_timeout(self, handler, ctx):
         with ctx.socks_server(Socks4ProxyHandler, sleep=2) as server_address:
             with handler(proxies={'all': f'socks4://{server_address}'}, timeout=0.5) as rh:
@@ -363,15 +362,9 @@ class TestSocks4Proxy:
                     ctx.socks_info_request(rh)
 
 
-@pytest.mark.parametrize(
-    'handler,ctx', [
-        ('Urllib', 'http'),
-        ('Requests', 'http'),
-        ('Websockets', 'ws'),
-        ('CurlCFFI', 'http'),
-    ], indirect=True)
 class TestSocks5Proxy:
 
+    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http'), ('Websockets', 'ws')], indirect=True)
     def test_socks5_no_auth(self, handler, ctx):
         with ctx.socks_server(Socks5ProxyHandler) as server_address:
             with handler(proxies={'all': f'socks5://{server_address}'}) as rh:
@@ -379,6 +372,7 @@ class TestSocks5Proxy:
                 assert response['auth_methods'] == [0x0]
                 assert response['version'] == 5
 
+    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http'), ('Websockets', 'ws')], indirect=True)
     def test_socks5_user_pass(self, handler, ctx):
         with ctx.socks_server(Socks5ProxyHandler, auth=('test', 'testpass')) as server_address:
             with handler() as rh:
@@ -391,6 +385,7 @@ class TestSocks5Proxy:
                 assert response['auth_methods'] == [Socks5Auth.AUTH_NONE, Socks5Auth.AUTH_USER_PASS]
                 assert response['version'] == 5
 
+    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http'), ('Websockets', 'ws')], indirect=True)
     def test_socks5_ipv4_target(self, handler, ctx):
         with ctx.socks_server(Socks5ProxyHandler) as server_address:
             with handler(proxies={'all': f'socks5://{server_address}'}) as rh:
@@ -398,6 +393,7 @@ class TestSocks5Proxy:
                 assert response['ipv4_address'] == '127.0.0.1'
                 assert response['version'] == 5
 
+    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http'), ('Websockets', 'ws')], indirect=True)
     def test_socks5_domain_target(self, handler, ctx):
         with ctx.socks_server(Socks5ProxyHandler) as server_address:
             with handler(proxies={'all': f'socks5://{server_address}'}) as rh:
@@ -405,6 +401,7 @@ class TestSocks5Proxy:
                 assert (response['ipv4_address'] == '127.0.0.1') != (response['ipv6_address'] == '::1')
                 assert response['version'] == 5
 
+    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http'), ('Websockets', 'ws')], indirect=True)
     def test_socks5h_domain_target(self, handler, ctx):
         with ctx.socks_server(Socks5ProxyHandler) as server_address:
             with handler(proxies={'all': f'socks5h://{server_address}'}) as rh:
@@ -413,6 +410,7 @@ class TestSocks5Proxy:
                 assert response['domain_address'] == 'localhost'
                 assert response['version'] == 5
 
+    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http'), ('Websockets', 'ws')], indirect=True)
     def test_socks5h_ip_target(self, handler, ctx):
         with ctx.socks_server(Socks5ProxyHandler) as server_address:
             with handler(proxies={'all': f'socks5h://{server_address}'}) as rh:
@@ -421,6 +419,7 @@ class TestSocks5Proxy:
                 assert response['domain_address'] is None
                 assert response['version'] == 5
 
+    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http'), ('Websockets', 'ws')], indirect=True)
     def test_socks5_ipv6_destination(self, handler, ctx):
         with ctx.socks_server(Socks5ProxyHandler) as server_address:
             with handler(proxies={'all': f'socks5://{server_address}'}) as rh:
@@ -428,6 +427,7 @@ class TestSocks5Proxy:
                 assert response['ipv6_address'] == '::1'
                 assert response['version'] == 5
 
+    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http'), ('Websockets', 'ws')], indirect=True)
     def test_ipv6_socks5_proxy(self, handler, ctx):
         with ctx.socks_server(Socks5ProxyHandler, bind_ip='::1') as server_address:
             with handler(proxies={'all': f'socks5://{server_address}'}) as rh:
@@ -438,6 +438,7 @@ class TestSocks5Proxy:
 
     # XXX: is there any feasible way of testing IPv6 source addresses?
     # Same would go for non-proxy source_address test...
+    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http'), ('Websockets', 'ws')], indirect=True)
     def test_ipv4_client_source_address(self, handler, ctx):
         with ctx.socks_server(Socks5ProxyHandler) as server_address:
             source_address = f'127.0.0.{random.randint(5, 255)}'
@@ -447,6 +448,7 @@ class TestSocks5Proxy:
                 assert response['client_address'][0] == source_address
                 assert response['version'] == 5
 
+    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http'), ('Websockets', 'ws')], indirect=True)
     @pytest.mark.parametrize('reply_code', [
         Socks5Reply.GENERAL_FAILURE,
         Socks5Reply.CONNECTION_NOT_ALLOWED,
@@ -463,6 +465,7 @@ class TestSocks5Proxy:
                 with pytest.raises(ProxyError):
                     ctx.socks_info_request(rh)
 
+    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Websockets', 'ws')], indirect=True)
     def test_timeout(self, handler, ctx):
         with ctx.socks_server(Socks5ProxyHandler, sleep=2) as server_address:
             with handler(proxies={'all': f'socks5://{server_address}'}, timeout=1) as rh:

test/test_subtitles.py

@@ -23,6 +23,7 @@ from yt_dlp.extractor import (
     TedTalkIE,
     ThePlatformFeedIE,
     ThePlatformIE,
+    VikiIE,
     VimeoIE,
     WallaIE,
     YoutubeIE,
@@ -39,11 +40,12 @@ class BaseTestSubtitles(unittest.TestCase):
         self.ie = self.IE()
         self.DL.add_info_extractor(self.ie)
         if not self.IE.working():
-            print(f'Skipping: {self.IE.ie_key()} marked as not _WORKING')
+            print('Skipping: %s marked as not _WORKING' % self.IE.ie_key())
             self.skipTest('IE marked as not _WORKING')
 
     def getInfoDict(self):
-        return self.DL.extract_info(self.url, download=False)
+        info_dict = self.DL.extract_info(self.url, download=False)
+        return info_dict
 
     def getSubtitles(self):
         info_dict = self.getInfoDict()
@@ -85,7 +87,7 @@ class TestYoutubeSubtitles(BaseTestSubtitles):
         self.assertEqual(md5(subtitles['en']), 'ae1bd34126571a77aabd4d276b28044d')
         self.assertEqual(md5(subtitles['it']), '0e0b667ba68411d88fd1c5f4f4eab2f9')
         for lang in ['fr', 'de']:
-            self.assertTrue(subtitles.get(lang) is not None, f'Subtitles for \'{lang}\' not extracted')
+            self.assertTrue(subtitles.get(lang) is not None, 'Subtitles for \'%s\' not extracted' % lang)
 
     def _test_subtitles_format(self, fmt, md5_hash, lang='en'):
         self.DL.params['writesubtitles'] = True
@@ -155,7 +157,7 @@ class TestDailymotionSubtitles(BaseTestSubtitles):
         self.assertEqual(md5(subtitles['en']), '976553874490cba125086bbfea3ff76f')
         self.assertEqual(md5(subtitles['fr']), '594564ec7d588942e384e920e5341792')
         for lang in ['es', 'fr', 'de']:
-            self.assertTrue(subtitles.get(lang) is not None, f'Subtitles for \'{lang}\' not extracted')
+            self.assertTrue(subtitles.get(lang) is not None, 'Subtitles for \'%s\' not extracted' % lang)
 
     def test_nosubtitles(self):
         self.DL.expect_warning('video doesn\'t have subtitles')
@@ -180,7 +182,7 @@ class TestTedSubtitles(BaseTestSubtitles):
         self.assertEqual(md5(subtitles['en']), '4262c1665ff928a2dada178f62cb8d14')
         self.assertEqual(md5(subtitles['fr']), '66a63f7f42c97a50f8c0e90bc7797bb5')
         for lang in ['es', 'fr', 'de']:
-            self.assertTrue(subtitles.get(lang) is not None, f'Subtitles for \'{lang}\' not extracted')
+            self.assertTrue(subtitles.get(lang) is not None, 'Subtitles for \'%s\' not extracted' % lang)
 
 
 @is_download_test
@@ -330,6 +332,20 @@ class TestRaiPlaySubtitles(BaseTestSubtitles):
         self.assertEqual(md5(subtitles['it']), '4b3264186fbb103508abe5311cfcb9cd')
 
 
+@is_download_test
+@unittest.skip('IE broken - DRM only')
+class TestVikiSubtitles(BaseTestSubtitles):
+    url = 'http://www.viki.com/videos/1060846v-punch-episode-18'
+    IE = VikiIE
+
+    def test_allsubtitles(self):
+        self.DL.params['writesubtitles'] = True
+        self.DL.params['allsubtitles'] = True
+        subtitles = self.getSubtitles()
+        self.assertEqual(set(subtitles.keys()), {'en'})
+        self.assertEqual(md5(subtitles['en']), '53cb083a5914b2d84ef1ab67b880d18a')
+
+
 @is_download_test
 class TestThePlatformSubtitles(BaseTestSubtitles):
     # from http://www.3playmedia.com/services-features/tools/integrations/theplatform/

test/test_traversal.py

@@ -1,637 +0,0 @@
-import http.cookies
-import re
-import xml.etree.ElementTree
-
-import pytest
-
-from yt_dlp.utils import (
-    ExtractorError,
-    determine_ext,
-    dict_get,
-    int_or_none,
-    join_nonempty,
-    str_or_none,
-)
-from yt_dlp.utils.traversal import (
-    find_element,
-    find_elements,
-    require,
-    subs_list_to_dict,
-    traverse_obj,
-    trim_str,
-    unpack,
-)
-
-_TEST_DATA = {
-    100: 100,
-    1.2: 1.2,
-    'str': 'str',
-    'None': None,
-    '...': ...,
-    'urls': [
-        {'index': 0, 'url': 'https://www.example.com/0'},
-        {'index': 1, 'url': 'https://www.example.com/1'},
-    ],
-    'data': (
-        {'index': 2},
-        {'index': 3},
-    ),
-    'dict': {},
-}
-
-_TEST_HTML = '''<html><body>
-    <div class="a">1</div>
-    <div class="a" id="x" custom="z">2</div>
-    <div class="b" data-id="y" custom="z">3</div>
-    <p class="a">4</p>
-    <p id="d" custom="e">5</p>
-</body></html>'''
-
-
-class TestTraversal:
-    def test_traversal_base(self):
-        assert traverse_obj(_TEST_DATA, ('str',)) == 'str', \
-            'allow tuple path'
-        assert traverse_obj(_TEST_DATA, ['str']) == 'str', \
-            'allow list path'
-        assert traverse_obj(_TEST_DATA, (value for value in ('str',))) == 'str', \
-            'allow iterable path'
-        assert traverse_obj(_TEST_DATA, 'str') == 'str', \
-            'single items should be treated as a path'
-        assert traverse_obj(_TEST_DATA, 100) == 100, \
-            'allow int path'
-        assert traverse_obj(_TEST_DATA, 1.2) == 1.2, \
-            'allow float path'
-        assert traverse_obj(_TEST_DATA, None) == _TEST_DATA, \
-            '`None` should not perform any modification'
-
-    def test_traversal_ellipsis(self):
-        assert traverse_obj(_TEST_DATA, ...) == [x for x in _TEST_DATA.values() if x not in (None, {})], \
-            '`...` should give all non discarded values'
-        assert traverse_obj(_TEST_DATA, ('urls', 0, ...)) == list(_TEST_DATA['urls'][0].values()), \
-            '`...` selection for dicts should select all values'
-        assert traverse_obj(_TEST_DATA, (..., ..., 'url')) == ['https://www.example.com/0', 'https://www.example.com/1'], \
-            'nested `...` queries should work'
-        assert traverse_obj(_TEST_DATA, (..., ..., 'index')) == list(range(4)), \
-            '`...` query result should be flattened'
-        assert traverse_obj(iter(range(4)), ...) == list(range(4)), \
-            '`...` should accept iterables'
-
-    def test_traversal_function(self):
-        filter_func = lambda x, y: x == 'urls' and isinstance(y, list)
-        assert traverse_obj(_TEST_DATA, filter_func) == [_TEST_DATA['urls']], \
-            'function as query key should perform a filter based on (key, value)'
-        assert traverse_obj(_TEST_DATA, lambda _, x: isinstance(x[0], str)) == ['str'], \
-            'exceptions in the query function should be catched'
-        assert traverse_obj(iter(range(4)), lambda _, x: x % 2 == 0) == [0, 2], \
-            'function key should accept iterables'
-        # Wrong function signature should raise (debug mode)
-        with pytest.raises(Exception):
-            traverse_obj(_TEST_DATA, lambda a: ...)
-        with pytest.raises(Exception):
-            traverse_obj(_TEST_DATA, lambda a, b, c: ...)
-
-    def test_traversal_set(self):
-        # transformation/type, like `expected_type`
-        assert traverse_obj(_TEST_DATA, (..., {str.upper})) == ['STR'], \
-            'Function in set should be a transformation'
-        assert traverse_obj(_TEST_DATA, (..., {str})) == ['str'], \
-            'Type in set should be a type filter'
-        assert traverse_obj(_TEST_DATA, (..., {str, int})) == [100, 'str'], \
-            'Multiple types in set should be a type filter'
-        assert traverse_obj(_TEST_DATA, {dict}) == _TEST_DATA, \
-            'A single set should be wrapped into a path'
-        assert traverse_obj(_TEST_DATA, (..., {str.upper})) == ['STR'], \
-            'Transformation function should not raise'
-        expected = [x for x in map(str_or_none, _TEST_DATA.values()) if x is not None]
-        assert traverse_obj(_TEST_DATA, (..., {str_or_none})) == expected, \
-            'Function in set should be a transformation'
-        assert traverse_obj(_TEST_DATA, ('fail', {lambda _: 'const'})) == 'const', \
-            'Function in set should always be called'
-        # Sets with length < 1 or > 1 not including only types should raise
-        with pytest.raises(Exception):
-            traverse_obj(_TEST_DATA, set())
-        with pytest.raises(Exception):
-            traverse_obj(_TEST_DATA, {str.upper, str})
-
-    def test_traversal_slice(self):
-        _SLICE_DATA = [0, 1, 2, 3, 4]
-
-        assert traverse_obj(_TEST_DATA, ('dict', slice(1))) is None, \
-            'slice on a dictionary should not throw'
-        assert traverse_obj(_SLICE_DATA, slice(1)) == _SLICE_DATA[:1], \
-            'slice key should apply slice to sequence'
-        assert traverse_obj(_SLICE_DATA, slice(1, 2)) == _SLICE_DATA[1:2], \
-            'slice key should apply slice to sequence'
-        assert traverse_obj(_SLICE_DATA, slice(1, 4, 2)) == _SLICE_DATA[1:4:2], \
-            'slice key should apply slice to sequence'
-
-    def test_traversal_alternatives(self):
-        assert traverse_obj(_TEST_DATA, 'fail', 'str') == 'str', \
-            'multiple `paths` should be treated as alternative paths'
-        assert traverse_obj(_TEST_DATA, 'str', 100) == 'str', \
-            'alternatives should exit early'
-        assert traverse_obj(_TEST_DATA, 'fail', 'fail') is None, \
-            'alternatives should return `default` if exhausted'
-        assert traverse_obj(_TEST_DATA, (..., 'fail'), 100) == 100, \
-            'alternatives should track their own branching return'
-        assert traverse_obj(_TEST_DATA, ('dict', ...), ('data', ...)) == list(_TEST_DATA['data']), \
-            'alternatives on empty objects should search further'
-
-    def test_traversal_branching_nesting(self):
-        assert traverse_obj(_TEST_DATA, ('urls', (3, 0), 'url')) == ['https://www.example.com/0'], \
-            'tuple as key should be treated as branches'
-        assert traverse_obj(_TEST_DATA, ('urls', [3, 0], 'url')) == ['https://www.example.com/0'], \
-            'list as key should be treated as branches'
-        assert traverse_obj(_TEST_DATA, ('urls', ((1, 'fail'), (0, 'url')))) == ['https://www.example.com/0'], \
-            'double nesting in path should be treated as paths'
-        assert traverse_obj(['0', [1, 2]], [(0, 1), 0]) == [1], \
-            'do not fail early on branching'
-        expected = ['https://www.example.com/0', 'https://www.example.com/1']
-        assert traverse_obj(_TEST_DATA, ('urls', ((0, ('fail', 'url')), (1, 'url')))) == expected, \
-            'tripple nesting in path should be treated as branches'
-        assert traverse_obj(_TEST_DATA, ('urls', ('fail', (..., 'url')))) == expected, \
-            'ellipsis as branch path start gets flattened'
-
-    def test_traversal_dict(self):
-        assert traverse_obj(_TEST_DATA, {0: 100, 1: 1.2}) == {0: 100, 1: 1.2}, \
-            'dict key should result in a dict with the same keys'
-        expected = {0: 'https://www.example.com/0'}
-        assert traverse_obj(_TEST_DATA, {0: ('urls', 0, 'url')}) == expected, \
-            'dict key should allow paths'
-        expected = {0: ['https://www.example.com/0']}
-        assert traverse_obj(_TEST_DATA, {0: ('urls', (3, 0), 'url')}) == expected, \
-            'tuple in dict path should be treated as branches'
-        assert traverse_obj(_TEST_DATA, {0: ('urls', ((1, 'fail'), (0, 'url')))}) == expected, \
-            'double nesting in dict path should be treated as paths'
-        expected = {0: ['https://www.example.com/1', 'https://www.example.com/0']}
-        assert traverse_obj(_TEST_DATA, {0: ('urls', ((1, ('fail', 'url')), (0, 'url')))}) == expected, \
-            'tripple nesting in dict path should be treated as branches'
-        assert traverse_obj(_TEST_DATA, {0: 'fail'}) == {}, \
-            'remove `None` values when top level dict key fails'
-        assert traverse_obj(_TEST_DATA, {0: 'fail'}, default=...) == {0: ...}, \
-            'use `default` if key fails and `default`'
-        assert traverse_obj(_TEST_DATA, {0: 'dict'}) == {}, \
-            'remove empty values when dict key'
-        assert traverse_obj(_TEST_DATA, {0: 'dict'}, default=...) == {0: ...}, \
-            'use `default` when dict key and `default`'
-        assert traverse_obj(_TEST_DATA, {0: {0: 'fail'}}) == {}, \
-            'remove empty values when nested dict key fails'
-        assert traverse_obj(None, {0: 'fail'}) == {}, \
-            'default to dict if pruned'
-        assert traverse_obj(None, {0: 'fail'}, default=...) == {0: ...}, \
-            'default to dict if pruned and default is given'
-        assert traverse_obj(_TEST_DATA, {0: {0: 'fail'}}, default=...) == {0: {0: ...}}, \
-            'use nested `default` when nested dict key fails and `default`'
-        assert traverse_obj(_TEST_DATA, {0: ('dict', ...)}) == {}, \
-            'remove key if branch in dict key not successful'
-
-    def test_traversal_default(self):
-        _DEFAULT_DATA = {'None': None, 'int': 0, 'list': []}
-
-        assert traverse_obj(_DEFAULT_DATA, 'fail') is None, \
-            'default value should be `None`'
-        assert traverse_obj(_DEFAULT_DATA, 'fail', 'fail', default=...) == ..., \
-            'chained fails should result in default'
-        assert traverse_obj(_DEFAULT_DATA, 'None', 'int') == 0, \
-            'should not short cirquit on `None`'
-        assert traverse_obj(_DEFAULT_DATA, 'fail', default=1) == 1, \
-            'invalid dict key should result in `default`'
-        assert traverse_obj(_DEFAULT_DATA, 'None', default=1) == 1, \
-            '`None` is a deliberate sentinel and should become `default`'
-        assert traverse_obj(_DEFAULT_DATA, ('list', 10)) is None, \
-            '`IndexError` should result in `default`'
-        assert traverse_obj(_DEFAULT_DATA, (..., 'fail'), default=1) == 1, \
-            'if branched but not successful return `default` if defined, not `[]`'
-        assert traverse_obj(_DEFAULT_DATA, (..., 'fail'), default=None) is None, \
-            'if branched but not successful return `default` even if `default` is `None`'
-        assert traverse_obj(_DEFAULT_DATA, (..., 'fail')) == [], \
-            'if branched but not successful return `[]`, not `default`'
-        assert traverse_obj(_DEFAULT_DATA, ('list', ...)) == [], \
-            'if branched but object is empty return `[]`, not `default`'
-        assert traverse_obj(None, ...) == [], \
-            'if branched but object is `None` return `[]`, not `default`'
-        assert traverse_obj({0: None}, (0, ...)) == [], \
-            'if branched but state is `None` return `[]`, not `default`'
-
-    @pytest.mark.parametrize('path', [
-        ('fail', ...),
-        (..., 'fail'),
-        100 * ('fail',) + (...,),
-        (...,) + 100 * ('fail',),
-    ])
-    def test_traversal_branching(self, path):
-        assert traverse_obj({}, path) == [], \
-            'if branched but state is `None`, return `[]` (not `default`)'
-        assert traverse_obj({}, 'fail', path) == [], \
-            'if branching in last alternative and previous did not match, return `[]` (not `default`)'
-        assert traverse_obj({0: 'x'}, 0, path) == 'x', \
-            'if branching in last alternative and previous did match, return single value'
-        assert traverse_obj({0: 'x'}, path, 0) == 'x', \
-            'if branching in first alternative and non-branching path does match, return single value'
-        assert traverse_obj({}, path, 'fail') is None, \
-            'if branching in first alternative and non-branching path does not match, return `default`'
-
-    def test_traversal_expected_type(self):
-        _EXPECTED_TYPE_DATA = {'str': 'str', 'int': 0}
-
-        assert traverse_obj(_EXPECTED_TYPE_DATA, 'str', expected_type=str) == 'str', \
-            'accept matching `expected_type` type'
-        assert traverse_obj(_EXPECTED_TYPE_DATA, 'str', expected_type=int) is None, \
-            'reject non matching `expected_type` type'
-        assert traverse_obj(_EXPECTED_TYPE_DATA, 'int', expected_type=lambda x: str(x)) == '0', \
-            'transform type using type function'
-        assert traverse_obj(_EXPECTED_TYPE_DATA, 'str', expected_type=lambda _: 1 / 0) is None, \
-            'wrap expected_type fuction in try_call'
-        assert traverse_obj(_EXPECTED_TYPE_DATA, ..., expected_type=str) == ['str'], \
-            'eliminate items that expected_type fails on'
-        assert traverse_obj(_TEST_DATA, {0: 100, 1: 1.2}, expected_type=int) == {0: 100}, \
-            'type as expected_type should filter dict values'
-        assert traverse_obj(_TEST_DATA, {0: 100, 1: 1.2, 2: 'None'}, expected_type=str_or_none) == {0: '100', 1: '1.2'}, \
-            'function as expected_type should transform dict values'
-        assert traverse_obj(_TEST_DATA, ({0: 1.2}, 0, {int_or_none}), expected_type=int) == 1, \
-            'expected_type should not filter non final dict values'
-        assert traverse_obj(_TEST_DATA, {0: {0: 100, 1: 'str'}}, expected_type=int) == {0: {0: 100}}, \
-            'expected_type should transform deep dict values'
-        assert traverse_obj(_TEST_DATA, [({0: '...'}, {0: '...'})], expected_type=type(...)) == [{0: ...}, {0: ...}], \
-            'expected_type should transform branched dict values'
-        assert traverse_obj({1: {3: 4}}, [(1, 2), 3], expected_type=int) == [4], \
-            'expected_type regression for type matching in tuple branching'
-        assert traverse_obj(_TEST_DATA, ['data', ...], expected_type=int) == [], \
-            'expected_type regression for type matching in dict result'
-
-    def test_traversal_get_all(self):
-        _GET_ALL_DATA = {'key': [0, 1, 2]}
-
-        assert traverse_obj(_GET_ALL_DATA, ('key', ...), get_all=False) == 0, \
-            'if not `get_all`, return only first matching value'
-        assert traverse_obj(_GET_ALL_DATA, ..., get_all=False) == [0, 1, 2], \
-            'do not overflatten if not `get_all`'
-
-    def test_traversal_casesense(self):
-        _CASESENSE_DATA = {
-            'KeY': 'value0',
-            0: {
-                'KeY': 'value1',
-                0: {'KeY': 'value2'},
-            },
-        }
-
-        assert traverse_obj(_CASESENSE_DATA, 'key') is None, \
-            'dict keys should be case sensitive unless `casesense`'
-        assert traverse_obj(_CASESENSE_DATA, 'keY', casesense=False) == 'value0', \
-            'allow non matching key case if `casesense`'
-        assert traverse_obj(_CASESENSE_DATA, [0, ('keY',)], casesense=False) == ['value1'], \
-            'allow non matching key case in branch if `casesense`'
-        assert traverse_obj(_CASESENSE_DATA, [0, ([0, 'keY'],)], casesense=False) == ['value2'], \
-            'allow non matching key case in branch path if `casesense`'
-
-    def test_traversal_traverse_string(self):
-        _TRAVERSE_STRING_DATA = {'str': 'str', 1.2: 1.2}
-
-        assert traverse_obj(_TRAVERSE_STRING_DATA, ('str', 0)) is None, \
-            'do not traverse into string if not `traverse_string`'
-        assert traverse_obj(_TRAVERSE_STRING_DATA, ('str', 0), traverse_string=True) == 's', \
-            'traverse into string if `traverse_string`'
-        assert traverse_obj(_TRAVERSE_STRING_DATA, (1.2, 1), traverse_string=True) == '.', \
-            'traverse into converted data if `traverse_string`'
-        assert traverse_obj(_TRAVERSE_STRING_DATA, ('str', ...), traverse_string=True) == 'str', \
-            '`...` should result in string (same value) if `traverse_string`'
-        assert traverse_obj(_TRAVERSE_STRING_DATA, ('str', slice(0, None, 2)), traverse_string=True) == 'sr', \
-            '`slice` should result in string if `traverse_string`'
-        assert traverse_obj(_TRAVERSE_STRING_DATA, ('str', lambda i, v: i or v == 's'), traverse_string=True) == 'str', \
-            'function should result in string if `traverse_string`'
-        assert traverse_obj(_TRAVERSE_STRING_DATA, ('str', (0, 2)), traverse_string=True) == ['s', 'r'], \
-            'branching should result in list if `traverse_string`'
-        assert traverse_obj({}, (0, ...), traverse_string=True) == [], \
-            'branching should result in list if `traverse_string`'
-        assert traverse_obj({}, (0, lambda x, y: True), traverse_string=True) == [], \
-            'branching should result in list if `traverse_string`'
-        assert traverse_obj({}, (0, slice(1)), traverse_string=True) == [], \
-            'branching should result in list if `traverse_string`'
-
-    def test_traversal_re(self):
-        mobj = re.fullmatch(r'0(12)(?P<group>3)(4)?', '0123')
-        assert traverse_obj(mobj, ...) == [x for x in mobj.groups() if x is not None], \
-            '`...` on a `re.Match` should give its `groups()`'
-        assert traverse_obj(mobj, lambda k, _: k in (0, 2)) == ['0123', '3'], \
-            'function on a `re.Match` should give groupno, value starting at 0'
-        assert traverse_obj(mobj, 'group') == '3', \
-            'str key on a `re.Match` should give group with that name'
-        assert traverse_obj(mobj, 2) == '3', \
-            'int key on a `re.Match` should give group with that name'
-        assert traverse_obj(mobj, 'gRoUp', casesense=False) == '3', \
-            'str key on a `re.Match` should respect casesense'
-        assert traverse_obj(mobj, 'fail') is None, \
-            'failing str key on a `re.Match` should return `default`'
-        assert traverse_obj(mobj, 'gRoUpS', casesense=False) is None, \
-            'failing str key on a `re.Match` should return `default`'
-        assert traverse_obj(mobj, 8) is None, \
-            'failing int key on a `re.Match` should return `default`'
-        assert traverse_obj(mobj, lambda k, _: k in (0, 'group')) == ['0123', '3'], \
-            'function on a `re.Match` should give group name as well'
-
-    def test_traversal_xml_etree(self):
-        etree = xml.etree.ElementTree.fromstring('''<?xml version="1.0"?>
-        <data>
-            <country name="Liechtenstein">
-                <rank>1</rank>
-                <year>2008</year>
-                <gdppc>141100</gdppc>
-                <neighbor name="Austria" direction="E"/>
-                <neighbor name="Switzerland" direction="W"/>
-            </country>
-            <country name="Singapore">
-                <rank>4</rank>
-                <year>2011</year>
-                <gdppc>59900</gdppc>
-                <neighbor name="Malaysia" direction="N"/>
-            </country>
-            <country name="Panama">
-                <rank>68</rank>
-                <year>2011</year>
-                <gdppc>13600</gdppc>
-                <neighbor name="Costa Rica" direction="W"/>
-                <neighbor name="Colombia" direction="E"/>
-            </country>
-        </data>''')
-        assert traverse_obj(etree, '') == etree, \
-            'empty str key should return the element itself'
-        assert traverse_obj(etree, 'country') == list(etree), \
-            'str key should lead all children with that tag name'
-        assert traverse_obj(etree, ...) == list(etree), \
-            '`...` as key should return all children'
-        assert traverse_obj(etree, lambda _, x: x[0].text == '4') == [etree[1]], \
-            'function as key should get element as value'
-        assert traverse_obj(etree, lambda i, _: i == 1) == [etree[1]], \
-            'function as key should get index as key'
-        assert traverse_obj(etree, 0) == etree[0], \
-            'int key should return the nth child'
-        expected = ['Austria', 'Switzerland', 'Malaysia', 'Costa Rica', 'Colombia']
-        assert traverse_obj(etree, './/neighbor/@name') == expected, \
-            '`@<attribute>` at end of path should give that attribute'
-        assert traverse_obj(etree, '//neighbor/@fail') == [None, None, None, None, None], \
-            '`@<nonexistant>` at end of path should give `None`'
-        assert traverse_obj(etree, ('//neighbor/@', 2)) == {'name': 'Malaysia', 'direction': 'N'}, \
-            '`@` should give the full attribute dict'
-        assert traverse_obj(etree, '//year/text()') == ['2008', '2011', '2011'], \
-            '`text()` at end of path should give the inner text'
-        assert traverse_obj(etree, '//*[@direction]/@direction') == ['E', 'W', 'N', 'W', 'E'], \
-            'full Python xpath features should be supported'
-        assert traverse_obj(etree, (0, '@name')) == 'Liechtenstein', \
-            'special transformations should act on current element'
-        assert traverse_obj(etree, ('country', 0, ..., 'text()', {int_or_none})) == [1, 2008, 141100], \
-            'special transformations should act on current element'
-
-    def test_traversal_unbranching(self):
-        assert traverse_obj(_TEST_DATA, [(100, 1.2), all]) == [100, 1.2], \
-            '`all` should give all results as list'
-        assert traverse_obj(_TEST_DATA, [(100, 1.2), any]) == 100, \
-            '`any` should give the first result'
-        assert traverse_obj(_TEST_DATA, [100, all]) == [100], \
-            '`all` should give list if non branching'
-        assert traverse_obj(_TEST_DATA, [100, any]) == 100, \
-            '`any` should give single item if non branching'
-        assert traverse_obj(_TEST_DATA, [('dict', 'None', 100), all]) == [100], \
-            '`all` should filter `None` and empty dict'
-        assert traverse_obj(_TEST_DATA, [('dict', 'None', 100), any]) == 100, \
-            '`any` should filter `None` and empty dict'
-        assert traverse_obj(_TEST_DATA, [{
-            'all': [('dict', 'None', 100, 1.2), all],
-            'any': [('dict', 'None', 100, 1.2), any],
-        }]) == {'all': [100, 1.2], 'any': 100}, \
-            '`all`/`any` should apply to each dict path separately'
-        assert traverse_obj(_TEST_DATA, [{
-            'all': [('dict', 'None', 100, 1.2), all],
-            'any': [('dict', 'None', 100, 1.2), any],
-        }], get_all=False) == {'all': [100, 1.2], 'any': 100}, \
-            '`all`/`any` should apply to dict regardless of `get_all`'
-        assert traverse_obj(_TEST_DATA, [('dict', 'None', 100, 1.2), all, {float}]) is None, \
-            '`all` should reset branching status'
-        assert traverse_obj(_TEST_DATA, [('dict', 'None', 100, 1.2), any, {float}]) is None, \
-            '`any` should reset branching status'
-        assert traverse_obj(_TEST_DATA, [('dict', 'None', 100, 1.2), all, ..., {float}]) == [1.2], \
-            '`all` should allow further branching'
-        assert traverse_obj(_TEST_DATA, [('dict', 'None', 'urls', 'data'), any, ..., 'index']) == [0, 1], \
-            '`any` should allow further branching'
-
-    def test_traversal_morsel(self):
-        morsel = http.cookies.Morsel()
-        values = dict(zip(morsel, 'abcdefghijklmnop'))
-        morsel.set('item_key', 'item_value', 'coded_value')
-        morsel.update(values)
-        values['key'] = 'item_key'
-        values['value'] = 'item_value'
-
-        for key, value in values.items():
-            assert traverse_obj(morsel, key) == value, \
-                'Morsel should provide access to all values'
-        assert traverse_obj(morsel, ...) == list(values.values()), \
-            '`...` should yield all values'
-        assert traverse_obj(morsel, lambda k, v: True) == list(values.values()), \
-            'function key should yield all values'
-        assert traverse_obj(morsel, [(None,), any]) == morsel, \
-            'Morsel should not be implicitly changed to dict on usage'
-
-    def test_traversal_filter(self):
-        data = [None, False, True, 0, 1, 0.0, 1.1, '', 'str', {}, {0: 0}, [], [1]]
-
-        assert traverse_obj(data, [..., filter]) == [True, 1, 1.1, 'str', {0: 0}, [1]], \
-            '`filter` should filter falsy values'
-
-
-class TestTraversalHelpers:
-    def test_traversal_require(self):
-        with pytest.raises(ExtractorError):
-            traverse_obj(_TEST_DATA, ['None', {require('value')}])
-        assert traverse_obj(_TEST_DATA, ['str', {require('value')}]) == 'str', \
-            '`require` should pass through non `None` values'
-
-    def test_subs_list_to_dict(self):
-        assert traverse_obj([
-            {'name': 'de', 'url': 'https://example.com/subs/de.vtt'},
-            {'name': 'en', 'url': 'https://example.com/subs/en1.ass'},
-            {'name': 'en', 'url': 'https://example.com/subs/en2.ass'},
-        ], [..., {
-            'id': 'name',
-            'url': 'url',
-        }, all, {subs_list_to_dict}]) == {
-            'de': [{'url': 'https://example.com/subs/de.vtt'}],
-            'en': [
-                {'url': 'https://example.com/subs/en1.ass'},
-                {'url': 'https://example.com/subs/en2.ass'},
-            ],
-        }, 'function should build subtitle dict from list of subtitles'
-        assert traverse_obj([
-            {'name': 'de', 'url': 'https://example.com/subs/de.ass'},
-            {'name': 'de'},
-            {'name': 'en', 'content': 'content'},
-            {'url': 'https://example.com/subs/en'},
-        ], [..., {
-            'id': 'name',
-            'data': 'content',
-            'url': 'url',
-        }, all, {subs_list_to_dict(lang=None)}]) == {
-            'de': [{'url': 'https://example.com/subs/de.ass'}],
-            'en': [{'data': 'content'}],
-        }, 'subs with mandatory items missing should be filtered'
-        assert traverse_obj([
-            {'url': 'https://example.com/subs/de.ass', 'name': 'de'},
-            {'url': 'https://example.com/subs/en', 'name': 'en'},
-        ], [..., {
-            'id': 'name',
-            'ext': ['url', {determine_ext(default_ext=None)}],
-            'url': 'url',
-        }, all, {subs_list_to_dict(ext='ext')}]) == {
-            'de': [{'url': 'https://example.com/subs/de.ass', 'ext': 'ass'}],
-            'en': [{'url': 'https://example.com/subs/en', 'ext': 'ext'}],
-        }, '`ext` should set default ext but leave existing value untouched'
-        assert traverse_obj([
-            {'name': 'en', 'url': 'https://example.com/subs/en2', 'prio': True},
-            {'name': 'en', 'url': 'https://example.com/subs/en1', 'prio': False},
-        ], [..., {
-            'id': 'name',
-            'quality': ['prio', {int}],
-            'url': 'url',
-        }, all, {subs_list_to_dict(ext='ext')}]) == {'en': [
-            {'url': 'https://example.com/subs/en1', 'ext': 'ext'},
-            {'url': 'https://example.com/subs/en2', 'ext': 'ext'},
-        ]}, '`quality` key should sort subtitle list accordingly'
-        assert traverse_obj([
-            {'name': 'de', 'url': 'https://example.com/subs/de.ass'},
-            {'name': 'de'},
-            {'name': 'en', 'content': 'content'},
-            {'url': 'https://example.com/subs/en'},
-        ], [..., {
-            'id': 'name',
-            'url': 'url',
-            'data': 'content',
-        }, all, {subs_list_to_dict(lang='en')}]) == {
-            'de': [{'url': 'https://example.com/subs/de.ass'}],
-            'en': [
-                {'data': 'content'},
-                {'url': 'https://example.com/subs/en'},
-            ],
-        }, 'optionally provided lang should be used if no id available'
-        assert traverse_obj([
-            {'name': 1, 'url': 'https://example.com/subs/de1'},
-            {'name': {}, 'url': 'https://example.com/subs/de2'},
-            {'name': 'de', 'ext': 1, 'url': 'https://example.com/subs/de3'},
-            {'name': 'de', 'ext': {}, 'url': 'https://example.com/subs/de4'},
-        ], [..., {
-            'id': 'name',
-            'url': 'url',
-            'ext': 'ext',
-        }, all, {subs_list_to_dict(lang=None)}]) == {
-            'de': [
-                {'url': 'https://example.com/subs/de3'},
-                {'url': 'https://example.com/subs/de4'},
-            ],
-        }, 'non str types should be ignored for id and ext'
-        assert traverse_obj([
-            {'name': 1, 'url': 'https://example.com/subs/de1'},
-            {'name': {}, 'url': 'https://example.com/subs/de2'},
-            {'name': 'de', 'ext': 1, 'url': 'https://example.com/subs/de3'},
-            {'name': 'de', 'ext': {}, 'url': 'https://example.com/subs/de4'},
-        ], [..., {
-            'id': 'name',
-            'url': 'url',
-            'ext': 'ext',
-        }, all, {subs_list_to_dict(lang='de')}]) == {
-            'de': [
-                {'url': 'https://example.com/subs/de1'},
-                {'url': 'https://example.com/subs/de2'},
-                {'url': 'https://example.com/subs/de3'},
-                {'url': 'https://example.com/subs/de4'},
-            ],
-        }, 'non str types should be replaced by default id'
-
-    def test_trim_str(self):
-        with pytest.raises(TypeError):
-            trim_str('positional')
-
-        assert callable(trim_str(start='a'))
-        assert trim_str(start='ab')('abc') == 'c'
-        assert trim_str(end='bc')('abc') == 'a'
-        assert trim_str(start='a', end='c')('abc') == 'b'
-        assert trim_str(start='ab', end='c')('abc') == ''
-        assert trim_str(start='a', end='bc')('abc') == ''
-        assert trim_str(start='ab', end='bc')('abc') == ''
-        assert trim_str(start='abc', end='abc')('abc') == ''
-        assert trim_str(start='', end='')('abc') == 'abc'
-
-    def test_unpack(self):
-        assert unpack(lambda *x: ''.join(map(str, x)))([1, 2, 3]) == '123'
-        assert unpack(join_nonempty)([1, 2, 3]) == '1-2-3'
-        assert unpack(join_nonempty, delim=' ')([1, 2, 3]) == '1 2 3'
-        with pytest.raises(TypeError):
-            unpack(join_nonempty)()
-        with pytest.raises(TypeError):
-            unpack()
-
-    def test_find_element(self):
-        for improper_kwargs in [
-            dict(attr='data-id'),
-            dict(value='y'),
-            dict(attr='data-id', value='y', cls='a'),
-            dict(attr='data-id', value='y', id='x'),
-            dict(cls='a', id='x'),
-            dict(cls='a', tag='p'),
-            dict(cls='[ab]', regex=True),
-        ]:
-            with pytest.raises(AssertionError):
-                find_element(**improper_kwargs)(_TEST_HTML)
-
-        assert find_element(cls='a')(_TEST_HTML) == '1'
-        assert find_element(cls='a', html=True)(_TEST_HTML) == '<div class="a">1</div>'
-        assert find_element(id='x')(_TEST_HTML) == '2'
-        assert find_element(id='[ex]')(_TEST_HTML) is None
-        assert find_element(id='[ex]', regex=True)(_TEST_HTML) == '2'
-        assert find_element(id='x', html=True)(_TEST_HTML) == '<div class="a" id="x" custom="z">2</div>'
-        assert find_element(attr='data-id', value='y')(_TEST_HTML) == '3'
-        assert find_element(attr='data-id', value='y(?:es)?')(_TEST_HTML) is None
-        assert find_element(attr='data-id', value='y(?:es)?', regex=True)(_TEST_HTML) == '3'
-        assert find_element(
-            attr='data-id', value='y', html=True)(_TEST_HTML) == '<div class="b" data-id="y" custom="z">3</div>'
-
-    def test_find_elements(self):
-        for improper_kwargs in [
-            dict(tag='p'),
-            dict(attr='data-id'),
-            dict(value='y'),
-            dict(attr='data-id', value='y', cls='a'),
-            dict(cls='a', tag='div'),
-            dict(cls='[ab]', regex=True),
-        ]:
-            with pytest.raises(AssertionError):
-                find_elements(**improper_kwargs)(_TEST_HTML)
-
-        assert find_elements(cls='a')(_TEST_HTML) == ['1', '2', '4']
-        assert find_elements(cls='a', html=True)(_TEST_HTML) == [
-            '<div class="a">1</div>', '<div class="a" id="x" custom="z">2</div>', '<p class="a">4</p>']
-        assert find_elements(attr='custom', value='z')(_TEST_HTML) == ['2', '3']
-        assert find_elements(attr='custom', value='[ez]')(_TEST_HTML) == []
-        assert find_elements(attr='custom', value='[ez]', regex=True)(_TEST_HTML) == ['2', '3', '5']
-
-
-class TestDictGet:
-    def test_dict_get(self):
-        FALSE_VALUES = {
-            'none': None,
-            'false': False,
-            'zero': 0,
-            'empty_string': '',
-            'empty_list': [],
-        }
-        d = {**FALSE_VALUES, 'a': 42}
-        assert dict_get(d, 'a') == 42
-        assert dict_get(d, 'b') is None
-        assert dict_get(d, 'b', 42) == 42
-        assert dict_get(d, ('a',)) == 42
-        assert dict_get(d, ('b', 'a')) == 42
-        assert dict_get(d, ('b', 'c', 'a', 'd')) == 42
-        assert dict_get(d, ('b', 'c')) is None
-        assert dict_get(d, ('b', 'c'), 42) == 42
-        for key, false_value in FALSE_VALUES.items():
-            assert dict_get(d, ('b', 'c', key)) is None
-            assert dict_get(d, ('b', 'c', key), skip_false_values=False) == false_value

test/test_update.py

@@ -78,48 +78,32 @@ TEST_API_DATA = {
 
 TEST_LOCKFILE_COMMENT = '# This file is used for regulating self-update'
 
-TEST_LOCKFILE_V1 = rf'''{TEST_LOCKFILE_COMMENT}
+TEST_LOCKFILE_V1 = r'''%s
 lock 2022.08.18.36 .+ Python 3\.6
 lock 2023.11.16 (?!win_x86_exe).+ Python 3\.7
 lock 2023.11.16 win_x86_exe .+ Windows-(?:Vista|2008Server)
-lock 2024.10.22 py2exe .+
-lock 2024.10.22 linux_(?:armv7l|aarch64)_exe .+-glibc2\.(?:[12]?\d|30)\b
-lock 2024.10.22 (?!\w+_exe).+ Python 3\.8
-lock 2024.10.22 win(?:_x86)?_exe Python 3\.[78].+ Windows-(?:7-|2008ServerR2)
-'''
+''' % TEST_LOCKFILE_COMMENT
 
 TEST_LOCKFILE_V2_TMPL = r'''%s
 lockV2 yt-dlp/yt-dlp 2022.08.18.36 .+ Python 3\.6
 lockV2 yt-dlp/yt-dlp 2023.11.16 (?!win_x86_exe).+ Python 3\.7
 lockV2 yt-dlp/yt-dlp 2023.11.16 win_x86_exe .+ Windows-(?:Vista|2008Server)
-lockV2 yt-dlp/yt-dlp 2024.10.22 py2exe .+
-lockV2 yt-dlp/yt-dlp 2024.10.22 linux_(?:armv7l|aarch64)_exe .+-glibc2\.(?:[12]?\d|30)\b
-lockV2 yt-dlp/yt-dlp 2024.10.22 (?!\w+_exe).+ Python 3\.8
-lockV2 yt-dlp/yt-dlp 2024.10.22 win(?:_x86)?_exe Python 3\.[78].+ Windows-(?:7-|2008ServerR2)
 lockV2 yt-dlp/yt-dlp-nightly-builds 2023.11.15.232826 (?!win_x86_exe).+ Python 3\.7
 lockV2 yt-dlp/yt-dlp-nightly-builds 2023.11.15.232826 win_x86_exe .+ Windows-(?:Vista|2008Server)
-lockV2 yt-dlp/yt-dlp-nightly-builds 2024.10.22.051025 py2exe .+
-lockV2 yt-dlp/yt-dlp-nightly-builds 2024.10.22.051025 linux_(?:armv7l|aarch64)_exe .+-glibc2\.(?:[12]?\d|30)\b
-lockV2 yt-dlp/yt-dlp-nightly-builds 2024.10.22.051025 (?!\w+_exe).+ Python 3\.8
-lockV2 yt-dlp/yt-dlp-nightly-builds 2024.10.22.051025 win(?:_x86)?_exe Python 3\.[78].+ Windows-(?:7-|2008ServerR2)
 lockV2 yt-dlp/yt-dlp-master-builds 2023.11.15.232812 (?!win_x86_exe).+ Python 3\.7
 lockV2 yt-dlp/yt-dlp-master-builds 2023.11.15.232812 win_x86_exe .+ Windows-(?:Vista|2008Server)
-lockV2 yt-dlp/yt-dlp-master-builds 2024.10.22.045052 py2exe .+
-lockV2 yt-dlp/yt-dlp-master-builds 2024.10.22.060347 linux_(?:armv7l|aarch64)_exe .+-glibc2\.(?:[12]?\d|30)\b
-lockV2 yt-dlp/yt-dlp-master-builds 2024.10.22.060347 (?!\w+_exe).+ Python 3\.8
-lockV2 yt-dlp/yt-dlp-master-builds 2024.10.22.060347 win(?:_x86)?_exe Python 3\.[78].+ Windows-(?:7-|2008ServerR2)
 '''
 
 TEST_LOCKFILE_V2 = TEST_LOCKFILE_V2_TMPL % TEST_LOCKFILE_COMMENT
 
 TEST_LOCKFILE_ACTUAL = TEST_LOCKFILE_V2_TMPL % TEST_LOCKFILE_V1.rstrip('\n')
 
-TEST_LOCKFILE_FORK = rf'''{TEST_LOCKFILE_ACTUAL}# Test if a fork blocks updates to non-numeric tags
+TEST_LOCKFILE_FORK = r'''%s# Test if a fork blocks updates to non-numeric tags
 lockV2 fork/yt-dlp pr0000 .+ Python 3.6
 lockV2 fork/yt-dlp pr1234 (?!win_x86_exe).+ Python 3\.7
 lockV2 fork/yt-dlp pr1234 win_x86_exe .+ Windows-(?:Vista|2008Server)
 lockV2 fork/yt-dlp pr9999 .+ Python 3.11
-'''
+''' % TEST_LOCKFILE_ACTUAL
 
 
 class FakeUpdater(Updater):
@@ -161,76 +145,43 @@ class TestUpdate(unittest.TestCase):
         for lockfile in (TEST_LOCKFILE_V1, TEST_LOCKFILE_V2, TEST_LOCKFILE_ACTUAL, TEST_LOCKFILE_FORK):
             # Normal operation
             test(lockfile, 'zip Python 3.12.0', '2023.12.31', '2023.12.31')
-            test(lockfile, 'zip Python 3.12.0', '2023.12.31', '2023.12.31', exact=True)
-            # py2exe should never update beyond 2024.10.22
-            test(lockfile, 'py2exe Python 3.8', '2025.01.01', '2024.10.22')
-            test(lockfile, 'py2exe Python 3.8', '2025.01.01', None, exact=True)
-            # Python 3.6 --update should update only to the py3.6 lock
+            test(lockfile, 'zip stable Python 3.12.0', '2023.12.31', '2023.12.31', exact=True)
+            # Python 3.6 --update should update only to its lock
             test(lockfile, 'zip Python 3.6.0', '2023.11.16', '2022.08.18.36')
-            # Python 3.6 --update-to an exact version later than the py3.6 lock should return None
-            test(lockfile, 'zip Python 3.6.0', '2023.11.16', None, exact=True)
-            # Python 3.7 should be able to update to the py3.7 lock
+            # --update-to an exact version later than the lock should return None
+            test(lockfile, 'zip stable Python 3.6.0', '2023.11.16', None, exact=True)
+            # Python 3.7 should be able to update to its lock
             test(lockfile, 'zip Python 3.7.0', '2023.11.16', '2023.11.16')
-            test(lockfile, 'zip Python 3.7.1', '2023.11.16', '2023.11.16', exact=True)
-            # Non-win_x86_exe builds on py3.7 must be locked at py3.7 lock
+            test(lockfile, 'zip stable Python 3.7.1', '2023.11.16', '2023.11.16', exact=True)
+            # Non-win_x86_exe builds on py3.7 must be locked
             test(lockfile, 'zip Python 3.7.1', '2023.12.31', '2023.11.16')
-            test(lockfile, 'zip Python 3.7.1', '2023.12.31', None, exact=True)
-            # Python 3.8 should only update to the py3.8 lock
-            test(lockfile, 'zip Python 3.8.10', '2025.01.01', '2024.10.22')
-            test(lockfile, 'zip Python 3.8.110', '2025.01.01', None, exact=True)
-            test(  # Windows Vista w/ win_x86_exe must be locked at Vista lock
-                lockfile, 'win_x86_exe Python 3.7.9 (CPython x86 32bit) - Windows-Vista-6.0.6003-SP2',
+            test(lockfile, 'zip stable Python 3.7.1', '2023.12.31', None, exact=True)
+            test(  # Windows Vista w/ win_x86_exe must be locked
+                lockfile, 'win_x86_exe stable Python 3.7.9 (CPython x86 32bit) - Windows-Vista-6.0.6003-SP2',
                 '2023.12.31', '2023.11.16')
-            test(  # Windows 2008Server w/ win_x86_exe must be locked at Vista lock
+            test(  # Windows 2008Server w/ win_x86_exe must be locked
                 lockfile, 'win_x86_exe Python 3.7.9 (CPython x86 32bit) - Windows-2008Server',
                 '2023.12.31', None, exact=True)
-            test(  # Windows 7 w/ win_x86_exe py3.7 build should be able to update beyond py3.7 lock
-                lockfile, 'win_x86_exe Python 3.7.9 (CPython x86 32bit) - Windows-7-6.1.7601-SP1',
-                '2023.12.31', '2023.12.31', exact=True)
-            test(  # Windows 7 win_x86_exe should only update to Win7 lock
-                lockfile, 'win_x86_exe Python 3.7.9 (CPython x86 32bit) - Windows-7-6.1.7601-SP1',
-                '2025.01.01', '2024.10.22')
-            test(  # Windows 2008ServerR2 win_exe should only update to Win7 lock
-                lockfile, 'win_exe Python 3.8.10 (CPython x86 32bit) - Windows-2008ServerR2',
-                '2025.12.31', '2024.10.22')
-            test(  # Windows 8.1 w/ '2008Server' in platform string should be able to update beyond py3.7 lock
+            test(  # Windows 7 w/ win_x86_exe py3.7 build should be able to update beyond lock
+                lockfile, 'win_x86_exe stable Python 3.7.9 (CPython x86 32bit) - Windows-7-6.1.7601-SP1',
+                '2023.12.31', '2023.12.31')
+            test(  # Windows 8.1 w/ '2008Server' in platform string should be able to update beyond lock
                 lockfile, 'win_x86_exe Python 3.7.9 (CPython x86 32bit) - Windows-post2008Server-6.2.9200',
                 '2023.12.31', '2023.12.31', exact=True)
-            test(  # win_exe built w/Python 3.8 on Windows>=8 should be able to update beyond py3.8 lock
-                lockfile, 'win_exe Python 3.8.10 (CPython AMD64 64bit) - Windows-10-10.0.20348-SP0',
-                '2025.01.01', '2025.01.01', exact=True)
-            test(  # linux_armv7l_exe w/glibc2.7 should only update to glibc<2.31 lock
-                lockfile, 'linux_armv7l_exe Python 3.8.0 (CPython armv7l 32bit) - Linux-6.5.0-1025-azure-armv7l-with-glibc2.7',
-                '2025.01.01', '2024.10.22')
-            test(  # linux_armv7l_exe w/Python 3.8 and glibc>=2.31 should be able to update beyond py3.8 and glibc<2.31 locks
-                lockfile, 'linux_armv7l_exe Python 3.8.0 (CPython armv7l 32bit) - Linux-6.5.0-1025-azure-armv7l-with-glibc2.31',
-                '2025.01.01', '2025.01.01')
-            test(  # linux_armv7l_exe w/glibc2.30 should only update to glibc<2.31 lock
-                lockfile, 'linux_armv7l_exe Python 3.8.0 (CPython armv7l 64bit) - Linux-6.5.0-1025-azure-aarch64-with-glibc2.30 (OpenSSL',
-                '2025.01.01', '2024.10.22')
-            test(  # linux_aarch64_exe w/glibc2.17 should only update to glibc<2.31 lock
-                lockfile, 'linux_aarch64_exe Python 3.8.0 (CPython aarch64 64bit) - Linux-6.5.0-1025-azure-aarch64-with-glibc2.17',
-                '2025.01.01', '2024.10.22')
-            test(  # linux_aarch64_exe w/glibc2.40 and glibc>=2.31 should be able to update beyond py3.8 and glibc<2.31 locks
-                lockfile, 'linux_aarch64_exe Python 3.8.0 (CPython aarch64 64bit) - Linux-6.5.0-1025-azure-aarch64-with-glibc2.40',
-                '2025.01.01', '2025.01.01')
-            test(  # linux_aarch64_exe w/glibc2.3 should only update to glibc<2.31 lock
-                lockfile, 'linux_aarch64_exe Python 3.8.0 (CPython aarch64 64bit) - Linux-6.5.0-1025-azure-aarch64-with-glibc2.3 (OpenSSL',
-                '2025.01.01', '2024.10.22')
 
         # Forks can block updates to non-numeric tags rather than lock
         test(TEST_LOCKFILE_FORK, 'zip Python 3.6.3', 'pr0000', None, repo='fork/yt-dlp')
-        test(TEST_LOCKFILE_FORK, 'zip Python 3.7.4', 'pr0000', 'pr0000', repo='fork/yt-dlp')
-        test(TEST_LOCKFILE_FORK, 'zip Python 3.7.4', 'pr1234', None, repo='fork/yt-dlp')
+        test(TEST_LOCKFILE_FORK, 'zip stable Python 3.7.4', 'pr0000', 'pr0000', repo='fork/yt-dlp')
+        test(TEST_LOCKFILE_FORK, 'zip stable Python 3.7.4', 'pr1234', None, repo='fork/yt-dlp')
         test(TEST_LOCKFILE_FORK, 'zip Python 3.8.1', 'pr1234', 'pr1234', repo='fork/yt-dlp', exact=True)
         test(
-            TEST_LOCKFILE_FORK, 'win_x86_exe Python 3.7.9 (CPython x86 32bit) - Windows-Vista-6.0.6003-SP2',
+            TEST_LOCKFILE_FORK, 'win_x86_exe stable Python 3.7.9 (CPython x86 32bit) - Windows-Vista-6.0.6003-SP2',
             'pr1234', None, repo='fork/yt-dlp')
         test(
-            TEST_LOCKFILE_FORK, 'win_x86_exe Python 3.7.9 (CPython x86 32bit) - Windows-7-6.1.7601-SP1',
+            TEST_LOCKFILE_FORK, 'win_x86_exe stable Python 3.7.9 (CPython x86 32bit) - Windows-7-6.1.7601-SP1',
             '2023.12.31', '2023.12.31', repo='fork/yt-dlp')
         test(TEST_LOCKFILE_FORK, 'zip Python 3.11.2', 'pr9999', None, repo='fork/yt-dlp', exact=True)
-        test(TEST_LOCKFILE_FORK, 'zip Python 3.12.0', 'pr9999', 'pr9999', repo='fork/yt-dlp')
+        test(TEST_LOCKFILE_FORK, 'zip stable Python 3.12.0', 'pr9999', 'pr9999', repo='fork/yt-dlp')
 
     def test_query_update(self):
         ydl = FakeYDL()

test/test_utils.py

@@ -2,26 +2,25 @@
 
 # Allow direct execution
 import os
+import re
 import sys
+import unittest
+import warnings
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
 import contextlib
-import datetime as dt
 import io
 import itertools
 import json
-import pickle
 import subprocess
-import unittest
-import unittest.mock
-import warnings
 import xml.etree.ElementTree
 
 from yt_dlp.compat import (
     compat_etree_fromstring,
     compat_HTMLParseError,
+    compat_os_name,
 )
 from yt_dlp.utils import (
     Config,
@@ -29,7 +28,6 @@ from yt_dlp.utils import (
     ExtractorError,
     InAdvancePagedList,
     LazyList,
-    NO_DEFAULT,
     OnDemandPagedList,
     Popen,
     age_restricted,
@@ -47,8 +45,10 @@ from yt_dlp.utils import (
     determine_ext,
     determine_file_encoding,
     dfxp2srt,
+    dict_get,
     encode_base_n,
     encode_compat_str,
+    encodeFilename,
     expand_path,
     extract_attributes,
     extract_basic_auth,
@@ -68,6 +68,7 @@ from yt_dlp.utils import (
     get_elements_html_by_class,
     get_elements_text_and_html_by_attribute,
     int_or_none,
+    intlist_to_bytes,
     iri_to_uri,
     is_html,
     js_to_json,
@@ -105,11 +106,13 @@ from yt_dlp.utils import (
     sanitize_url,
     shell_quote,
     smuggle_url,
+    str_or_none,
     str_to_int,
     strip_jsonp,
     strip_or_none,
     subtitles_filename,
     timeconvert,
+    traverse_obj,
     try_call,
     unescapeHTML,
     unified_strdate,
@@ -129,7 +132,6 @@ from yt_dlp.utils import (
     xpath_text,
     xpath_with_ns,
 )
-from yt_dlp.utils._utils import _UnsafeExtensionError
 from yt_dlp.utils.networking import (
     HTTPHeaderDict,
     escape_rfc3986,
@@ -219,8 +221,10 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(sanitize_filename('_BD_eEpuzXw', is_id=True), '_BD_eEpuzXw')
         self.assertEqual(sanitize_filename('N0Y__7-UOdI', is_id=True), 'N0Y__7-UOdI')
 
-    @unittest.mock.patch('sys.platform', 'win32')
     def test_sanitize_path(self):
+        if sys.platform != 'win32':
+            return
+
         self.assertEqual(sanitize_path('abc'), 'abc')
         self.assertEqual(sanitize_path('abc/def'), 'abc\\def')
         self.assertEqual(sanitize_path('abc\\def'), 'abc\\def')
@@ -247,33 +251,11 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(sanitize_path('abc/def...'), 'abc\\def..#')
         self.assertEqual(sanitize_path('abc.../def'), 'abc..#\\def')
         self.assertEqual(sanitize_path('abc.../def...'), 'abc..#\\def..#')
-        self.assertEqual(sanitize_path('C:\\abc:%(title)s.%(ext)s'), 'C:\\abc#%(title)s.%(ext)s')
 
-        # Check with nt._path_normpath if available
-        try:
-            from nt import _path_normpath as nt_path_normpath
-        except ImportError:
-            nt_path_normpath = None
-
-        for test, expected in [
-            ('C:\\', 'C:\\'),
-            ('../abc', '..\\abc'),
-            ('../../abc', '..\\..\\abc'),
-            ('./abc', 'abc'),
-            ('./../abc', '..\\abc'),
-            ('\\abc', '\\abc'),
-            ('C:abc', 'C:abc'),
-            ('C:abc\\..\\', 'C:'),
-            ('C:abc\\..\\def\\..\\..\\', 'C:..'),
-            ('C:\\abc\\xyz///..\\def\\', 'C:\\abc\\def'),
-            ('abc/../', '.'),
-            ('./abc/../', '.'),
-        ]:
-            result = sanitize_path(test)
-            assert result == expected, f'{test} was incorrectly resolved'
-            assert result == sanitize_path(result), f'{test} changed after sanitizing again'
-            if nt_path_normpath:
-                assert result == nt_path_normpath(test), f'{test} does not match nt._path_normpath'
+        self.assertEqual(sanitize_path('../abc'), '..\\abc')
+        self.assertEqual(sanitize_path('../../abc'), '..\\..\\abc')
+        self.assertEqual(sanitize_path('./abc'), 'abc')
+        self.assertEqual(sanitize_path('./../abc'), '..\\abc')
 
     def test_sanitize_url(self):
         self.assertEqual(sanitize_url('//foo.bar'), 'http://foo.bar')
@@ -296,18 +278,11 @@ class TestUtil(unittest.TestCase):
             self.assertEqual(expand_path(env('HOME')), os.getenv('HOME'))
             self.assertEqual(expand_path('~'), os.getenv('HOME'))
             self.assertEqual(
-                expand_path('~/{}'.format(env('yt_dlp_EXPATH_PATH'))),
-                '{}/expanded'.format(os.getenv('HOME')))
+                expand_path('~/%s' % env('yt_dlp_EXPATH_PATH')),
+                '%s/expanded' % os.getenv('HOME'))
         finally:
             os.environ['HOME'] = old_home or ''
 
-    _uncommon_extensions = [
-        ('exe', 'abc.exe.ext'),
-        ('de', 'abc.de.ext'),
-        ('../.mp4', None),
-        ('..\\.mp4', None),
-    ]
-
     def test_prepend_extension(self):
         self.assertEqual(prepend_extension('abc.ext', 'temp'), 'abc.temp.ext')
         self.assertEqual(prepend_extension('abc.ext', 'temp', 'ext'), 'abc.temp.ext')
@@ -316,19 +291,6 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(prepend_extension('.abc', 'temp'), '.abc.temp')
         self.assertEqual(prepend_extension('.abc.ext', 'temp'), '.abc.temp.ext')
 
-        # Test uncommon extensions
-        self.assertEqual(prepend_extension('abc.ext', 'bin'), 'abc.bin.ext')
-        for ext, result in self._uncommon_extensions:
-            with self.assertRaises(_UnsafeExtensionError):
-                prepend_extension('abc', ext)
-            if result:
-                self.assertEqual(prepend_extension('abc.ext', ext, 'ext'), result)
-            else:
-                with self.assertRaises(_UnsafeExtensionError):
-                    prepend_extension('abc.ext', ext, 'ext')
-            with self.assertRaises(_UnsafeExtensionError):
-                prepend_extension('abc.unexpected_ext', ext, 'ext')
-
     def test_replace_extension(self):
         self.assertEqual(replace_extension('abc.ext', 'temp'), 'abc.temp')
         self.assertEqual(replace_extension('abc.ext', 'temp', 'ext'), 'abc.temp')
@@ -337,16 +299,6 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(replace_extension('.abc', 'temp'), '.abc.temp')
         self.assertEqual(replace_extension('.abc.ext', 'temp'), '.abc.temp')
 
-        # Test uncommon extensions
-        self.assertEqual(replace_extension('abc.ext', 'bin'), 'abc.unknown_video')
-        for ext, _ in self._uncommon_extensions:
-            with self.assertRaises(_UnsafeExtensionError):
-                replace_extension('abc', ext)
-            with self.assertRaises(_UnsafeExtensionError):
-                replace_extension('abc.ext', ext, 'ext')
-            with self.assertRaises(_UnsafeExtensionError):
-                replace_extension('abc.unexpected_ext', ext, 'ext')
-
     def test_subtitles_filename(self):
         self.assertEqual(subtitles_filename('abc.ext', 'en', 'vtt'), 'abc.en.vtt')
         self.assertEqual(subtitles_filename('abc.ext', 'en', 'vtt', 'ext'), 'abc.en.vtt')
@@ -356,13 +308,11 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(remove_start(None, 'A - '), None)
         self.assertEqual(remove_start('A - B', 'A - '), 'B')
         self.assertEqual(remove_start('B - A', 'A - '), 'B - A')
-        self.assertEqual(remove_start('non-empty', ''), 'non-empty')
 
     def test_remove_end(self):
         self.assertEqual(remove_end(None, ' - B'), None)
         self.assertEqual(remove_end('A - B', ' - B'), 'A')
         self.assertEqual(remove_end('B - A', ' - B'), 'B - A')
-        self.assertEqual(remove_end('non-empty', ''), 'non-empty')
 
     def test_remove_quotes(self):
         self.assertEqual(remove_quotes(None), None)
@@ -408,12 +358,12 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(datetime_from_str('now+23hours', precision='hour'), datetime_from_str('now+23hours', precision='auto'))
 
     def test_daterange(self):
-        _20century = DateRange('19000101', '20000101')
-        self.assertFalse('17890714' in _20century)
-        _ac = DateRange('00010101')
-        self.assertTrue('19690721' in _ac)
-        _firstmilenium = DateRange(end='10000101')
-        self.assertTrue('07110427' in _firstmilenium)
+        _20century = DateRange("19000101", "20000101")
+        self.assertFalse("17890714" in _20century)
+        _ac = DateRange("00010101")
+        self.assertTrue("19690721" in _ac)
+        _firstmilenium = DateRange(end="10000101")
+        self.assertTrue("07110427" in _firstmilenium)
 
     def test_unified_dates(self):
         self.assertEqual(unified_strdate('December 21, 2010'), '20101221')
@@ -465,8 +415,6 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(unified_timestamp('Sep 11, 2013 | 5:49 AM'), 1378878540)
         self.assertEqual(unified_timestamp('December 15, 2017 at 7:49 am'), 1513324140)
         self.assertEqual(unified_timestamp('2018-03-14T08:32:43.1493874+00:00'), 1521016363)
-        self.assertEqual(unified_timestamp('Sunday, 26 Nov 2006, 19:00'), 1164567600)
-        self.assertEqual(unified_timestamp('wed, aug 16, 2008, 12:00pm'), 1218931200)
 
         self.assertEqual(unified_timestamp('December 31 1969 20:00:01 EDT'), 1)
         self.assertEqual(unified_timestamp('Wednesday 31 December 1969 18:01:26 MDT'), 86)
@@ -560,7 +508,7 @@ class TestUtil(unittest.TestCase):
         self.assertRaises(ExtractorError, xpath_attr, doc, 'div/p', 'y', fatal=True)
 
     def test_smuggle_url(self):
-        data = {'ö': 'ö', 'abc': [3]}
+        data = {"ö": "ö", "abc": [3]}
         url = 'https://foo.bar/baz?x=y#a'
         smug_url = smuggle_url(url, data)
         unsmug_url, unsmug_data = unsmuggle_url(smug_url)
@@ -578,10 +526,10 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(res_data, {'a': 'b', 'c': 'd'})
 
     def test_shell_quote(self):
-        args = ['ffmpeg', '-i', 'ñ€ß\'.mp4']
+        args = ['ffmpeg', '-i', encodeFilename('ñ€ß\'.mp4')]
         self.assertEqual(
             shell_quote(args),
-            """ffmpeg -i 'ñ€ß'"'"'.mp4'""" if os.name != 'nt' else '''ffmpeg -i "ñ€ß'.mp4"''')
+            """ffmpeg -i 'ñ€ß'"'"'.mp4'""" if compat_os_name != 'nt' else '''ffmpeg -i "ñ€ß'.mp4"''')
 
     def test_float_or_none(self):
         self.assertEqual(float_or_none('42.42'), 42.42)
@@ -659,8 +607,6 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(url_or_none('mms://foo.de'), 'mms://foo.de')
         self.assertEqual(url_or_none('rtspu://foo.de'), 'rtspu://foo.de')
         self.assertEqual(url_or_none('ftps://foo.de'), 'ftps://foo.de')
-        self.assertEqual(url_or_none('ws://foo.de'), 'ws://foo.de')
-        self.assertEqual(url_or_none('wss://foo.de'), 'wss://foo.de')
 
     def test_parse_age_limit(self):
         self.assertEqual(parse_age_limit(None), None)
@@ -809,6 +755,28 @@ class TestUtil(unittest.TestCase):
         self.assertRaises(
             ValueError, multipart_encode, {b'field': b'value'}, boundary='value')
 
+    def test_dict_get(self):
+        FALSE_VALUES = {
+            'none': None,
+            'false': False,
+            'zero': 0,
+            'empty_string': '',
+            'empty_list': [],
+        }
+        d = FALSE_VALUES.copy()
+        d['a'] = 42
+        self.assertEqual(dict_get(d, 'a'), 42)
+        self.assertEqual(dict_get(d, 'b'), None)
+        self.assertEqual(dict_get(d, 'b', 42), 42)
+        self.assertEqual(dict_get(d, ('a', )), 42)
+        self.assertEqual(dict_get(d, ('b', 'a', )), 42)
+        self.assertEqual(dict_get(d, ('b', 'c', 'a', 'd', )), 42)
+        self.assertEqual(dict_get(d, ('b', 'c', )), None)
+        self.assertEqual(dict_get(d, ('b', 'c', ), 42), 42)
+        for key, false_value in FALSE_VALUES.items():
+            self.assertEqual(dict_get(d, ('b', 'c', key, )), None)
+            self.assertEqual(dict_get(d, ('b', 'c', key, ), skip_false_values=False), false_value)
+
     def test_merge_dicts(self):
         self.assertEqual(merge_dicts({'a': 1}, {'b': 2}), {'a': 1, 'b': 2})
         self.assertEqual(merge_dicts({'a': 1}, {'a': 2}), {'a': 1})
@@ -826,11 +794,6 @@ class TestUtil(unittest.TestCase):
 
     def test_parse_iso8601(self):
         self.assertEqual(parse_iso8601('2014-03-23T23:04:26+0100'), 1395612266)
-        self.assertEqual(parse_iso8601('2014-03-23T23:04:26-07:00'), 1395641066)
-        self.assertEqual(parse_iso8601('2014-03-23T23:04:26', timezone=dt.timedelta(hours=-7)), 1395641066)
-        self.assertEqual(parse_iso8601('2014-03-23T23:04:26', timezone=NO_DEFAULT), None)
-        # default does not override timezone in date_str
-        self.assertEqual(parse_iso8601('2014-03-23T23:04:26-07:00', timezone=dt.timedelta(hours=-10)), 1395641066)
         self.assertEqual(parse_iso8601('2014-03-23T22:04:26+0000'), 1395612266)
         self.assertEqual(parse_iso8601('2014-03-23T22:04:26Z'), 1395612266)
         self.assertEqual(parse_iso8601('2014-03-23T22:04:26.1234Z'), 1395612266)
@@ -840,7 +803,7 @@ class TestUtil(unittest.TestCase):
     def test_strip_jsonp(self):
         stripped = strip_jsonp('cb ([ {"id":"532cb",\n\n\n"x":\n3}\n]\n);')
         d = json.loads(stripped)
-        self.assertEqual(d, [{'id': '532cb', 'x': 3}])
+        self.assertEqual(d, [{"id": "532cb", "x": 3}])
 
         stripped = strip_jsonp('parseMetadata({"STATUS":"OK"})\n\n\n//epc')
         d = json.loads(stripped)
@@ -944,11 +907,6 @@ class TestUtil(unittest.TestCase):
             'acodec': 'none',
             'dynamic_range': 'HDR10',
         })
-        self.assertEqual(parse_codecs('vp09.02.50.10.01.09.18.09.00'), {
-            'vcodec': 'vp09.02.50.10.01.09.18.09.00',
-            'acodec': 'none',
-            'dynamic_range': 'HDR10',
-        })
         self.assertEqual(parse_codecs('av01.0.12M.10.0.110.09.16.09.0'), {
             'vcodec': 'av01.0.12M.10.0.110.09.16.09.0',
             'acodec': 'none',
@@ -959,11 +917,6 @@ class TestUtil(unittest.TestCase):
             'acodec': 'none',
             'dynamic_range': 'DV',
         })
-        self.assertEqual(parse_codecs('fLaC'), {
-            'vcodec': 'none',
-            'acodec': 'flac',
-            'dynamic_range': None,
-        })
         self.assertEqual(parse_codecs('theora, vorbis'), {
             'vcodec': 'theora',
             'acodec': 'vorbis',
@@ -988,19 +941,19 @@ class TestUtil(unittest.TestCase):
     def test_normalize_url(self):
         self.assertEqual(
             normalize_url('http://wowza.imust.org/srv/vod/telemb/new/UPLOAD/UPLOAD/20224_IncendieHavré_FD.mp4'),
-            'http://wowza.imust.org/srv/vod/telemb/new/UPLOAD/UPLOAD/20224_IncendieHavre%CC%81_FD.mp4',
+            'http://wowza.imust.org/srv/vod/telemb/new/UPLOAD/UPLOAD/20224_IncendieHavre%CC%81_FD.mp4'
         )
         self.assertEqual(
             normalize_url('http://www.ardmediathek.de/tv/Sturm-der-Liebe/Folge-2036-Zu-Mann-und-Frau-erklärt/Das-Erste/Video?documentId=22673108&bcastId=5290'),
-            'http://www.ardmediathek.de/tv/Sturm-der-Liebe/Folge-2036-Zu-Mann-und-Frau-erkl%C3%A4rt/Das-Erste/Video?documentId=22673108&bcastId=5290',
+            'http://www.ardmediathek.de/tv/Sturm-der-Liebe/Folge-2036-Zu-Mann-und-Frau-erkl%C3%A4rt/Das-Erste/Video?documentId=22673108&bcastId=5290'
         )
         self.assertEqual(
             normalize_url('http://тест.рф/фрагмент'),
-            'http://xn--e1aybc.xn--p1ai/%D1%84%D1%80%D0%B0%D0%B3%D0%BC%D0%B5%D0%BD%D1%82',
+            'http://xn--e1aybc.xn--p1ai/%D1%84%D1%80%D0%B0%D0%B3%D0%BC%D0%B5%D0%BD%D1%82'
         )
         self.assertEqual(
             normalize_url('http://тест.рф/абв?абв=абв#абв'),
-            'http://xn--e1aybc.xn--p1ai/%D0%B0%D0%B1%D0%B2?%D0%B0%D0%B1%D0%B2=%D0%B0%D0%B1%D0%B2#%D0%B0%D0%B1%D0%B2',
+            'http://xn--e1aybc.xn--p1ai/%D0%B0%D0%B1%D0%B2?%D0%B0%D0%B1%D0%B2=%D0%B0%D0%B1%D0%B2#%D0%B0%D0%B1%D0%B2'
         )
         self.assertEqual(normalize_url('http://vimeo.com/56015672#at=0'), 'http://vimeo.com/56015672#at=0')
 
@@ -1045,7 +998,7 @@ class TestUtil(unittest.TestCase):
                     'e': 'false',
                     'f': '"false"',
                     'g': 'var',
-                },
+                }
             )),
             {
                 'null': None,
@@ -1054,8 +1007,8 @@ class TestUtil(unittest.TestCase):
                 'trueStr': 'true',
                 'false': False,
                 'falseStr': 'false',
-                'unresolvedVar': 'var',
-            },
+                'unresolvedVar': 'var'
+            }
         )
 
         self.assertDictEqual(
@@ -1071,14 +1024,14 @@ class TestUtil(unittest.TestCase):
                     'b': '"123"',
                     'c': '1.23',
                     'd': '"1.23"',
-                },
+                }
             )),
             {
                 'int': 123,
                 'intStr': '123',
                 'float': 1.23,
                 'floatStr': '1.23',
-            },
+            }
         )
 
         self.assertDictEqual(
@@ -1094,14 +1047,14 @@ class TestUtil(unittest.TestCase):
                     'b': '"{}"',
                     'c': '[]',
                     'd': '"[]"',
-                },
+                }
             )),
             {
                 'object': {},
                 'objectStr': '{}',
                 'array': [],
                 'arrayStr': '[]',
-            },
+            }
         )
 
     def test_js_to_json_realworld(self):
@@ -1147,7 +1100,7 @@ class TestUtil(unittest.TestCase):
 
     def test_js_to_json_edgecases(self):
         on = js_to_json("{abc_def:'1\\'\\\\2\\\\\\'3\"4'}")
-        self.assertEqual(json.loads(on), {'abc_def': "1'\\2\\'3\"4"})
+        self.assertEqual(json.loads(on), {"abc_def": "1'\\2\\'3\"4"})
 
         on = js_to_json('{"abc": true}')
         self.assertEqual(json.loads(on), {'abc': True})
@@ -1179,9 +1132,9 @@ class TestUtil(unittest.TestCase):
             'c': 0,
             'd': 42.42,
             'e': [],
-            'f': 'abc',
-            'g': '',
-            '42': 42,
+            'f': "abc",
+            'g': "",
+            '42': 42
         })
 
         on = js_to_json('["abc", "def",]')
@@ -1262,7 +1215,6 @@ class TestUtil(unittest.TestCase):
     def test_js_to_json_malformed(self):
         self.assertEqual(js_to_json('42a1'), '42"a1"')
         self.assertEqual(js_to_json('42a-1'), '42"a"-1')
-        self.assertEqual(js_to_json('{a: `${e("")}`}'), '{"a": "\\"e\\"(\\"\\")"}')
 
     def test_js_to_json_template_literal(self):
         self.assertEqual(js_to_json('`Hello ${name}`', {'name': '"world"'}), '"Hello world"')
@@ -1276,8 +1228,8 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(json.loads(js_to_json('Array(5, 10)')), [5, 10])
         self.assertEqual(json.loads(js_to_json('new Array(15,5)')), [15, 5])
         self.assertEqual(json.loads(js_to_json('new Map([Array(5, 10),new Array(15,5)])')), {'5': 10, '15': 5})
-        self.assertEqual(json.loads(js_to_json('new Date("123")')), '123')
-        self.assertEqual(json.loads(js_to_json('new Date(\'2023-10-19\')')), '2023-10-19')
+        self.assertEqual(json.loads(js_to_json('new Date("123")')), "123")
+        self.assertEqual(json.loads(js_to_json('new Date(\'2023-10-19\')')), "2023-10-19")
 
     def test_extract_attributes(self):
         self.assertEqual(extract_attributes('<e x="y">'), {'x': 'y'})
@@ -1324,10 +1276,15 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(clean_html('a:\n   "b"'), 'a: "b"')
         self.assertEqual(clean_html('a<br>\xa0b'), 'a\nb')
 
+    def test_intlist_to_bytes(self):
+        self.assertEqual(
+            intlist_to_bytes([0, 1, 127, 128, 255]),
+            b'\x00\x01\x7f\x80\xff')
+
     def test_args_to_str(self):
         self.assertEqual(
             args_to_str(['foo', 'ba/r', '-baz', '2 be', '']),
-            'foo ba/r -baz \'2 be\' \'\'' if os.name != 'nt' else 'foo ba/r -baz "2 be" ""',
+            'foo ba/r -baz \'2 be\' \'\'' if compat_os_name != 'nt' else 'foo ba/r -baz "2 be" ""'
         )
 
     def test_parse_filesize(self):
@@ -1410,10 +1367,10 @@ ffmpeg version 2.4.4 Copyright (c) 2000-2014 the FFmpeg ...'''), '2.4.4')
         self.assertTrue(is_html(  # UTF-8 with BOM
             b'\xef\xbb\xbf<!DOCTYPE foo>\xaaa'))
         self.assertTrue(is_html(  # UTF-16-LE
-            b'\xff\xfe<\x00h\x00t\x00m\x00l\x00>\x00\xe4\x00',
+            b'\xff\xfe<\x00h\x00t\x00m\x00l\x00>\x00\xe4\x00'
         ))
         self.assertTrue(is_html(  # UTF-16-BE
-            b'\xfe\xff\x00<\x00h\x00t\x00m\x00l\x00>\x00\xe4',
+            b'\xfe\xff\x00<\x00h\x00t\x00m\x00l\x00>\x00\xe4'
         ))
         self.assertTrue(is_html(  # UTF-32-BE
             b'\x00\x00\xFE\xFF\x00\x00\x00<\x00\x00\x00h\x00\x00\x00t\x00\x00\x00m\x00\x00\x00l\x00\x00\x00>\x00\x00\x00\xe4'))
@@ -1997,7 +1954,7 @@ Line 1
                             with locked_file(FILE, test_mode, False):
                                 pass
                         except (BlockingIOError, PermissionError):
-                            if not testing_write:  # FIXME: blocked read access
+                            if not testing_write:  # FIXME
                                 print(f'Known issue: Exclusive lock ({lock_mode}) blocks read access ({test_mode})')
                                 continue
                             self.assertTrue(testing_write, f'{test_mode} is blocked by {lock_mode}')
@@ -2065,7 +2022,7 @@ Line 1
                          msg='int fn with expected_type int should give int')
         self.assertEqual(try_call(lambda: 1, expected_type=dict), None,
                          msg='int fn with wrong expected_type should give None')
-        self.assertEqual(try_call(total, args=(0, 1, 0), expected_type=int), 1,
+        self.assertEqual(try_call(total, args=(0, 1, 0, ), expected_type=int), 1,
                          msg='fn should accept arglist')
         self.assertEqual(try_call(total, kwargs={'a': 0, 'b': 1, 'c': 0}, expected_type=int), 1,
                          msg='fn should accept kwargs')
@@ -2082,30 +2039,378 @@ Line 1
             warnings.simplefilter('ignore')
             self.assertEqual(variadic('spam', allowed_types=[dict]), 'spam')
 
+    def test_traverse_obj(self):
+        _TEST_DATA = {
+            100: 100,
+            1.2: 1.2,
+            'str': 'str',
+            'None': None,
+            '...': ...,
+            'urls': [
+                {'index': 0, 'url': 'https://www.example.com/0'},
+                {'index': 1, 'url': 'https://www.example.com/1'},
+            ],
+            'data': (
+                {'index': 2},
+                {'index': 3},
+            ),
+            'dict': {},
+        }
+
+        # Test base functionality
+        self.assertEqual(traverse_obj(_TEST_DATA, ('str',)), 'str',
+                         msg='allow tuple path')
+        self.assertEqual(traverse_obj(_TEST_DATA, ['str']), 'str',
+                         msg='allow list path')
+        self.assertEqual(traverse_obj(_TEST_DATA, (value for value in ("str",))), 'str',
+                         msg='allow iterable path')
+        self.assertEqual(traverse_obj(_TEST_DATA, 'str'), 'str',
+                         msg='single items should be treated as a path')
+        self.assertEqual(traverse_obj(_TEST_DATA, None), _TEST_DATA)
+        self.assertEqual(traverse_obj(_TEST_DATA, 100), 100)
+        self.assertEqual(traverse_obj(_TEST_DATA, 1.2), 1.2)
+
+        # Test Ellipsis behavior
+        self.assertCountEqual(traverse_obj(_TEST_DATA, ...),
+                              (item for item in _TEST_DATA.values() if item not in (None, {})),
+                              msg='`...` should give all non discarded values')
+        self.assertCountEqual(traverse_obj(_TEST_DATA, ('urls', 0, ...)), _TEST_DATA['urls'][0].values(),
+                              msg='`...` selection for dicts should select all values')
+        self.assertEqual(traverse_obj(_TEST_DATA, (..., ..., 'url')),
+                         ['https://www.example.com/0', 'https://www.example.com/1'],
+                         msg='nested `...` queries should work')
+        self.assertCountEqual(traverse_obj(_TEST_DATA, (..., ..., 'index')), range(4),
+                              msg='`...` query result should be flattened')
+        self.assertEqual(traverse_obj(iter(range(4)), ...), list(range(4)),
+                         msg='`...` should accept iterables')
+
+        # Test function as key
+        self.assertEqual(traverse_obj(_TEST_DATA, lambda x, y: x == 'urls' and isinstance(y, list)),
+                         [_TEST_DATA['urls']],
+                         msg='function as query key should perform a filter based on (key, value)')
+        self.assertCountEqual(traverse_obj(_TEST_DATA, lambda _, x: isinstance(x[0], str)), {'str'},
+                              msg='exceptions in the query function should be catched')
+        self.assertEqual(traverse_obj(iter(range(4)), lambda _, x: x % 2 == 0), [0, 2],
+                         msg='function key should accept iterables')
+        if __debug__:
+            with self.assertRaises(Exception, msg='Wrong function signature should raise in debug'):
+                traverse_obj(_TEST_DATA, lambda a: ...)
+            with self.assertRaises(Exception, msg='Wrong function signature should raise in debug'):
+                traverse_obj(_TEST_DATA, lambda a, b, c: ...)
+
+        # Test set as key (transformation/type, like `expected_type`)
+        self.assertEqual(traverse_obj(_TEST_DATA, (..., {str.upper}, )), ['STR'],
+                         msg='Function in set should be a transformation')
+        self.assertEqual(traverse_obj(_TEST_DATA, (..., {str})), ['str'],
+                         msg='Type in set should be a type filter')
+        self.assertEqual(traverse_obj(_TEST_DATA, {dict}), _TEST_DATA,
+                         msg='A single set should be wrapped into a path')
+        self.assertEqual(traverse_obj(_TEST_DATA, (..., {str.upper})), ['STR'],
+                         msg='Transformation function should not raise')
+        self.assertEqual(traverse_obj(_TEST_DATA, (..., {str_or_none})),
+                         [item for item in map(str_or_none, _TEST_DATA.values()) if item is not None],
+                         msg='Function in set should be a transformation')
+        self.assertEqual(traverse_obj(_TEST_DATA, ('fail', {lambda _: 'const'})), 'const',
+                         msg='Function in set should always be called')
+        if __debug__:
+            with self.assertRaises(Exception, msg='Sets with length != 1 should raise in debug'):
+                traverse_obj(_TEST_DATA, set())
+            with self.assertRaises(Exception, msg='Sets with length != 1 should raise in debug'):
+                traverse_obj(_TEST_DATA, {str.upper, str})
+
+        # Test `slice` as a key
+        _SLICE_DATA = [0, 1, 2, 3, 4]
+        self.assertEqual(traverse_obj(_TEST_DATA, ('dict', slice(1))), None,
+                         msg='slice on a dictionary should not throw')
+        self.assertEqual(traverse_obj(_SLICE_DATA, slice(1)), _SLICE_DATA[:1],
+                         msg='slice key should apply slice to sequence')
+        self.assertEqual(traverse_obj(_SLICE_DATA, slice(1, 2)), _SLICE_DATA[1:2],
+                         msg='slice key should apply slice to sequence')
+        self.assertEqual(traverse_obj(_SLICE_DATA, slice(1, 4, 2)), _SLICE_DATA[1:4:2],
+                         msg='slice key should apply slice to sequence')
+
+        # Test alternative paths
+        self.assertEqual(traverse_obj(_TEST_DATA, 'fail', 'str'), 'str',
+                         msg='multiple `paths` should be treated as alternative paths')
+        self.assertEqual(traverse_obj(_TEST_DATA, 'str', 100), 'str',
+                         msg='alternatives should exit early')
+        self.assertEqual(traverse_obj(_TEST_DATA, 'fail', 'fail'), None,
+                         msg='alternatives should return `default` if exhausted')
+        self.assertEqual(traverse_obj(_TEST_DATA, (..., 'fail'), 100), 100,
+                         msg='alternatives should track their own branching return')
+        self.assertEqual(traverse_obj(_TEST_DATA, ('dict', ...), ('data', ...)), list(_TEST_DATA['data']),
+                         msg='alternatives on empty objects should search further')
+
+        # Test branch and path nesting
+        self.assertEqual(traverse_obj(_TEST_DATA, ('urls', (3, 0), 'url')), ['https://www.example.com/0'],
+                         msg='tuple as key should be treated as branches')
+        self.assertEqual(traverse_obj(_TEST_DATA, ('urls', [3, 0], 'url')), ['https://www.example.com/0'],
+                         msg='list as key should be treated as branches')
+        self.assertEqual(traverse_obj(_TEST_DATA, ('urls', ((1, 'fail'), (0, 'url')))), ['https://www.example.com/0'],
+                         msg='double nesting in path should be treated as paths')
+        self.assertEqual(traverse_obj(['0', [1, 2]], [(0, 1), 0]), [1],
+                         msg='do not fail early on branching')
+        self.assertCountEqual(traverse_obj(_TEST_DATA, ('urls', ((1, ('fail', 'url')), (0, 'url')))),
+                              ['https://www.example.com/0', 'https://www.example.com/1'],
+                              msg='tripple nesting in path should be treated as branches')
+        self.assertEqual(traverse_obj(_TEST_DATA, ('urls', ('fail', (..., 'url')))),
+                         ['https://www.example.com/0', 'https://www.example.com/1'],
+                         msg='ellipsis as branch path start gets flattened')
+
+        # Test dictionary as key
+        self.assertEqual(traverse_obj(_TEST_DATA, {0: 100, 1: 1.2}), {0: 100, 1: 1.2},
+                         msg='dict key should result in a dict with the same keys')
+        self.assertEqual(traverse_obj(_TEST_DATA, {0: ('urls', 0, 'url')}),
+                         {0: 'https://www.example.com/0'},
+                         msg='dict key should allow paths')
+        self.assertEqual(traverse_obj(_TEST_DATA, {0: ('urls', (3, 0), 'url')}),
+                         {0: ['https://www.example.com/0']},
+                         msg='tuple in dict path should be treated as branches')
+        self.assertEqual(traverse_obj(_TEST_DATA, {0: ('urls', ((1, 'fail'), (0, 'url')))}),
+                         {0: ['https://www.example.com/0']},
+                         msg='double nesting in dict path should be treated as paths')
+        self.assertEqual(traverse_obj(_TEST_DATA, {0: ('urls', ((1, ('fail', 'url')), (0, 'url')))}),
+                         {0: ['https://www.example.com/1', 'https://www.example.com/0']},
+                         msg='tripple nesting in dict path should be treated as branches')
+        self.assertEqual(traverse_obj(_TEST_DATA, {0: 'fail'}), {},
+                         msg='remove `None` values when top level dict key fails')
+        self.assertEqual(traverse_obj(_TEST_DATA, {0: 'fail'}, default=...), {0: ...},
+                         msg='use `default` if key fails and `default`')
+        self.assertEqual(traverse_obj(_TEST_DATA, {0: 'dict'}), {},
+                         msg='remove empty values when dict key')
+        self.assertEqual(traverse_obj(_TEST_DATA, {0: 'dict'}, default=...), {0: ...},
+                         msg='use `default` when dict key and `default`')
+        self.assertEqual(traverse_obj(_TEST_DATA, {0: {0: 'fail'}}), {},
+                         msg='remove empty values when nested dict key fails')
+        self.assertEqual(traverse_obj(None, {0: 'fail'}), {},
+                         msg='default to dict if pruned')
+        self.assertEqual(traverse_obj(None, {0: 'fail'}, default=...), {0: ...},
+                         msg='default to dict if pruned and default is given')
+        self.assertEqual(traverse_obj(_TEST_DATA, {0: {0: 'fail'}}, default=...), {0: {0: ...}},
+                         msg='use nested `default` when nested dict key fails and `default`')
+        self.assertEqual(traverse_obj(_TEST_DATA, {0: ('dict', ...)}), {},
+                         msg='remove key if branch in dict key not successful')
+
+        # Testing default parameter behavior
+        _DEFAULT_DATA = {'None': None, 'int': 0, 'list': []}
+        self.assertEqual(traverse_obj(_DEFAULT_DATA, 'fail'), None,
+                         msg='default value should be `None`')
+        self.assertEqual(traverse_obj(_DEFAULT_DATA, 'fail', 'fail', default=...), ...,
+                         msg='chained fails should result in default')
+        self.assertEqual(traverse_obj(_DEFAULT_DATA, 'None', 'int'), 0,
+                         msg='should not short cirquit on `None`')
+        self.assertEqual(traverse_obj(_DEFAULT_DATA, 'fail', default=1), 1,
+                         msg='invalid dict key should result in `default`')
+        self.assertEqual(traverse_obj(_DEFAULT_DATA, 'None', default=1), 1,
+                         msg='`None` is a deliberate sentinel and should become `default`')
+        self.assertEqual(traverse_obj(_DEFAULT_DATA, ('list', 10)), None,
+                         msg='`IndexError` should result in `default`')
+        self.assertEqual(traverse_obj(_DEFAULT_DATA, (..., 'fail'), default=1), 1,
+                         msg='if branched but not successful return `default` if defined, not `[]`')
+        self.assertEqual(traverse_obj(_DEFAULT_DATA, (..., 'fail'), default=None), None,
+                         msg='if branched but not successful return `default` even if `default` is `None`')
+        self.assertEqual(traverse_obj(_DEFAULT_DATA, (..., 'fail')), [],
+                         msg='if branched but not successful return `[]`, not `default`')
+        self.assertEqual(traverse_obj(_DEFAULT_DATA, ('list', ...)), [],
+                         msg='if branched but object is empty return `[]`, not `default`')
+        self.assertEqual(traverse_obj(None, ...), [],
+                         msg='if branched but object is `None` return `[]`, not `default`')
+        self.assertEqual(traverse_obj({0: None}, (0, ...)), [],
+                         msg='if branched but state is `None` return `[]`, not `default`')
+
+        branching_paths = [
+            ('fail', ...),
+            (..., 'fail'),
+            100 * ('fail',) + (...,),
+            (...,) + 100 * ('fail',),
+        ]
+        for branching_path in branching_paths:
+            self.assertEqual(traverse_obj({}, branching_path), [],
+                             msg='if branched but state is `None`, return `[]` (not `default`)')
+            self.assertEqual(traverse_obj({}, 'fail', branching_path), [],
+                             msg='if branching in last alternative and previous did not match, return `[]` (not `default`)')
+            self.assertEqual(traverse_obj({0: 'x'}, 0, branching_path), 'x',
+                             msg='if branching in last alternative and previous did match, return single value')
+            self.assertEqual(traverse_obj({0: 'x'}, branching_path, 0), 'x',
+                             msg='if branching in first alternative and non-branching path does match, return single value')
+            self.assertEqual(traverse_obj({}, branching_path, 'fail'), None,
+                             msg='if branching in first alternative and non-branching path does not match, return `default`')
+
+        # Testing expected_type behavior
+        _EXPECTED_TYPE_DATA = {'str': 'str', 'int': 0}
+        self.assertEqual(traverse_obj(_EXPECTED_TYPE_DATA, 'str', expected_type=str),
+                         'str', msg='accept matching `expected_type` type')
+        self.assertEqual(traverse_obj(_EXPECTED_TYPE_DATA, 'str', expected_type=int),
+                         None, msg='reject non matching `expected_type` type')
+        self.assertEqual(traverse_obj(_EXPECTED_TYPE_DATA, 'int', expected_type=lambda x: str(x)),
+                         '0', msg='transform type using type function')
+        self.assertEqual(traverse_obj(_EXPECTED_TYPE_DATA, 'str', expected_type=lambda _: 1 / 0),
+                         None, msg='wrap expected_type fuction in try_call')
+        self.assertEqual(traverse_obj(_EXPECTED_TYPE_DATA, ..., expected_type=str),
+                         ['str'], msg='eliminate items that expected_type fails on')
+        self.assertEqual(traverse_obj(_TEST_DATA, {0: 100, 1: 1.2}, expected_type=int),
+                         {0: 100}, msg='type as expected_type should filter dict values')
+        self.assertEqual(traverse_obj(_TEST_DATA, {0: 100, 1: 1.2, 2: 'None'}, expected_type=str_or_none),
+                         {0: '100', 1: '1.2'}, msg='function as expected_type should transform dict values')
+        self.assertEqual(traverse_obj(_TEST_DATA, ({0: 1.2}, 0, {int_or_none}), expected_type=int),
+                         1, msg='expected_type should not filter non final dict values')
+        self.assertEqual(traverse_obj(_TEST_DATA, {0: {0: 100, 1: 'str'}}, expected_type=int),
+                         {0: {0: 100}}, msg='expected_type should transform deep dict values')
+        self.assertEqual(traverse_obj(_TEST_DATA, [({0: '...'}, {0: '...'})], expected_type=type(...)),
+                         [{0: ...}, {0: ...}], msg='expected_type should transform branched dict values')
+        self.assertEqual(traverse_obj({1: {3: 4}}, [(1, 2), 3], expected_type=int),
+                         [4], msg='expected_type regression for type matching in tuple branching')
+        self.assertEqual(traverse_obj(_TEST_DATA, ['data', ...], expected_type=int),
+                         [], msg='expected_type regression for type matching in dict result')
+
+        # Test get_all behavior
+        _GET_ALL_DATA = {'key': [0, 1, 2]}
+        self.assertEqual(traverse_obj(_GET_ALL_DATA, ('key', ...), get_all=False), 0,
+                         msg='if not `get_all`, return only first matching value')
+        self.assertEqual(traverse_obj(_GET_ALL_DATA, ..., get_all=False), [0, 1, 2],
+                         msg='do not overflatten if not `get_all`')
+
+        # Test casesense behavior
+        _CASESENSE_DATA = {
+            'KeY': 'value0',
+            0: {
+                'KeY': 'value1',
+                0: {'KeY': 'value2'},
+            },
+        }
+        self.assertEqual(traverse_obj(_CASESENSE_DATA, 'key'), None,
+                         msg='dict keys should be case sensitive unless `casesense`')
+        self.assertEqual(traverse_obj(_CASESENSE_DATA, 'keY',
+                                      casesense=False), 'value0',
+                         msg='allow non matching key case if `casesense`')
+        self.assertEqual(traverse_obj(_CASESENSE_DATA, (0, ('keY',)),
+                                      casesense=False), ['value1'],
+                         msg='allow non matching key case in branch if `casesense`')
+        self.assertEqual(traverse_obj(_CASESENSE_DATA, (0, ((0, 'keY'),)),
+                                      casesense=False), ['value2'],
+                         msg='allow non matching key case in branch path if `casesense`')
+
+        # Test traverse_string behavior
+        _TRAVERSE_STRING_DATA = {'str': 'str', 1.2: 1.2}
+        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', 0)), None,
+                         msg='do not traverse into string if not `traverse_string`')
+        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', 0),
+                                      traverse_string=True), 's',
+                         msg='traverse into string if `traverse_string`')
+        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, (1.2, 1),
+                                      traverse_string=True), '.',
+                         msg='traverse into converted data if `traverse_string`')
+        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', ...),
+                                      traverse_string=True), 'str',
+                         msg='`...` should result in string (same value) if `traverse_string`')
+        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', slice(0, None, 2)),
+                                      traverse_string=True), 'sr',
+                         msg='`slice` should result in string if `traverse_string`')
+        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', lambda i, v: i or v == "s"),
+                                      traverse_string=True), 'str',
+                         msg='function should result in string if `traverse_string`')
+        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', (0, 2)),
+                                      traverse_string=True), ['s', 'r'],
+                         msg='branching should result in list if `traverse_string`')
+        self.assertEqual(traverse_obj({}, (0, ...), traverse_string=True), [],
+                         msg='branching should result in list if `traverse_string`')
+        self.assertEqual(traverse_obj({}, (0, lambda x, y: True), traverse_string=True), [],
+                         msg='branching should result in list if `traverse_string`')
+        self.assertEqual(traverse_obj({}, (0, slice(1)), traverse_string=True), [],
+                         msg='branching should result in list if `traverse_string`')
+
+        # Test re.Match as input obj
+        mobj = re.fullmatch(r'0(12)(?P<group>3)(4)?', '0123')
+        self.assertEqual(traverse_obj(mobj, ...), [x for x in mobj.groups() if x is not None],
+                         msg='`...` on a `re.Match` should give its `groups()`')
+        self.assertEqual(traverse_obj(mobj, lambda k, _: k in (0, 2)), ['0123', '3'],
+                         msg='function on a `re.Match` should give groupno, value starting at 0')
+        self.assertEqual(traverse_obj(mobj, 'group'), '3',
+                         msg='str key on a `re.Match` should give group with that name')
+        self.assertEqual(traverse_obj(mobj, 2), '3',
+                         msg='int key on a `re.Match` should give group with that name')
+        self.assertEqual(traverse_obj(mobj, 'gRoUp', casesense=False), '3',
+                         msg='str key on a `re.Match` should respect casesense')
+        self.assertEqual(traverse_obj(mobj, 'fail'), None,
+                         msg='failing str key on a `re.Match` should return `default`')
+        self.assertEqual(traverse_obj(mobj, 'gRoUpS', casesense=False), None,
+                         msg='failing str key on a `re.Match` should return `default`')
+        self.assertEqual(traverse_obj(mobj, 8), None,
+                         msg='failing int key on a `re.Match` should return `default`')
+        self.assertEqual(traverse_obj(mobj, lambda k, _: k in (0, 'group')), ['0123', '3'],
+                         msg='function on a `re.Match` should give group name as well')
+
+        # Test xml.etree.ElementTree.Element as input obj
+        etree = xml.etree.ElementTree.fromstring('''<?xml version="1.0"?>
+        <data>
+            <country name="Liechtenstein">
+                <rank>1</rank>
+                <year>2008</year>
+                <gdppc>141100</gdppc>
+                <neighbor name="Austria" direction="E"/>
+                <neighbor name="Switzerland" direction="W"/>
+            </country>
+            <country name="Singapore">
+                <rank>4</rank>
+                <year>2011</year>
+                <gdppc>59900</gdppc>
+                <neighbor name="Malaysia" direction="N"/>
+            </country>
+            <country name="Panama">
+                <rank>68</rank>
+                <year>2011</year>
+                <gdppc>13600</gdppc>
+                <neighbor name="Costa Rica" direction="W"/>
+                <neighbor name="Colombia" direction="E"/>
+            </country>
+        </data>''')
+        self.assertEqual(traverse_obj(etree, ''), etree,
+                         msg='empty str key should return the element itself')
+        self.assertEqual(traverse_obj(etree, 'country'), list(etree),
+                         msg='str key should lead all children with that tag name')
+        self.assertEqual(traverse_obj(etree, ...), list(etree),
+                         msg='`...` as key should return all children')
+        self.assertEqual(traverse_obj(etree, lambda _, x: x[0].text == '4'), [etree[1]],
+                         msg='function as key should get element as value')
+        self.assertEqual(traverse_obj(etree, lambda i, _: i == 1), [etree[1]],
+                         msg='function as key should get index as key')
+        self.assertEqual(traverse_obj(etree, 0), etree[0],
+                         msg='int key should return the nth child')
+        self.assertEqual(traverse_obj(etree, './/neighbor/@name'),
+                         ['Austria', 'Switzerland', 'Malaysia', 'Costa Rica', 'Colombia'],
+                         msg='`@<attribute>` at end of path should give that attribute')
+        self.assertEqual(traverse_obj(etree, '//neighbor/@fail'), [None, None, None, None, None],
+                         msg='`@<nonexistant>` at end of path should give `None`')
+        self.assertEqual(traverse_obj(etree, ('//neighbor/@', 2)), {'name': 'Malaysia', 'direction': 'N'},
+                         msg='`@` should give the full attribute dict')
+        self.assertEqual(traverse_obj(etree, '//year/text()'), ['2008', '2011', '2011'],
+                         msg='`text()` at end of path should give the inner text')
+        self.assertEqual(traverse_obj(etree, '//*[@direction]/@direction'), ['E', 'W', 'N', 'W', 'E'],
+                         msg='full Python xpath features should be supported')
+        self.assertEqual(traverse_obj(etree, (0, '@name')), 'Liechtenstein',
+                         msg='special transformations should act on current element')
+        self.assertEqual(traverse_obj(etree, ('country', 0, ..., 'text()', {int_or_none})), [1, 2008, 141100],
+                         msg='special transformations should act on current element')
+
     def test_http_header_dict(self):
         headers = HTTPHeaderDict()
         headers['ytdl-test'] = b'0'
         self.assertEqual(list(headers.items()), [('Ytdl-Test', '0')])
-        self.assertEqual(list(headers.sensitive().items()), [('ytdl-test', '0')])
         headers['ytdl-test'] = 1
         self.assertEqual(list(headers.items()), [('Ytdl-Test', '1')])
-        self.assertEqual(list(headers.sensitive().items()), [('ytdl-test', '1')])
         headers['Ytdl-test'] = '2'
         self.assertEqual(list(headers.items()), [('Ytdl-Test', '2')])
-        self.assertEqual(list(headers.sensitive().items()), [('Ytdl-test', '2')])
         self.assertTrue('ytDl-Test' in headers)
         self.assertEqual(str(headers), str(dict(headers)))
         self.assertEqual(repr(headers), str(dict(headers)))
 
         headers.update({'X-dlp': 'data'})
         self.assertEqual(set(headers.items()), {('Ytdl-Test', '2'), ('X-Dlp', 'data')})
-        self.assertEqual(set(headers.sensitive().items()), {('Ytdl-test', '2'), ('X-dlp', 'data')})
         self.assertEqual(dict(headers), {'Ytdl-Test': '2', 'X-Dlp': 'data'})
         self.assertEqual(len(headers), 2)
         self.assertEqual(headers.copy(), headers)
-        headers2 = HTTPHeaderDict({'X-dlp': 'data3'}, headers, **{'X-dlP': 'data2'})
+        headers2 = HTTPHeaderDict({'X-dlp': 'data3'}, **headers, **{'X-dlp': 'data2'})
         self.assertEqual(set(headers2.items()), {('Ytdl-Test', '2'), ('X-Dlp', 'data2')})
-        self.assertEqual(set(headers2.sensitive().items()), {('Ytdl-test', '2'), ('X-dlP', 'data2')})
         self.assertEqual(len(headers2), 2)
         headers2.clear()
         self.assertEqual(len(headers2), 0)
@@ -2113,23 +2418,16 @@ Line 1
         # ensure we prefer latter headers
         headers3 = HTTPHeaderDict({'Ytdl-TeSt': 1}, {'Ytdl-test': 2})
         self.assertEqual(set(headers3.items()), {('Ytdl-Test', '2')})
-        self.assertEqual(set(headers3.sensitive().items()), {('Ytdl-test', '2')})
         del headers3['ytdl-tesT']
         self.assertEqual(dict(headers3), {})
 
         headers4 = HTTPHeaderDict({'ytdl-test': 'data;'})
         self.assertEqual(set(headers4.items()), {('Ytdl-Test', 'data;')})
-        self.assertEqual(set(headers4.sensitive().items()), {('ytdl-test', 'data;')})
 
         # common mistake: strip whitespace from values
         # https://github.com/yt-dlp/yt-dlp/issues/8729
         headers5 = HTTPHeaderDict({'ytdl-test': ' data; '})
         self.assertEqual(set(headers5.items()), {('Ytdl-Test', 'data;')})
-        self.assertEqual(set(headers5.sensitive().items()), {('ytdl-test', 'data;')})
-
-        # test if picklable
-        headers6 = HTTPHeaderDict(a=1, b=2)
-        self.assertEqual(pickle.loads(pickle.dumps(headers6)), headers6)
 
     def test_extract_basic_auth(self):
         assert extract_basic_auth('http://:foo.bar') == ('http://:foo.bar', None)
@@ -2139,23 +2437,8 @@ Line 1
         assert extract_basic_auth('http://user:@foo.bar') == ('http://foo.bar', 'Basic dXNlcjo=')
         assert extract_basic_auth('http://user:pass@foo.bar') == ('http://foo.bar', 'Basic dXNlcjpwYXNz')
 
-    @unittest.skipUnless(os.name == 'nt', 'Only relevant on Windows')
-    def test_windows_escaping(self):
-        tests = [
-            'test"&',
-            '%CMDCMDLINE:~-1%&',
-            'a\nb',
-            '"',
-            '\\',
-            '!',
-            '^!',
-            'a \\ b',
-            'a \\" b',
-            'a \\ b\\',
-            # We replace \r with \n
-            ('a\r\ra', 'a\n\na'),
-        ]
-
+    @unittest.skipUnless(compat_os_name == 'nt', 'Only relevant on Windows')
+    def test_Popen_windows_escaping(self):
         def run_shell(args):
             stdout, stderr, error = Popen.run(
                 args, text=True, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -2163,21 +2446,11 @@ Line 1
             assert not error
             return stdout
 
-        for argument in tests:
-            if isinstance(argument, str):
-                expected = argument
-            else:
-                argument, expected = argument
-
-            args = [sys.executable, '-c', 'import sys; print(end=sys.argv[1])', argument, 'end']
-            assert run_shell(args) == expected
-            assert run_shell(shell_quote(args, shell=True)) == expected
-
-    def test_partial_application(self):
-        assert callable(int_or_none(scale=10)), 'missing positional parameter should apply partially'
-        assert int_or_none(10, scale=0.1) == 100, 'positionally passed argument should call function'
-        assert int_or_none(v=10) == 10, 'keyword passed positional should call function'
-        assert int_or_none(scale=0.1)(10) == 100, 'call after partial application should call the function'
+        # Test escaping
+        assert run_shell(['echo', 'test"&']) == '"test""&"\n'
+        # Test if delayed expansion is disabled
+        assert run_shell(['echo', '^!']) == '"^!"\n'
+        assert run_shell('echo "^!"') == '"^!"\n'
 
 
 if __name__ == '__main__':

test/test_websockets.py

@@ -3,12 +3,10 @@
 # Allow direct execution
 import os
 import sys
-import time
 
 import pytest
 
 from test.helper import verify_address_availability
-from yt_dlp.networking.common import Features, DEFAULT_TIMEOUT
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
@@ -20,7 +18,7 @@ import random
 import ssl
 import threading
 
-from yt_dlp import socks, traverse_obj
+from yt_dlp import socks
 from yt_dlp.cookies import YoutubeDLCookieJar
 from yt_dlp.dependencies import websockets
 from yt_dlp.networking import Request
@@ -34,6 +32,8 @@ from yt_dlp.networking.exceptions import (
 )
 from yt_dlp.utils.networking import HTTPHeaderDict
 
+from test.conftest import validate_and_send
+
 TEST_DIR = os.path.dirname(os.path.abspath(__file__))
 
 
@@ -44,7 +44,7 @@ def websocket_handler(websocket):
                 return websocket.send('2')
         elif isinstance(message, str):
             if message == 'headers':
-                return websocket.send(json.dumps(dict(websocket.request.headers.raw_items())))
+                return websocket.send(json.dumps(dict(websocket.request.headers)))
             elif message == 'path':
                 return websocket.send(websocket.request.path)
             elif message == 'source_address':
@@ -61,18 +61,12 @@ def process_request(self, request):
             return websockets.http11.Response(
                 status.value, status.phrase, websockets.datastructures.Headers([('Location', '/')]), b'')
         return self.protocol.reject(status.value, status.phrase)
-    elif request.path.startswith('/get_cookie'):
-        response = self.protocol.accept(request)
-        response.headers['Set-Cookie'] = 'test=ytdlp'
-        return response
     return self.protocol.accept(request)
 
 
 def create_websocket_server(**ws_kwargs):
     import websockets.sync.server
-    wsd = websockets.sync.server.serve(
-        websocket_handler, '127.0.0.1', 0,
-        process_request=process_request, open_timeout=2, **ws_kwargs)
+    wsd = websockets.sync.server.serve(websocket_handler, '127.0.0.1', 0, process_request=process_request, **ws_kwargs)
     ws_port = wsd.socket.getsockname()[1]
     ws_server_thread = threading.Thread(target=wsd.serve_forever)
     ws_server_thread.daemon = True
@@ -88,7 +82,7 @@ def create_wss_websocket_server():
     certfn = os.path.join(TEST_DIR, 'testcert.pem')
     sslctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
     sslctx.load_cert_chain(certfn, None)
-    return create_websocket_server(ssl=sslctx)
+    return create_websocket_server(ssl_context=sslctx)
 
 
 MTLS_CERT_DIR = os.path.join(TEST_DIR, 'testdata', 'certificate')
@@ -103,33 +97,10 @@ def create_mtls_wss_websocket_server():
     sslctx.load_verify_locations(cafile=cacertfn)
     sslctx.load_cert_chain(certfn, None)
 
-    return create_websocket_server(ssl=sslctx)
-
-
-def create_legacy_wss_websocket_server():
-    certfn = os.path.join(TEST_DIR, 'testcert.pem')
-    sslctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
-    sslctx.maximum_version = ssl.TLSVersion.TLSv1_2
-    sslctx.set_ciphers('SHA1:AESCCM:aDSS:eNULL:aNULL')
-    sslctx.load_cert_chain(certfn, None)
-    return create_websocket_server(ssl=sslctx)
-
-
-def ws_validate_and_send(rh, req):
-    rh.validate(req)
-    max_tries = 3
-    for i in range(max_tries):
-        try:
-            return rh.send(req)
-        except TransportError as e:
-            if i < (max_tries - 1) and 'connection closed during handshake' in str(e):
-                # websockets server sometimes hangs on new connections
-                continue
-            raise
+    return create_websocket_server(ssl_context=sslctx)
 
 
 @pytest.mark.skipif(not websockets, reason='websockets must be installed to test websocket request handlers')
-@pytest.mark.parametrize('handler', ['Websockets'], indirect=True)
 class TestWebsSocketRequestHandlerConformance:
     @classmethod
     def setup_class(cls):
@@ -139,18 +110,16 @@ class TestWebsSocketRequestHandlerConformance:
         cls.wss_thread, cls.wss_port = create_wss_websocket_server()
         cls.wss_base_url = f'wss://127.0.0.1:{cls.wss_port}'
 
-        cls.bad_wss_thread, cls.bad_wss_port = create_websocket_server(ssl=ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER))
+        cls.bad_wss_thread, cls.bad_wss_port = create_websocket_server(ssl_context=ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER))
         cls.bad_wss_host = f'wss://127.0.0.1:{cls.bad_wss_port}'
 
         cls.mtls_wss_thread, cls.mtls_wss_port = create_mtls_wss_websocket_server()
         cls.mtls_wss_base_url = f'wss://127.0.0.1:{cls.mtls_wss_port}'
 
-        cls.legacy_wss_thread, cls.legacy_wss_port = create_legacy_wss_websocket_server()
-        cls.legacy_wss_host = f'wss://127.0.0.1:{cls.legacy_wss_port}'
-
+    @pytest.mark.parametrize('handler', ['Websockets'], indirect=True)
     def test_basic_websockets(self, handler):
         with handler() as rh:
-            ws = ws_validate_and_send(rh, Request(self.ws_base_url))
+            ws = validate_and_send(rh, Request(self.ws_base_url))
             assert 'upgrade' in ws.headers
             assert ws.status == 101
             ws.send('foo')
@@ -159,45 +128,33 @@ class TestWebsSocketRequestHandlerConformance:
 
     # https://www.rfc-editor.org/rfc/rfc6455.html#section-5.6
     @pytest.mark.parametrize('msg,opcode', [('str', 1), (b'bytes', 2)])
+    @pytest.mark.parametrize('handler', ['Websockets'], indirect=True)
     def test_send_types(self, handler, msg, opcode):
         with handler() as rh:
-            ws = ws_validate_and_send(rh, Request(self.ws_base_url))
+            ws = validate_and_send(rh, Request(self.ws_base_url))
             ws.send(msg)
             assert int(ws.recv()) == opcode
             ws.close()
 
+    @pytest.mark.parametrize('handler', ['Websockets'], indirect=True)
     def test_verify_cert(self, handler):
         with handler() as rh:
             with pytest.raises(CertificateVerifyError):
-                ws_validate_and_send(rh, Request(self.wss_base_url))
+                validate_and_send(rh, Request(self.wss_base_url))
 
         with handler(verify=False) as rh:
-            ws = ws_validate_and_send(rh, Request(self.wss_base_url))
+            ws = validate_and_send(rh, Request(self.wss_base_url))
             assert ws.status == 101
             ws.close()
 
+    @pytest.mark.parametrize('handler', ['Websockets'], indirect=True)
     def test_ssl_error(self, handler):
         with handler(verify=False) as rh:
             with pytest.raises(SSLError, match=r'ssl(?:v3|/tls) alert handshake failure') as exc_info:
-                ws_validate_and_send(rh, Request(self.bad_wss_host))
+                validate_and_send(rh, Request(self.bad_wss_host))
             assert not issubclass(exc_info.type, CertificateVerifyError)
 
-    def test_legacy_ssl_extension(self, handler):
-        with handler(verify=False) as rh:
-            ws = ws_validate_and_send(rh, Request(self.legacy_wss_host, extensions={'legacy_ssl': True}))
-            assert ws.status == 101
-            ws.close()
-
-            # Ensure only applies to request extension
-            with pytest.raises(SSLError):
-                ws_validate_and_send(rh, Request(self.legacy_wss_host))
-
-    def test_legacy_ssl_support(self, handler):
-        with handler(verify=False, legacy_ssl_support=True) as rh:
-            ws = ws_validate_and_send(rh, Request(self.legacy_wss_host))
-            assert ws.status == 101
-            ws.close()
-
+    @pytest.mark.parametrize('handler', ['Websockets'], indirect=True)
     @pytest.mark.parametrize('path,expected', [
         # Unicode characters should be encoded with uppercase percent-encoding
         ('/中文', '/%E4%B8%AD%E6%96%87'),
@@ -206,17 +163,18 @@ class TestWebsSocketRequestHandlerConformance:
     ])
     def test_percent_encode(self, handler, path, expected):
         with handler() as rh:
-            ws = ws_validate_and_send(rh, Request(f'{self.ws_base_url}{path}'))
+            ws = validate_and_send(rh, Request(f'{self.ws_base_url}{path}'))
             ws.send('path')
             assert ws.recv() == expected
             assert ws.status == 101
             ws.close()
 
+    @pytest.mark.parametrize('handler', ['Websockets'], indirect=True)
     def test_remove_dot_segments(self, handler):
         with handler() as rh:
             # This isn't a comprehensive test,
             # but it should be enough to check whether the handler is removing dot segments
-            ws = ws_validate_and_send(rh, Request(f'{self.ws_base_url}/a/b/./../../test'))
+            ws = validate_and_send(rh, Request(f'{self.ws_base_url}/a/b/./../../test'))
             assert ws.status == 101
             ws.send('path')
             assert ws.recv() == '/test'
@@ -224,37 +182,25 @@ class TestWebsSocketRequestHandlerConformance:
 
     # We are restricted to known HTTP status codes in http.HTTPStatus
     # Redirects are not supported for websockets
+    @pytest.mark.parametrize('handler', ['Websockets'], indirect=True)
     @pytest.mark.parametrize('status', (200, 204, 301, 302, 303, 400, 500, 511))
     def test_raise_http_error(self, handler, status):
         with handler() as rh:
             with pytest.raises(HTTPError) as exc_info:
-                ws_validate_and_send(rh, Request(f'{self.ws_base_url}/gen_{status}'))
+                validate_and_send(rh, Request(f'{self.ws_base_url}/gen_{status}'))
             assert exc_info.value.status == status
 
+    @pytest.mark.parametrize('handler', ['Websockets'], indirect=True)
     @pytest.mark.parametrize('params,extensions', [
         ({'timeout': sys.float_info.min}, {}),
         ({}, {'timeout': sys.float_info.min}),
     ])
-    def test_read_timeout(self, handler, params, extensions):
+    def test_timeout(self, handler, params, extensions):
         with handler(**params) as rh:
             with pytest.raises(TransportError):
-                ws_validate_and_send(rh, Request(self.ws_base_url, extensions=extensions))
-
-    def test_connect_timeout(self, handler):
-        # nothing should be listening on this port
-        connect_timeout_url = 'ws://10.255.255.255'
-        with handler(timeout=0.01) as rh, pytest.raises(TransportError):
-            now = time.time()
-            ws_validate_and_send(rh, Request(connect_timeout_url))
-        assert time.time() - now < DEFAULT_TIMEOUT
-
-        # Per request timeout, should override handler timeout
-        request = Request(connect_timeout_url, extensions={'timeout': 0.01})
-        with handler() as rh, pytest.raises(TransportError):
-            now = time.time()
-            ws_validate_and_send(rh, request)
-        assert time.time() - now < DEFAULT_TIMEOUT
+                validate_and_send(rh, Request(self.ws_base_url, extensions=extensions))
 
+    @pytest.mark.parametrize('handler', ['Websockets'], indirect=True)
     def test_cookies(self, handler):
         cookiejar = YoutubeDLCookieJar()
         cookiejar.set_cookie(http.cookiejar.Cookie(
@@ -264,75 +210,52 @@ class TestWebsSocketRequestHandlerConformance:
             comment_url=None, rest={}))
 
         with handler(cookiejar=cookiejar) as rh:
-            ws = ws_validate_and_send(rh, Request(self.ws_base_url))
+            ws = validate_and_send(rh, Request(self.ws_base_url))
             ws.send('headers')
-            assert HTTPHeaderDict(json.loads(ws.recv()))['cookie'] == 'test=ytdlp'
+            assert json.loads(ws.recv())['cookie'] == 'test=ytdlp'
             ws.close()
 
         with handler() as rh:
-            ws = ws_validate_and_send(rh, Request(self.ws_base_url))
+            ws = validate_and_send(rh, Request(self.ws_base_url))
             ws.send('headers')
-            assert 'cookie' not in HTTPHeaderDict(json.loads(ws.recv()))
+            assert 'cookie' not in json.loads(ws.recv())
             ws.close()
 
-            ws = ws_validate_and_send(rh, Request(self.ws_base_url, extensions={'cookiejar': cookiejar}))
+            ws = validate_and_send(rh, Request(self.ws_base_url, extensions={'cookiejar': cookiejar}))
             ws.send('headers')
-            assert HTTPHeaderDict(json.loads(ws.recv()))['cookie'] == 'test=ytdlp'
-            ws.close()
-
-    @pytest.mark.skip_handler('Websockets', 'Set-Cookie not supported by websockets')
-    def test_cookie_sync_only_cookiejar(self, handler):
-        # Ensure that cookies are ONLY being handled by the cookiejar
-        with handler() as rh:
-            ws_validate_and_send(rh, Request(f'{self.ws_base_url}/get_cookie', extensions={'cookiejar': YoutubeDLCookieJar()}))
-            ws = ws_validate_and_send(rh, Request(self.ws_base_url, extensions={'cookiejar': YoutubeDLCookieJar()}))
-            ws.send('headers')
-            assert 'cookie' not in HTTPHeaderDict(json.loads(ws.recv()))
-            ws.close()
-
-    @pytest.mark.skip_handler('Websockets', 'Set-Cookie not supported by websockets')
-    def test_cookie_sync_delete_cookie(self, handler):
-        # Ensure that cookies are ONLY being handled by the cookiejar
-        cookiejar = YoutubeDLCookieJar()
-        with handler(verbose=True, cookiejar=cookiejar) as rh:
-            ws_validate_and_send(rh, Request(f'{self.ws_base_url}/get_cookie'))
-            ws = ws_validate_and_send(rh, Request(self.ws_base_url))
-            ws.send('headers')
-            assert HTTPHeaderDict(json.loads(ws.recv()))['cookie'] == 'test=ytdlp'
-            ws.close()
-            cookiejar.clear_session_cookies()
-            ws = ws_validate_and_send(rh, Request(self.ws_base_url))
-            ws.send('headers')
-            assert 'cookie' not in HTTPHeaderDict(json.loads(ws.recv()))
+            assert json.loads(ws.recv())['cookie'] == 'test=ytdlp'
             ws.close()
 
+    @pytest.mark.parametrize('handler', ['Websockets'], indirect=True)
     def test_source_address(self, handler):
         source_address = f'127.0.0.{random.randint(5, 255)}'
         verify_address_availability(source_address)
         with handler(source_address=source_address) as rh:
-            ws = ws_validate_and_send(rh, Request(self.ws_base_url))
+            ws = validate_and_send(rh, Request(self.ws_base_url))
             ws.send('source_address')
             assert source_address == ws.recv()
             ws.close()
 
+    @pytest.mark.parametrize('handler', ['Websockets'], indirect=True)
     def test_response_url(self, handler):
         with handler() as rh:
             url = f'{self.ws_base_url}/something'
-            ws = ws_validate_and_send(rh, Request(url))
+            ws = validate_and_send(rh, Request(url))
             assert ws.url == url
             ws.close()
 
+    @pytest.mark.parametrize('handler', ['Websockets'], indirect=True)
     def test_request_headers(self, handler):
         with handler(headers=HTTPHeaderDict({'test1': 'test', 'test2': 'test2'})) as rh:
             # Global Headers
-            ws = ws_validate_and_send(rh, Request(self.ws_base_url))
+            ws = validate_and_send(rh, Request(self.ws_base_url))
             ws.send('headers')
             headers = HTTPHeaderDict(json.loads(ws.recv()))
             assert headers['test1'] == 'test'
             ws.close()
 
             # Per request headers, merged with global
-            ws = ws_validate_and_send(rh, Request(
+            ws = validate_and_send(rh, Request(
                 self.ws_base_url, headers={'test2': 'changed', 'test3': 'test3'}))
             ws.send('headers')
             headers = HTTPHeaderDict(json.loads(ws.recv()))
@@ -341,14 +264,6 @@ class TestWebsSocketRequestHandlerConformance:
             assert headers['test3'] == 'test3'
             ws.close()
 
-    def test_keep_header_casing(self, handler):
-        with handler(headers=HTTPHeaderDict({'x-TeSt1': 'test'})) as rh:
-            ws = ws_validate_and_send(rh, Request(self.ws_base_url, headers={'x-TeSt2': 'test'}, extensions={'keep_header_casing': True}))
-            ws.send('headers')
-            headers = json.loads(ws.recv())
-            assert 'x-TeSt1' in headers
-            assert 'x-TeSt2' in headers
-
     @pytest.mark.parametrize('client_cert', (
         {'client_certificate': os.path.join(MTLS_CERT_DIR, 'clientwithkey.crt')},
         {
@@ -363,54 +278,17 @@ class TestWebsSocketRequestHandlerConformance:
             'client_certificate': os.path.join(MTLS_CERT_DIR, 'client.crt'),
             'client_certificate_key': os.path.join(MTLS_CERT_DIR, 'clientencrypted.key'),
             'client_certificate_password': 'foobar',
-        },
+        }
     ))
+    @pytest.mark.parametrize('handler', ['Websockets'], indirect=True)
     def test_mtls(self, handler, client_cert):
         with handler(
             # Disable client-side validation of unacceptable self-signed testcert.pem
             # The test is of a check on the server side, so unaffected
             verify=False,
-            client_cert=client_cert,
+            client_cert=client_cert
         ) as rh:
-            ws_validate_and_send(rh, Request(self.mtls_wss_base_url)).close()
-
-    def test_request_disable_proxy(self, handler):
-        for proxy_proto in handler._SUPPORTED_PROXY_SCHEMES or ['ws']:
-            # Given handler is configured with a proxy
-            with handler(proxies={'ws': f'{proxy_proto}://10.255.255.255'}, timeout=5) as rh:
-                # When a proxy is explicitly set to None for the request
-                ws = ws_validate_and_send(rh, Request(self.ws_base_url, proxies={'http': None}))
-                # Then no proxy should be used
-                assert ws.status == 101
-                ws.close()
-
-    @pytest.mark.skip_handlers_if(
-        lambda _, handler: Features.NO_PROXY not in handler._SUPPORTED_FEATURES, 'handler does not support NO_PROXY')
-    def test_noproxy(self, handler):
-        for proxy_proto in handler._SUPPORTED_PROXY_SCHEMES or ['ws']:
-            # Given the handler is configured with a proxy
-            with handler(proxies={'ws': f'{proxy_proto}://10.255.255.255'}, timeout=5) as rh:
-                for no_proxy in (f'127.0.0.1:{self.ws_port}', '127.0.0.1', 'localhost'):
-                    # When request no proxy includes the request url host
-                    ws = ws_validate_and_send(rh, Request(self.ws_base_url, proxies={'no': no_proxy}))
-                    # Then the proxy should not be used
-                    assert ws.status == 101
-                    ws.close()
-
-    @pytest.mark.skip_handlers_if(
-        lambda _, handler: Features.ALL_PROXY not in handler._SUPPORTED_FEATURES, 'handler does not support ALL_PROXY')
-    def test_allproxy(self, handler):
-        supported_proto = traverse_obj(handler._SUPPORTED_PROXY_SCHEMES, 0, default='ws')
-        # This is a bit of a hacky test, but it should be enough to check whether the handler is using the proxy.
-        # 0.1s might not be enough of a timeout if proxy is not used in all cases, but should still get failures.
-        with handler(proxies={'all': f'{supported_proto}://10.255.255.255'}, timeout=0.1) as rh:
-            with pytest.raises(TransportError):
-                ws_validate_and_send(rh, Request(self.ws_base_url)).close()
-
-        with handler(timeout=0.1) as rh:
-            with pytest.raises(TransportError):
-                ws_validate_and_send(
-                    rh, Request(self.ws_base_url, proxies={'all': f'{supported_proto}://10.255.255.255'})).close()
+            validate_and_send(rh, Request(self.mtls_wss_base_url)).close()
 
 
 def create_fake_ws_connection(raised):

test/test_youtube_misc.py

@@ -13,7 +13,7 @@ from yt_dlp.extractor import YoutubeIE
 
 class TestYoutubeMisc(unittest.TestCase):
     def test_youtube_extract(self):
-        assertExtractId = lambda url, video_id: self.assertEqual(YoutubeIE.extract_id(url), video_id)
+        assertExtractId = lambda url, id: self.assertEqual(YoutubeIE.extract_id(url), id)
         assertExtractId('http://www.youtube.com/watch?&v=BaW_jenozKc', 'BaW_jenozKc')
         assertExtractId('https://www.youtube.com/watch?&v=BaW_jenozKc', 'BaW_jenozKc')
         assertExtractId('https://www.youtube.com/watch?feature=player_embedded&v=BaW_jenozKc', 'BaW_jenozKc')

test/test_youtube_signature.py

@@ -46,17 +46,17 @@ _SIG_TESTS = [
     (
         'https://s.ytimg.com/yts/jsbin/html5player-en_US-vflBb0OQx.js',
         84,
-        '123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQ0STUVWXYZ!"#$%&\'()*+,@./:;<=>',
+        '123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQ0STUVWXYZ!"#$%&\'()*+,@./:;<=>'
     ),
     (
         'https://s.ytimg.com/yts/jsbin/html5player-en_US-vfl9FYC6l.js',
         83,
-        '123456789abcdefghijklmnopqr0tuvwxyzABCDETGHIJKLMNOPQRS>UVWXYZ!"#$%&\'()*+,-./:;<=F',
+        '123456789abcdefghijklmnopqr0tuvwxyzABCDETGHIJKLMNOPQRS>UVWXYZ!"#$%&\'()*+,-./:;<=F'
     ),
     (
         'https://s.ytimg.com/yts/jsbin/html5player-en_US-vflCGk6yw/html5player.js',
         '4646B5181C6C3020DF1D9C7FCFEA.AD80ABF70C39BD369CCCAE780AFBB98FA6B6CB42766249D9488C288',
-        '82C8849D94266724DC6B6AF89BBFA087EACCD963.B93C07FBA084ACAEFCF7C9D1FD0203C6C1815B6B',
+        '82C8849D94266724DC6B6AF89BBFA087EACCD963.B93C07FBA084ACAEFCF7C9D1FD0203C6C1815B6B'
     ),
     (
         'https://s.ytimg.com/yts/jsbin/html5player-en_US-vflKjOTVq/html5player.js',
@@ -68,76 +68,6 @@ _SIG_TESTS = [
         '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
         'AOq0QJ8wRAIgXmPlOPSBkkUs1bYFYlJCfe29xx8j7v1pDL2QwbdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_EMu-m37KtXJoOySqa0',
     ),
-    (
-        'https://www.youtube.com/s/player/3bb1f723/player_ias.vflset/en_US/base.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        'MyOSJXtKI3m-uME_jv7-pT12gOFC02RFkGoqWpzE0Cs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-    ),
-    (
-        'https://www.youtube.com/s/player/2f1832d2/player_ias.vflset/en_US/base.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        '0QJ8wRAIgXmPlOPSBkkUs1bYFYlJCfe29xxAj7v1pDL0QwbdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_EMu-m37KtXJ2OySqa0q',
-    ),
-    (
-        'https://www.youtube.com/s/player/643afba4/tv-player-ias.vflset/tv-player-ias.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        'AAOAOq0QJ8wRAIgXmPlOPSBkkUs1bYFYlJCfe29xx8j7vgpDL0QwbdV06sCIEzpWqMGkFR20CFOS21Tp-7vj_EMu-m37KtXJoOy1',
-    ),
-    (
-        'https://www.youtube.com/s/player/363db69b/player_ias.vflset/en_US/base.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        '0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpz2ICs6EVdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-    ),
-    (
-        'https://www.youtube.com/s/player/363db69b/player_ias_tce.vflset/en_US/base.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        '0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpz2ICs6EVdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-    ),
-    (
-        'https://www.youtube.com/s/player/4fcd6e4a/player_ias.vflset/en_US/base.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        'wAOAOq0QJ8ARAIgXmPlOPSBkkUs1bYFYlJCfe29xx8q7v1pDL0QwbdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_EMu-m37KtXJoOySqa0',
-    ),
-    (
-        'https://www.youtube.com/s/player/4fcd6e4a/player_ias_tce.vflset/en_US/base.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        'wAOAOq0QJ8ARAIgXmPlOPSBkkUs1bYFYlJCfe29xx8q7v1pDL0QwbdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_EMu-m37KtXJoOySqa0',
-    ),
-    (
-        'https://www.youtube.com/s/player/20830619/player_ias.vflset/en_US/base.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        '7AOq0QJ8wRAIgXmPlOPSBkkAs1bYFYlJCfe29xx8jOv1pDL0Q2bdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_EMu-m37KtXJoOySqa0qaw',
-    ),
-    (
-        'https://www.youtube.com/s/player/20830619/player_ias_tce.vflset/en_US/base.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        '7AOq0QJ8wRAIgXmPlOPSBkkAs1bYFYlJCfe29xx8jOv1pDL0Q2bdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_EMu-m37KtXJoOySqa0qaw',
-    ),
-    (
-        'https://www.youtube.com/s/player/20830619/player-plasma-ias-phone-en_US.vflset/base.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        '7AOq0QJ8wRAIgXmPlOPSBkkAs1bYFYlJCfe29xx8jOv1pDL0Q2bdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_EMu-m37KtXJoOySqa0qaw',
-    ),
-    (
-        'https://www.youtube.com/s/player/20830619/player-plasma-ias-tablet-en_US.vflset/base.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        '7AOq0QJ8wRAIgXmPlOPSBkkAs1bYFYlJCfe29xx8jOv1pDL0Q2bdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_EMu-m37KtXJoOySqa0qaw',
-    ),
-    (
-        'https://www.youtube.com/s/player/8a8ac953/player_ias_tce.vflset/en_US/base.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        'IAOAOq0QJ8wRAAgXmPlOPSBkkUs1bYFYlJCfe29xx8j7v1pDL0QwbdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_E2u-m37KtXJoOySqa0',
-    ),
-    (
-        'https://www.youtube.com/s/player/8a8ac953/tv-player-es6.vflset/tv-player-es6.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        'IAOAOq0QJ8wRAAgXmPlOPSBkkUs1bYFYlJCfe29xx8j7v1pDL0QwbdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_E2u-m37KtXJoOySqa0',
-    ),
-    (
-        'https://www.youtube.com/s/player/e12fbea4/player_ias.vflset/en_US/base.js',
-        'gN7a-hudCuAuPH6fByOk1_GNXN0yNMHShjZXS2VOgsEItAJz0tipeavEOmNdYN-wUtcEqD3bCXjc0iyKfAyZxCBGgIARwsSdQfJ2CJtt',
-        'JC2JfQdSswRAIgGBCxZyAfKyi0cjXCb3DqEctUw-NYdNmOEvaepit0zJAtIEsgOV2SXZjhSHMNy0NXNG_1kOyBf6HPuAuCduh-a',
-    ),
 ]
 
 _NSIG_TESTS = [
@@ -233,106 +163,6 @@ _NSIG_TESTS = [
         'https://www.youtube.com/s/player/b7910ca8/player_ias.vflset/en_US/base.js',
         '_hXMCwMt9qE310D', 'LoZMgkkofRMCZQ',
     ),
-    (
-        'https://www.youtube.com/s/player/590f65a6/player_ias.vflset/en_US/base.js',
-        '1tm7-g_A9zsI8_Lay_', 'xI4Vem4Put_rOg',
-    ),
-    (
-        'https://www.youtube.com/s/player/b22ef6e7/player_ias.vflset/en_US/base.js',
-        'b6HcntHGkvBLk_FRf', 'kNPW6A7FyP2l8A',
-    ),
-    (
-        'https://www.youtube.com/s/player/3400486c/player_ias.vflset/en_US/base.js',
-        'lL46g3XifCKUZn1Xfw', 'z767lhet6V2Skl',
-    ),
-    (
-        'https://www.youtube.com/s/player/20dfca59/player_ias.vflset/en_US/base.js',
-        '-fLCxedkAk4LUTK2', 'O8kfRq1y1eyHGw',
-    ),
-    (
-        'https://www.youtube.com/s/player/b12cc44b/player_ias.vflset/en_US/base.js',
-        'keLa5R2U00sR9SQK', 'N1OGyujjEwMnLw',
-    ),
-    (
-        'https://www.youtube.com/s/player/3bb1f723/player_ias.vflset/en_US/base.js',
-        'gK15nzVyaXE9RsMP3z', 'ZFFWFLPWx9DEgQ',
-    ),
-    (
-        'https://www.youtube.com/s/player/2f1832d2/player_ias.vflset/en_US/base.js',
-        'YWt1qdbe8SAfkoPHW5d', 'RrRjWQOJmBiP',
-    ),
-    (
-        'https://www.youtube.com/s/player/9c6dfc4a/player_ias.vflset/en_US/base.js',
-        'jbu7ylIosQHyJyJV', 'uwI0ESiynAmhNg',
-    ),
-    (
-        'https://www.youtube.com/s/player/e7567ecf/player_ias_tce.vflset/en_US/base.js',
-        'Sy4aDGc0VpYRR9ew_', '5UPOT1VhoZxNLQ',
-    ),
-    (
-        'https://www.youtube.com/s/player/d50f54ef/player_ias_tce.vflset/en_US/base.js',
-        'Ha7507LzRmH3Utygtj', 'XFTb2HoeOE5MHg',
-    ),
-    (
-        'https://www.youtube.com/s/player/074a8365/player_ias_tce.vflset/en_US/base.js',
-        'Ha7507LzRmH3Utygtj', 'ufTsrE0IVYrkl8v',
-    ),
-    (
-        'https://www.youtube.com/s/player/643afba4/player_ias.vflset/en_US/base.js',
-        'N5uAlLqm0eg1GyHO', 'dCBQOejdq5s-ww',
-    ),
-    (
-        'https://www.youtube.com/s/player/69f581a5/tv-player-ias.vflset/tv-player-ias.js',
-        '-qIP447rVlTTwaZjY', 'KNcGOksBAvwqQg',
-    ),
-    (
-        'https://www.youtube.com/s/player/643afba4/tv-player-ias.vflset/tv-player-ias.js',
-        'ir9-V6cdbCiyKxhr', '2PL7ZDYAALMfmA',
-    ),
-    (
-        'https://www.youtube.com/s/player/363db69b/player_ias.vflset/en_US/base.js',
-        'eWYu5d5YeY_4LyEDc', 'XJQqf-N7Xra3gg',
-    ),
-    (
-        'https://www.youtube.com/s/player/4fcd6e4a/player_ias.vflset/en_US/base.js',
-        'o_L251jm8yhZkWtBW', 'lXoxI3XvToqn6A',
-    ),
-    (
-        'https://www.youtube.com/s/player/4fcd6e4a/player_ias_tce.vflset/en_US/base.js',
-        'o_L251jm8yhZkWtBW', 'lXoxI3XvToqn6A',
-    ),
-    (
-        'https://www.youtube.com/s/player/20830619/tv-player-ias.vflset/tv-player-ias.js',
-        'ir9-V6cdbCiyKxhr', '9YE85kNjZiS4',
-    ),
-    (
-        'https://www.youtube.com/s/player/20830619/player-plasma-ias-phone-en_US.vflset/base.js',
-        'ir9-V6cdbCiyKxhr', '9YE85kNjZiS4',
-    ),
-    (
-        'https://www.youtube.com/s/player/20830619/player-plasma-ias-tablet-en_US.vflset/base.js',
-        'ir9-V6cdbCiyKxhr', '9YE85kNjZiS4',
-    ),
-    (
-        'https://www.youtube.com/s/player/8a8ac953/player_ias_tce.vflset/en_US/base.js',
-        'MiBYeXx_vRREbiCCmh', 'RtZYMVvmkE0JE',
-    ),
-    (
-        'https://www.youtube.com/s/player/8a8ac953/tv-player-es6.vflset/tv-player-es6.js',
-        'MiBYeXx_vRREbiCCmh', 'RtZYMVvmkE0JE',
-    ),
-    (
-        'https://www.youtube.com/s/player/59b252b9/player_ias.vflset/en_US/base.js',
-        'D3XWVpYgwhLLKNK4AGX', 'aZrQ1qWJ5yv5h',
-    ),
-    (
-        'https://www.youtube.com/s/player/fc2a56a5/player_ias.vflset/en_US/base.js',
-        'qTKWg_Il804jd2kAC', 'OtUAm2W6gyzJjB9u',
-    ),
-    (
-        'https://www.youtube.com/s/player/fc2a56a5/tv-player-ias.vflset/tv-player-ias.js',
-        'qTKWg_Il804jd2kAC', 'OtUAm2W6gyzJjB9u',
-    ),
 ]
 
 
@@ -346,8 +176,6 @@ class TestPlayerInfo(unittest.TestCase):
             ('https://www.youtube.com/s/player/64dddad9/player-plasma-ias-phone-en_US.vflset/base.js', '64dddad9'),
             ('https://www.youtube.com/s/player/64dddad9/player-plasma-ias-phone-de_DE.vflset/base.js', '64dddad9'),
             ('https://www.youtube.com/s/player/64dddad9/player-plasma-ias-tablet-en_US.vflset/base.js', '64dddad9'),
-            ('https://www.youtube.com/s/player/e7567ecf/player_ias_tce.vflset/en_US/base.js', 'e7567ecf'),
-            ('https://www.youtube.com/s/player/643afba4/tv-player-ias.vflset/tv-player-ias.js', '643afba4'),
             # obsolete
             ('https://www.youtube.com/yts/jsbin/player_ias-vfle4-e03/en_US/base.js', 'vfle4-e03'),
             ('https://www.youtube.com/yts/jsbin/player_ias-vfl49f_g4/en_US/base.js', 'vfl49f_g4'),
@@ -379,52 +207,44 @@ class TestSignature(unittest.TestCase):
 def t_factory(name, sig_func, url_pattern):
     def make_tfunc(url, sig_input, expected_sig):
         m = url_pattern.match(url)
-        assert m, f'{url!r} should follow URL format'
-        test_id = re.sub(r'[/.-]', '_', m.group('id') or m.group('compat_id'))
+        assert m, '%r should follow URL format' % url
+        test_id = m.group('id')
 
         def test_func(self):
-            basename = f'player-{test_id}.js'
+            basename = f'player-{name}-{test_id}.js'
             fn = os.path.join(self.TESTDATA_DIR, basename)
 
             if not os.path.exists(fn):
                 urllib.request.urlretrieve(url, fn)
             with open(fn, encoding='utf-8') as testf:
                 jscode = testf.read()
-            self.assertEqual(sig_func(jscode, sig_input, url), expected_sig)
+            self.assertEqual(sig_func(jscode, sig_input), expected_sig)
 
         test_func.__name__ = f'test_{name}_js_{test_id}'
         setattr(TestSignature, test_func.__name__, test_func)
     return make_tfunc
 
 
-def signature(jscode, sig_input, player_url):
-    func = YoutubeIE(FakeYDL())._parse_sig_js(jscode, player_url)
+def signature(jscode, sig_input):
+    func = YoutubeIE(FakeYDL())._parse_sig_js(jscode)
     src_sig = (
         str(string.printable[:sig_input])
         if isinstance(sig_input, int) else sig_input)
     return func(src_sig)
 
 
-def n_sig(jscode, sig_input, player_url):
-    ie = YoutubeIE(FakeYDL())
-    funcname = ie._extract_n_function_name(jscode, player_url=player_url)
-    jsi = JSInterpreter(jscode)
-    func = jsi.extract_function_from_code(*ie._fixup_n_function_code(*jsi.extract_function_code(funcname), jscode, player_url))
-    return func([sig_input])
+def n_sig(jscode, sig_input):
+    funcname = YoutubeIE(FakeYDL())._extract_n_function_name(jscode)
+    return JSInterpreter(jscode).call_function(funcname, sig_input)
 
 
 make_sig_test = t_factory(
-    'signature', signature,
-    re.compile(r'''(?x)
-        .+(?:
-            /player/(?P<id>[a-zA-Z0-9_/.-]+)|
-            /html5player-(?:en_US-)?(?P<compat_id>[a-zA-Z0-9_-]+)(?:/watch_as3|/html5player)?
-        )\.js$'''))
+    'signature', signature, re.compile(r'.*(?:-|/player/)(?P<id>[a-zA-Z0-9_-]+)(?:/.+\.js|(?:/watch_as3|/html5player)?\.[a-z]+)$'))
 for test_spec in _SIG_TESTS:
     make_sig_test(*test_spec)
 
 make_nsig_test = t_factory(
-    'nsig', n_sig, re.compile(r'.+/player/(?P<id>[a-zA-Z0-9_/.-]+)\.js$'))
+    'nsig', n_sig, re.compile(r'.+/player/(?P<id>[a-zA-Z0-9_-]+)/.+.js$'))
 for test_spec in _NSIG_TESTS:
     make_nsig_test(*test_spec)
 

test/testdata/netrc/netrc

@@ -1,4 +0,0 @@
-machine normal_use login user password pass
-machine empty_user login "" password pass
-machine empty_pass login user password ""
-machine both_empty login "" password ""