Release 2021.03.03

.gitattributes

@@ -1,4 +1 @@
-* text=auto
-
 Makefile* text whitespace=-tab-in-indent
-*.sh text eol=lf

.github/FUNDING.yml

@@ -1,13 +0,0 @@
-# These are supported funding model platforms
-
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: # Replace with a single Patreon username
-open_collective: # Replace with a single Open Collective username
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-
-custom: ['https://github.com/yt-dlp/yt-dlp/blob/master/Collaborators.md#collaborators']

.github/ISSUE_TEMPLATE/1_broken_site.md

@@ -21,7 +21,7 @@ ## Checklist
 
 <!--
 Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
-- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.08.10. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.03.01. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
 - Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
 - Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in https://github.com/yt-dlp/yt-dlp.
 - Search the bugtracker for similar issues: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
@@ -29,7 +29,7 @@ ## Checklist
 -->
 
 - [ ] I'm reporting a broken site support
-- [ ] I've verified that I'm running yt-dlp version **2021.08.10**
+- [ ] I've verified that I'm running yt-dlp version **2021.03.01**
 - [ ] I've checked that all provided URLs are alive and playable in a browser
 - [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped
 - [ ] I've searched the bugtracker for similar issues including closed ones
@@ -42,9 +42,9 @@ ## Verbose log
 Add the `-v` flag to your command line you run yt-dlp with (`yt-dlp -v <your command line>`), copy the WHOLE output and insert it below. It should look similar to this:
  [debug] System config: []
  [debug] User config: []
- [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKc']
+ [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']
  [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251
- [debug] yt-dlp version 2021.08.10
+ [debug] yt-dlp version 2021.03.01
  [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2
  [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4
  [debug] Proxy map: {}

.github/ISSUE_TEMPLATE/2_site_support_request.md

@@ -21,7 +21,7 @@ ## Checklist
 
 <!--
 Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
-- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.08.10. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.03.01. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
 - Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
 - Make sure that site you are requesting is not dedicated to copyright infringement, see https://github.com/yt-dlp/yt-dlp. yt-dlp does not support such sites. In order for site support request to be accepted all provided example URLs should not violate any copyrights.
 - Search the bugtracker for similar site support requests: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
@@ -29,10 +29,9 @@ ## Checklist
 -->
 
 - [ ] I'm reporting a new site support request
-- [ ] I've verified that I'm running yt-dlp version **2021.08.10**
+- [ ] I've verified that I'm running yt-dlp version **2021.03.01**
 - [ ] I've checked that all provided URLs are alive and playable in a browser
 - [ ] I've checked that none of provided URLs violate any copyrights
-- [ ] The provided URLs do not contain any DRM to the best of my knowledge
 - [ ] I've searched the bugtracker for similar site support requests including closed ones
 
 

.github/ISSUE_TEMPLATE/3_site_feature_request.md

@@ -21,13 +21,13 @@ ## Checklist
 
 <!--
 Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
-- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.08.10. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.03.01. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
 - Search the bugtracker for similar site feature requests: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
 - Finally, put x into all relevant boxes like this [x] (Dont forget to delete the empty space)
 -->
 
 - [ ] I'm reporting a site feature request
-- [ ] I've verified that I'm running yt-dlp version **2021.08.10**
+- [ ] I've verified that I'm running yt-dlp version **2021.03.01**
 - [ ] I've searched the bugtracker for similar site feature requests including closed ones
 
 

.github/ISSUE_TEMPLATE/4_bug_report.md

@@ -21,7 +21,7 @@ ## Checklist
 
 <!--
 Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
-- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.08.10. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.03.01. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
 - Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
 - Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in https://github.com/yt-dlp/yt-dlp.
 - Search the bugtracker for similar issues: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
@@ -29,10 +29,9 @@ ## Checklist
 - Finally, put x into all relevant boxes like this [x] (Dont forget to delete the empty space)
 -->
 
-- [ ] I'm reporting a bug unrelated to a specific site
+- [ ] I'm reporting a broken site support issue
-- [ ] I've verified that I'm running yt-dlp version **2021.08.10**
+- [ ] I've verified that I'm running yt-dlp version **2021.03.01**
 - [ ] I've checked that all provided URLs are alive and playable in a browser
-- [ ] The provided URLs do not contain any DRM to the best of my knowledge
 - [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped
 - [ ] I've searched the bugtracker for similar bug reports including closed ones
 - [ ] I've read bugs section in FAQ
@@ -45,9 +44,9 @@ ## Verbose log
 Add the `-v` flag to your command line you run yt-dlp with (`yt-dlp -v <your command line>`), copy the WHOLE output and insert it below. It should look similar to this:
  [debug] System config: []
  [debug] User config: []
- [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKc']
+ [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']
  [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251
- [debug] yt-dlp version 2021.08.10
+ [debug] yt-dlp version 2021.03.01
  [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2
  [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4
  [debug] Proxy map: {}

.github/ISSUE_TEMPLATE/5_feature_request.md

@@ -21,13 +21,13 @@ ## Checklist
 
 <!--
 Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
-- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.08.10. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.03.01. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
 - Search the bugtracker for similar feature requests: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
 - Finally, put x into all relevant boxes like this [x] (Dont forget to delete the empty space)
 -->
 
 - [ ] I'm reporting a feature request
-- [ ] I've verified that I'm running yt-dlp version **2021.08.10**
+- [ ] I've verified that I'm running yt-dlp version **2021.03.01**
 - [ ] I've searched the bugtracker for similar feature requests including closed ones
 
 

.github/ISSUE_TEMPLATE/6_question.md

@@ -1,6 +1,6 @@
 ---
 name: Ask question
-about: Ask yt-dlp related question
+about: Ask youtube-dl related question
 title: "[Question]"
 labels: question
 assignees: ''

.github/ISSUE_TEMPLATE_tmpl/1_broken_site.md

@@ -42,7 +42,7 @@ ## Verbose log
 Add the `-v` flag to your command line you run yt-dlp with (`yt-dlp -v <your command line>`), copy the WHOLE output and insert it below. It should look similar to this:
  [debug] System config: []
  [debug] User config: []
- [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKc']
+ [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']
  [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251
  [debug] yt-dlp version %(version)s
  [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2

.github/ISSUE_TEMPLATE_tmpl/2_site_support_request.md

@@ -32,7 +32,6 @@ ## Checklist
 - [ ] I've verified that I'm running yt-dlp version **%(version)s**
 - [ ] I've checked that all provided URLs are alive and playable in a browser
 - [ ] I've checked that none of provided URLs violate any copyrights
-- [ ] The provided URLs do not contain any DRM to the best of my knowledge
 - [ ] I've searched the bugtracker for similar site support requests including closed ones
 
 

.github/ISSUE_TEMPLATE_tmpl/4_bug_report.md

@@ -29,10 +29,9 @@ ## Checklist
 - Finally, put x into all relevant boxes like this [x] (Dont forget to delete the empty space)
 -->
 
-- [ ] I'm reporting a bug unrelated to a specific site
+- [ ] I'm reporting a broken site support issue
 - [ ] I've verified that I'm running yt-dlp version **%(version)s**
 - [ ] I've checked that all provided URLs are alive and playable in a browser
-- [ ] The provided URLs do not contain any DRM to the best of my knowledge
 - [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped
 - [ ] I've searched the bugtracker for similar bug reports including closed ones
 - [ ] I've read bugs section in FAQ
@@ -45,7 +44,7 @@ ## Verbose log
 Add the `-v` flag to your command line you run yt-dlp with (`yt-dlp -v <your command line>`), copy the WHOLE output and insert it below. It should look similar to this:
  [debug] System config: []
  [debug] User config: []
- [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKc']
+ [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']
  [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251
  [debug] yt-dlp version %(version)s
  [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2

.github/PULL_REQUEST_TEMPLATE.md

@@ -11,7 +11,7 @@ ### Before submitting a *pull request* make sure you have:
 - [ ] [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)
 
-### 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 one of the following options:
+### In order to be accepted and merged into youtube-dl each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check one of the following options:
 - [ ] 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)
 

.github/workflows/build.yml

@@ -7,13 +7,13 @@ on:
 
 jobs:
   build_unix:
+
     runs-on: ubuntu-latest
 
     outputs:
       ytdlp_version: ${{ steps.bump_version.outputs.ytdlp_version }}
       upload_url: ${{ steps.create_release.outputs.upload_url }}
-      sha256_unix: ${{ steps.sha256_file.outputs.sha256_unix }}
+      sha2_unix: ${{ steps.sha2_file.outputs.sha2_unix }}
-      sha512_unix: ${{ steps.sha512_file.outputs.sha512_unix }}
 
     steps:
     - uses: actions/checkout@v2
@@ -29,7 +29,7 @@ jobs:
     - name: Print version
       run: echo "${{ steps.bump_version.outputs.ytdlp_version }}"
     - name: Run Make
-      run: make all tar
+      run: make yt-dlp
     - name: Create Release
       id: create_release
       uses: actions/create-release@v1
@@ -53,21 +53,9 @@ jobs:
         asset_path: ./yt-dlp
         asset_name: yt-dlp
         asset_content_type: application/octet-stream
-    - name: Upload Source tar
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./yt-dlp.tar.gz
-        asset_name: yt-dlp.tar.gz
-        asset_content_type: application/gzip
     - name: Get SHA2-256SUMS for yt-dlp
-      id: sha256_file
+      id: sha2_file
-      run: echo "::set-output name=sha256_unix::$(sha256sum yt-dlp | awk '{print $1}')"
+      run: echo "::set-output name=sha2_unix::$(sha256sum yt-dlp | awk '{print $1}')"
-    - name: Get SHA2-512SUMS for yt-dlp
-      id: sha512_file
-      run: echo "::set-output name=sha512_unix::$(sha512sum yt-dlp | awk '{print $1}')"
     - name: Install dependencies for pypi
       env:
         PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
@@ -86,25 +74,24 @@ jobs:
         twine upload dist/*
 
   build_windows:
+
     runs-on: windows-latest
-    needs: build_unix
 
     outputs:
-      sha256_windows: ${{ steps.sha256_file_win.outputs.sha256_windows }}
+      sha2_windows: ${{ steps.sha2_file_win.outputs.sha2_windows }}
-      sha512_windows: ${{ steps.sha512_file_win.outputs.sha512_windows }}
+
+    needs: build_unix
 
     steps:
     - uses: actions/checkout@v2
-    # 3.8 is used for Win7 support
+    - name: Set up Python
-    - name: Set up Python 3.8
       uses: actions/setup-python@v2
       with:
           python-version: '3.8'
     - name: Upgrade pip and enable wheel support
       run: python -m pip install --upgrade pip setuptools wheel
     - name: Install Requirements
-      # Custom pyinstaller built with https://github.com/yt-dlp/pyinstaller-builds
+      run: pip install pyinstaller mutagen pycryptodome
-      run: pip install "https://yt-dlp.github.io/pyinstaller-builds/x86_64/pyinstaller-4.5.1-py3-none-any.whl" mutagen pycryptodome websockets
     - name: Bump version
       id: bump_version
       run: python devscripts/update-version.py
@@ -123,32 +110,29 @@ jobs:
         asset_name: yt-dlp.exe
         asset_content_type: application/vnd.microsoft.portable-executable
     - name: Get SHA2-256SUMS for yt-dlp.exe
-      id: sha256_file_win
+      id: sha2_file_win
-      run: echo "::set-output name=sha256_windows::$((Get-FileHash dist\yt-dlp.exe -Algorithm SHA256).Hash.ToLower())"
+      run: echo "::set-output name=sha2_windows::$((Get-FileHash dist\yt-dlp.exe -Algorithm SHA256).Hash.ToLower())"
-    - name: Get SHA2-512SUMS for yt-dlp.exe
-      id: sha512_file_win
-      run: echo "::set-output name=sha512_windows::$((Get-FileHash dist\yt-dlp.exe -Algorithm SHA512).Hash.ToLower())"
 
   build_windows32:
+
     runs-on: windows-latest
-    needs: [build_unix, build_windows]
 
     outputs:
-      sha256_windows32: ${{ steps.sha256_file_win32.outputs.sha256_windows32 }}
+      sha2_windows32: ${{ steps.sha2_file_win32.outputs.sha2_windows32 }}
-      sha512_windows32: ${{ steps.sha512_file_win32.outputs.sha512_windows32 }}
+
+    needs: [build_unix, build_windows]
 
     steps:
     - uses: actions/checkout@v2
-    # 3.7 is used for Vista support. See https://github.com/yt-dlp/yt-dlp/issues/390
+    - name: Set up Python 3.4.4 32-Bit
-    - name: Set up Python 3.7 32-Bit
       uses: actions/setup-python@v2
       with:
-          python-version: '3.7'
+          python-version: '3.4.4'
           architecture: 'x86'
     - name: Upgrade pip and enable wheel support
-      run: python -m pip install --upgrade pip setuptools wheel
+      run: python -m pip install pip==19.1.1 setuptools==43.0.0 wheel==0.33.6
-    - name: Install Requirements
+    - name: Install Requirements for 32 Bit
-      run: pip install "https://yt-dlp.github.io/pyinstaller-builds/i686/pyinstaller-4.5.1-py3-none-any.whl" mutagen pycryptodome websockets
+      run: pip install pyinstaller==3.5 mutagen==1.42.0 pycryptodome==3.9.4
     - name: Bump version
       id: bump_version
       run: python devscripts/update-version.py
@@ -167,28 +151,20 @@ jobs:
         asset_name: yt-dlp_x86.exe
         asset_content_type: application/vnd.microsoft.portable-executable
     - name: Get SHA2-256SUMS for yt-dlp_x86.exe
-      id: sha256_file_win32
+      id: sha2_file_win32
-      run: echo "::set-output name=sha256_windows32::$((Get-FileHash dist\yt-dlp_x86.exe -Algorithm SHA256).Hash.ToLower())"
+      run: echo "::set-output name=sha2_windows32::$((Get-FileHash dist\yt-dlp_x86.exe -Algorithm SHA256).Hash.ToLower())"
-    - name: Get SHA2-512SUMS for yt-dlp_x86.exe
-      id: sha512_file_win32
-      run: echo "::set-output name=sha512_windows32::$((Get-FileHash dist\yt-dlp_x86.exe -Algorithm SHA512).Hash.ToLower())"
-
-  finish:
-    runs-on: ubuntu-latest
-    needs: [build_unix, build_windows, build_windows32]
-
-    steps:
     - name: Make SHA2-256SUMS file
       env:
-        SHA256_WINDOWS: ${{ needs.build_windows.outputs.sha256_windows }}
+        SHA2_WINDOWS: ${{ needs.build_windows.outputs.sha2_windows }}
-        SHA256_WINDOWS32: ${{ needs.build_windows32.outputs.sha256_windows32 }}
+        SHA2_WINDOWS32: ${{ steps.sha2_file_win32.outputs.sha2_windows32 }}
-        SHA256_UNIX: ${{ needs.build_unix.outputs.sha256_unix }}
+        SHA2_UNIX: ${{ needs.build_unix.outputs.sha2_unix }}
         YTDLP_VERSION: ${{ needs.build_unix.outputs.ytdlp_version }}
       run: |
-        echo "version:${{ env.YTDLP_VERSION }}" >> SHA2-256SUMS
+        echo "version:${env:YTDLP_VERSION}" >> SHA2-256SUMS
-        echo "yt-dlp.exe:${{ env.SHA256_WINDOWS }}" >> SHA2-256SUMS
+        echo "yt-dlp.exe:${env:SHA2_WINDOWS}" >> SHA2-256SUMS
-        echo "yt-dlp_x86.exe:${{ env.SHA256_WINDOWS32 }}" >> SHA2-256SUMS
+        echo "yt-dlp_x86.exe:${env:SHA2_WINDOWS32}" >> SHA2-256SUMS
-        echo "yt-dlp:${{ env.SHA256_UNIX }}" >> SHA2-256SUMS
+        echo "yt-dlp:${env:SHA2_UNIX}" >> SHA2-256SUMS
+
     - name: Upload 256SUMS file
       id: upload-sums
       uses: actions/upload-release-asset@v1
@@ -199,22 +175,3 @@ jobs:
         asset_path: ./SHA2-256SUMS
         asset_name: SHA2-256SUMS
         asset_content_type: text/plain
-    - name: Make SHA2-512SUMS file
-      env:
-        SHA512_WINDOWS: ${{ needs.build_windows.outputs.sha512_windows }}
-        SHA512_WINDOWS32: ${{ needs.build_windows32.outputs.sha512_windows32 }}
-        SHA512_UNIX: ${{ needs.build_unix.outputs.sha512_unix }}
-      run: |
-        echo "${{ env.SHA512_WINDOWS }}  yt-dlp.exe" >> SHA2-512SUMS
-        echo "${{ env.SHA512_WINDOWS32 }}  yt-dlp_x86.exe" >> SHA2-512SUMS
-        echo "${{ env.SHA512_UNIX }}  yt-dlp" >> SHA2-512SUMS
-    - name: Upload 512SUMS file
-      id: upload-512sums
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ needs.build_unix.outputs.upload_url }}
-        asset_path: ./SHA2-512SUMS
-        asset_name: SHA2-512SUMS
-        asset_content_type: text/plain

.github/workflows/core.yml

@@ -6,26 +6,49 @@ jobs:
     if: "!contains(github.event.head_commit.message, 'ci skip')"
     runs-on: ${{ matrix.os }}
     strategy:
-      fail-fast: false
+      fail-fast: true
       matrix:
         os: [ubuntu-18.04]
-        # py3.9 is in quick-test
+        # TODO: python 2.6
-        python-version: [3.7, 3.8, 3.10-dev, pypy-3.6, pypy-3.7]
+        python-version: [2.7, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, pypy-2.7, pypy-3.6, pypy-3.7]
+        python-impl: [cpython]
+        ytdl-test-set: [core]
         run-tests-ext: [sh]
         include:
-        # atleast one of the tests must be in windows
+        # python 3.2 is only available on windows via setup-python
         - os: windows-latest
-          python-version: 3.6
+          python-version: 3.2
+          python-impl: cpython
+          ytdl-test-set: core
           run-tests-ext: bat
+        # jython
+        - os: ubuntu-latest
+          python-impl: jython
+          ytdl-test-set: core
+          run-tests-ext: sh
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2
+      if: ${{ matrix.python-impl == 'cpython' }}
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Install pytest
+    - name: Set up Java 8
-      run: pip install pytest
+      if: ${{ matrix.python-impl == 'jython' }}
+      uses: actions/setup-java@v1
+      with:
+        java-version: 8
+    - name: Install Jython
+      if: ${{ matrix.python-impl == 'jython' }}
+      run: |
+        wget http://search.maven.org/remotecontent?filepath=org/python/jython-installer/2.7.1/jython-installer-2.7.1.jar -O jython-installer.jar
+        java -jar jython-installer.jar -s -d "$HOME/jython"
+        echo "$HOME/jython/bin" >> $GITHUB_PATH
+    - name: Install nose
+      run: pip install nose
     - name: Run tests
-      continue-on-error: False
+      continue-on-error: ${{ matrix.ytdl-test-set == 'download' || matrix.python-impl == 'jython' }}
-      run: ./devscripts/run_tests.${{ matrix.run-tests-ext }} core
+      env:
+        YTDL_TEST_SET: ${{ matrix.ytdl-test-set }}
+      run: ./devscripts/run_tests.${{ matrix.run-tests-ext }}
   # Linter is in quick-test

.github/workflows/download.yml

@@ -9,20 +9,45 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-18.04]
-        python-version: [3.7, 3.8, 3.9, 3.10-dev, pypy-3.6, pypy-3.7]
+        # TODO: python 2.6
+        python-version: [2.7, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, pypy-2.7, pypy-3.6, pypy-3.7]
+        python-impl: [cpython]
+        ytdl-test-set: [download]
         run-tests-ext: [sh]
         include:
+        # python 3.2 is only available on windows via setup-python
         - os: windows-latest
-          python-version: 3.6
+          python-version: 3.2
+          python-impl: cpython
+          ytdl-test-set: download
           run-tests-ext: bat
+        # jython - disable for now since it takes too long to complete
+        # - os: ubuntu-latest
+        #   python-impl: jython
+        #   ytdl-test-set: download
+        #   run-tests-ext: sh
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2
+      if: ${{ matrix.python-impl == 'cpython' }}
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Install pytest
+    - name: Set up Java 8
-      run: pip install pytest
+      if: ${{ matrix.python-impl == 'jython' }}
+      uses: actions/setup-java@v1
+      with:
+        java-version: 8
+    - name: Install Jython
+      if: ${{ matrix.python-impl == 'jython' }}
+      run: |
+        wget http://search.maven.org/remotecontent?filepath=org/python/jython-installer/2.7.1/jython-installer-2.7.1.jar -O jython-installer.jar
+        java -jar jython-installer.jar -s -d "$HOME/jython"
+        echo "$HOME/jython/bin" >> $GITHUB_PATH
+    - name: Install nose
+      run: pip install nose
     - name: Run tests
-      continue-on-error: true
+      continue-on-error: ${{ matrix.ytdl-test-set == 'download' || matrix.python-impl == 'jython' }}
-      run: ./devscripts/run_tests.${{ matrix.run-tests-ext }} download
+      env:
+        YTDL_TEST_SET: ${{ matrix.ytdl-test-set }}
+      run: ./devscripts/run_tests.${{ matrix.run-tests-ext }}

.github/workflows/quick-test.yml

@@ -11,10 +11,12 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: 3.9
-    - name: Install test requirements
+    - name: Install nose
-      run: pip install pytest pycryptodome
+      run: pip install nose
     - name: Run tests
-      run: ./devscripts/run_tests.sh core
+      env:
+        YTDL_TEST_SET: core
+      run: ./devscripts/run_tests.sh
   flake8:
     name: Linter
     if: "!contains(github.event.head_commit.message, 'ci skip all')"
@@ -27,7 +29,5 @@ jobs:
         python-version: 3.9
     - name: Install flake8
       run: pip install flake8
-    - name: Make lazy extractors
-      run: python devscripts/make_lazy_extractors.py yt_dlp/extractor/lazy_extractors.py
     - name: Run flake8
       run: flake8 .

.gitignore

@@ -1,53 +1,6 @@
-# Config
-*.conf
-*.spec
-cookies
-cookies.txt
-
-# Downloaded
-*.srt
-*.ttml
-*.sbv
-*.vtt
-*.flv
-*.mp4
-*.m4a
-*.m4v
-*.mp3
-*.3gp
-*.webm
-*.wav
-*.ape
-*.mkv
-*.flac
-*.avi
-*.swf
-*.part
-*.part-*
-*.ytdl
-*.dump
-*.frag
-*.frag.urls
-*.aria2
-*.swp
-*.ogg
-*.opus
-*.info.json
-*.live_chat.json
-*.jpg
-*.jpeg
-*.png
-*.webp
-*.annotations.xml
-*.description
-
-# Allow config/media files in testdata
-!test/testdata/**
-
 # Python
 *.pyc
 *.pyo
-.pytest_cache
 wine-py2exe/
 py2exe.log
 build/
@@ -82,7 +35,6 @@ README.txt
 *.tar.gz
 *.zsh
 *.spec
-test/testdata/player-*.js
 
 # Binary
 /youtube-dl
@@ -91,6 +43,47 @@ test/testdata/player-*.js
 yt-dlp.zip
 *.exe
 
+# Downloaded
+*.srt
+*.ttml
+*.sbv
+*.vtt
+*.flv
+*.mp4
+*.m4a
+*.m4v
+*.mp3
+*.3gp
+*.webm
+*.wav
+*.ape
+*.mkv
+*.swf
+*.part
+*.ytdl
+*.dump
+*.frag
+*.frag.urls
+*.aria2
+*.swp
+*.ogg
+*.opus
+*.info.json
+*.live_chat.json
+*.jpg
+*.png
+*.webp
+*.annotations.xml
+*.description
+
+# Config
+*.conf
+*.spec
+cookies
+cookies.txt
+
+
+
 # Text Editor / IDE
 .idea
 *.iml

CONTRIBUTING.md

@@ -3,7 +3,7 @@
 $ youtube-dl -v <your command line>
 [debug] System config: []
 [debug] User config: []
-[debug] Command-line args: [u'-v', u'https://www.youtube.com/watch?v=BaW_jenozKc']
+[debug] Command-line args: [u'-v', u'https://www.youtube.com/watch?v=BaW_jenozKcj']
 [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251
 [debug] youtube-dl version 2015.12.06
 [debug] Git HEAD: 135392e
@@ -81,17 +81,16 @@ # DEVELOPER INSTRUCTIONS
     python -m unittest discover
     python test/test_download.py
     nosetests
-    pytest
 
 See item 6 of [new extractor tutorial](#adding-support-for-a-new-site) for how to run extractor specific test cases.
 
 If you want to create a build of youtube-dl yourself, you'll need
 
-* python3
+* python
 * make (only GNU make is supported)
 * pandoc
 * zip
-* pytest
+* nosetests
 
 ### Adding support for a new site
 

CONTRIBUTORS

@@ -1,7 +1,5 @@
 pukkandan (owner)
 shirt-dev (collaborator)
-coletdjnz/colethedj (collaborator)
-Ashish0804 (collaborator)
 h-h-h-h
 pauldubois98
 nixxo
@@ -21,82 +19,12 @@ FelixFrog
 Zocker1999NET
 nao20010128nao
 kurumigi
+tsukumi
 bbepis
-animelover1984/horahoradev
 Pccode66
+Ashish
 RobinD42
 hseg
+colethedj
 DennyDai
 codeasashu
-teesid
-kevinoconnor7
-damianoamatruda
-2ShedsJackson
-CXwudi
-xtkoba
-llacb47
-hheimbuerger
-B0pol
-lkho
-fstirlitz
-Lamieur
-tsukumijima
-Hadi0609
-b5eff52
-craftingmod
-tpikonen
-tripulse
-king-millez
-alex-gedeon
-hhirtz
-louie-github
-MinePlayersPE
-olifre
-rhsmachine/zenerdi0de
-nihil-admirari
-krichbanana
-ohmybahgosh
-nyuszika7h
-blackjack4494
-pyx
-TpmKranz
-mzbaulhaque
-zackmark29
-mbway
-zerodytrash
-wesnm
-pento
-rigstot
-dirkf
-funniray
-Jessecar96
-jhwgh1968
-kikuyan
-max-te
-nchilada
-pgaig
-PSlava
-stdedos
-u-spec-png
-Sipherdrakon
-kidonng
-smege1001
-tandy1000
-IONECarter
-capntrips
-mrfade
-ParadoxGBB
-wlritchi
-NeroBurner
-mahanstreamer
-alerikaisattera
-Derkades
-BunnyHelp
-i6t
-std-move
-Chocobozzz
-ouwou
-korli
-octotherp
-CeruleanSky
-zootedb0t

Changelog.md

@@ -6,11 +6,9 @@ # Instuctions for creating release
 * Run `make doc`
 * Update Changelog.md and CONTRIBUTORS
 * Change "Merged with ytdl" version in Readme.md if needed
-* Add new/fixed extractors in "new features" section of Readme.md
 * Commit to master as `Release <version>`
-* Push to origin/release using `git push origin master:release`
+* Push to origin/release - build task will now run
-    build task will now run
+* Update version.py using devscripts\update-version.py
-* Update version.py using `devscripts\update-version.py`
 * Run `make issuetemplates`
 * Commit to master as `[version] update :ci skip all`
 * Push to origin/master
@@ -19,716 +17,16 @@ # Instuctions for creating release
 -->
 
 
-### 2021.09.02
-
-* **Native SponsorBlock** implementation by [nihil-admirari](https://github.com/nihil-admirari), [pukkandan](https://github.com/pukkandan)
-    * `--sponsorblock-remove CATS` removes specified chapters from file
-    * `--sponsorblock-mark CATS` marks the specified sponsor sections as chapters
-    * `--sponsorblock-chapter-title TMPL` to specify sponsor chapter template
-    * `--sponsorblock-api URL` to use a different API
-    * No re-encoding is done unless `--force-keyframes-at-cuts` is used
-    * The fetched sponsor sections are written to the infojson
-    * Deprecates: `--sponskrub`, `--no-sponskrub`, `--sponskrub-cut`, `--no-sponskrub-cut`, `--sponskrub-force`, `--no-sponskrub-force`, `--sponskrub-location`, `--sponskrub-args`
-* Split `--embed-chapters` from `--embed-metadata` (it still implies the former by default)
-* Add option `--remove-chapters` to remove arbitrary chapters by [nihil-admirari](https://github.com/nihil-admirari), pukkandan
-* Add option `--force-keyframes-at-cuts` for more accurate cuts when removing and splitting chapters by [nihil-admirari](https://github.com/nihil-admirari)
-* Let `--match-filter` reject entries early
-    * Makes redundant: `--match-title`, `--reject-title`, `--min-views`, `--max-views`
-* [lazy_extractor] Improvements (It now passes all tests)
-    * Bugfix for when plugin directory doesn't exist by [kidonng](https://github.com/kidonng)
-    * Create instance only after pre-checking archive
-    * Import actual class if an attribute is accessed
-    * Fix `suitable` and add flake8 test
-* [downloader/ffmpeg] Experimental support for DASH manifests (including live)
-    * Your ffmpeg must have [this patch](https://github.com/FFmpeg/FFmpeg/commit/3249c757aed678780e22e99a1a49f4672851bca9) applied for YouTube DASH to work
-* [downloader/ffmpeg] Allow passing custom arguments before `-i`
-
-* [BannedVideo] Add extractor by [smege1001](https://github.com/smege1001), [blackjack4494](https://github.com/blackjack4494), [pukkandan](https://github.com/pukkandan)
-* [bilibili] Add category extractor by [animelover1984](https://github.com/animelover1984)
-* [Epicon] Add extractors by [Ashish0804](https://github.com/Ashish0804)
-* [filmmodu] Add extractor by [mzbaulhaque](https://github.com/mzbaulhaque)
-* [GabTV] Add extractor by [Ashish0804](https://github.com/Ashish0804)
-* [Hungama] Fix `HungamaSongIE` and add `HungamaAlbumPlaylistIE` by [Ashish0804](https://github.com/Ashish0804)
-* [ManotoTV] Add new extractors by [tandy1000](https://github.com/tandy1000)
-* [Niconico] Add Search extractors by [animelover1984](https://github.com/animelover1984), [pukkandan](https://github.com/pukkandan)
-* [Patreon] Add `PatreonUserIE` by [zenerdi0de](https://github.com/zenerdi0de)
-* [peloton] Add extractor by [IONECarter](https://github.com/IONECarter), [capntrips](https://github.com/capntrips), [pukkandan](https://github.com/pukkandan)
-* [ProjectVeritas] Add extractor by [Ashish0804](https://github.com/Ashish0804)
-* [radiko] Add extractors by [nao20010128nao](https://github.com/nao20010128nao)
-* [StarTV] Add extractor for `startv.com.tr` by [mrfade](https://github.com/mrfade), [coletdjnz](https://github.com/coletdjnz)
-* [tiktok] Add `TikTokUserIE` by [Ashish0804](https://github.com/Ashish0804), [pukkandan](https://github.com/pukkandan)
-* [Tokentube] Add extractor by [u-spec-png](https://github.com/u-spec-png)
-* [TV2Hu] Fix `TV2HuIE` and add `TV2HuSeriesIE` by [Ashish0804](https://github.com/Ashish0804)
-* [voicy] Add extractor by [nao20010128nao](https://github.com/nao20010128nao)
-
-* [adobepass] Fix Verizon SAML login by [nyuszika7h](https://github.com/nyuszika7h), [ParadoxGBB](https://github.com/ParadoxGBB)
-* [afreecatv] Fix adult VODs by [wlritchi](https://github.com/wlritchi)
-* [afreecatv] Tolerate failure to parse date string by [wlritchi](https://github.com/wlritchi)
-* [aljazeera] Fix extractor by [MinePlayersPE](https://github.com/MinePlayersPE)
-* [ATV.at] Fix extractor for ATV.at by [NeroBurner](https://github.com/NeroBurner), [coletdjnz](https://github.com/coletdjnz)
-* [bitchute] Fix test by [mahanstreamer](https://github.com/mahanstreamer)
-* [camtube] Remove obsolete extractor by [alerikaisattera](https://github.com/alerikaisattera)
-* [CDA] Add more formats by [u-spec-png](https://github.com/u-spec-png)
-* [eroprofile] Fix page skipping in albums by [jhwgh1968](https://github.com/jhwgh1968)
-* [facebook] Fix format sorting
-* [facebook] Fix metadata extraction by [kikuyan](https://github.com/kikuyan)
-* [facebook] Update onion URL by [Derkades](https://github.com/Derkades)
-* [HearThisAtIE] Fix extractor by [Ashish0804](https://github.com/Ashish0804)
-* [instagram] Add referrer to prevent throttling by [u-spec-png](https://github.com/u-spec-png), [kikuyan](https://github.com/kikuyan)
-* [iwara.tv] Extract more metadata by [BunnyHelp](https://github.com/BunnyHelp)
-* [iwara] Add thumbnail by [i6t](https://github.com/i6t)
-* [kakao] Fix extractor
-* [mediaset] Fix extraction for some videos by [nyuszika7h](https://github.com/nyuszika7h)
-* [Motherless] Fix extractor by [coletdjnz](https://github.com/coletdjnz)
-* [Nova] fix extractor by [std-move](https://github.com/std-move)
-* [ParamountPlus] Fix geo verification by [shirt](https://github.com/shirt-dev)
-* [peertube] handle new video URL format by [Chocobozzz](https://github.com/Chocobozzz)
-* [pornhub] Separate and fix playlist extractor by [mzbaulhaque](https://github.com/mzbaulhaque)
-* [reddit] Fix for quarantined subreddits by [ouwou](https://github.com/ouwou)
-* [ShemarooMe] Fix extractor by [Ashish0804](https://github.com/Ashish0804)
-* [soundcloud] Refetch `client_id` on 403
-* [tiktok] Fix metadata extraction
-* [TV2] Fix extractor by [Ashish0804](https://github.com/Ashish0804)
-* [tv5mondeplus] Fix extractor by [korli](https://github.com/korli)
-* [VH1,TVLand] Fix extractors by [Sipherdrakon](https://github.com/Sipherdrakon)
-* [Viafree] Fix extractor and extract subtitles by [coletdjnz](https://github.com/coletdjnz)
-* [XHamster] Extract `uploader_id` by [octotherp](https://github.com/octotherp)
-* [youtube] Add `shorts` to `_VALID_URL`
-* [youtube] Add av01 itags to known formats list by [blackjack4494](https://github.com/blackjack4494)
-* [youtube] Extract error messages from HTTPError response by [coletdjnz](https://github.com/coletdjnz)
-* [youtube] Fix subtitle names
-* [youtube] Prefer audio stream that YouTube considers default
-* [youtube] Remove annotations and deprecate `--write-annotations` by [coletdjnz](https://github.com/coletdjnz)
-* [Zee5] Fix extractor and add subtitles by [Ashish0804](https://github.com/Ashish0804)
-
-* [aria2c] Obey `--rate-limit`
-* [EmbedSubtitle] Continue even if some files are missing
-* [extractor] Better error message for DRM
-* [extractor] Common function `_match_valid_url`
-* [extractor] Show video id in error messages if possible
-* [FormatSort] Remove priority of `lang`
-* [options] Add `_set_from_options_callback`
-* [SubtitleConvertor] Fix bug during subtitle conversion
-* [utils] Add `parse_qs`
-* [webvtt] Fix timestamp overflow adjustment by [fstirlitz](https://github.com/fstirlitz)
-* Bugfix for `--replace-in-metadata`
-* Don't try to merge with final extension
-* Fix `--force-overwrites` when using `-k`
-* Fix `--no-prefer-free-formats` by [CeruleanSky](https://github.com/CeruleanSky)
-* Fix `-F` for extractors that directly return url
-* Fix `-J` when there are failed videos
-* Fix `extra_info` being reused across runs
-* Fix `playlist_index` not obeying `playlist_start` and add tests
-* Fix resuming of single formats when using `--no-part`
-* Revert erroneous use of the `Content-Length` header by [fstirlitz](https://github.com/fstirlitz)
-* Use `os.replace` where applicable by; paulwrubel
-* [build] Add homebrew taps `yt-dlp/taps/yt-dlp` by [nao20010128nao](https://github.com/nao20010128nao)
-* [build] Fix bug in making `yt-dlp.tar.gz`
-* [docs] Fix some typos by [pukkandan](https://github.com/pukkandan), [zootedb0t](https://github.com/zootedb0t)
-* [cleanup] Replace improper use of tab in trovo by [glenn-slayden](https://github.com/glenn-slayden)
-
-
-### 2021.08.10
-
-* Add option `--replace-in-metadata`
-* Add option `--no-simulate` to not simulate even when `--print` or `--list...` are used - Deprecates `--print-json`
-* Allow entire infodict to be printed using `%()s` - makes `--dump-json` redundant
-* Allow multiple `--exec` and `--exec-before-download`
-* Add regex to `--match-filter`
-* Add all format filtering operators also to `--match-filter` by [max-te](https://github.com/max-te)
-* Add compat-option `no-keep-subs`
-* [adobepass] Add MSO Cablevision by [Jessecar96](https://github.com/Jessecar96)
-* [BandCamp] Add BandcampMusicIE by [Ashish0804](https://github.com/Ashish0804)
-* [blackboardcollaborate] Add new extractor by [mzbaulhaque](https://github.com/mzbaulhaque)
-* [eroprofile] Add album downloader by [jhwgh1968](https://github.com/jhwgh1968)
-* [mirrativ] Add extractors by [nao20010128nao](https://github.com/nao20010128nao)
-* [openrec] Add extractors by [nao20010128nao](https://github.com/nao20010128nao)
-* [nbcolympics:stream] Fix extractor by [nchilada](https://github.com/nchilada), [pukkandan](https://github.com/pukkandan)
-* [nbcolympics] Update extractor for 2020 olympics by [wesnm](https://github.com/wesnm)
-* [paramountplus] Separate extractor and fix some titles by [shirt](https://github.com/shirt-dev), [pukkandan](https://github.com/pukkandan)
-* [RCTIPlus] Support events and TV by [MinePlayersPE](https://github.com/MinePlayersPE)
-* [Newgrounds] Improve extractor and fix playlist by [u-spec-png](https://github.com/u-spec-png)
-* [aenetworks] Update `_THEPLATFORM_KEY` and `_THEPLATFORM_SECRET` by [wesnm](https://github.com/wesnm)
-* [crunchyroll] Fix thumbnail by [funniray](https://github.com/funniray)
-* [HotStar] Use API for metadata and extract subtitles by [Ashish0804](https://github.com/Ashish0804)
-* [instagram] Fix comments extraction by [u-spec-png](https://github.com/u-spec-png)
-* [peertube] Fix videos without description by [u-spec-png](https://github.com/u-spec-png)
-* [twitch:clips] Extract `display_id` by [dirkf](https://github.com/dirkf)
-* [viki] Print error message from API request
-* [Vine] Remove invalid formats by [u-spec-png](https://github.com/u-spec-png)
-* [VrtNU] Fix XSRF token by [pgaig](https://github.com/pgaig)
-* [vrv] Fix thumbnail extraction by [funniray](https://github.com/funniray)
-* [youtube] Add extractor-arg `include-live-dash` to show live dash formats
-* [youtube] Improve signature function detection by [PSlava](https://github.com/PSlava)
-* [youtube] Raise appropriate error when API pages can't be downloaded
-* Ensure `_write_ytdl_file` closes file handle on error
-* Fix `--compat-options filename` by [stdedos](https://github.com/stdedos)
-* Fix issues with infodict sanitization
-* Fix resuming when using `--no-part`
-* Fix wrong extension for intermediate files
-* Handle `BrokenPipeError` by [kikuyan](https://github.com/kikuyan)
-* Show libraries present in verbose head
-* [extractor] Detect `sttp` as subtitles in MPD by [fstirlitz](https://github.com/fstirlitz)
-* [extractor] Reset non-repeating warnings per video
-* [ffmpeg] Fix streaming `mp4` to `stdout`
-* [ffpmeg] Allow `--ffmpeg-location` to be a file with different name
-* [utils] Fix `InAdvancePagedList.__getitem__`
-* [utils] Fix `traverse_obj` depth when `is_user_input`
-* [webvtt] Merge daisy-chained duplicate cues by [fstirlitz](https://github.com/fstirlitz)
-* [build] Use custom build of `pyinstaller` by [shirt](https://github.com/shirt-dev)
-* [tests:download] Add batch testing for extractors (`test_YourExtractor_all`)
-* [docs] Document which fields `--add-metadata` adds to the file
-* [docs] Fix some mistakes and improve doc
-* [cleanup] Misc code cleanup
-
-
-### 2021.08.02
-
-* Add logo, banner and donate links
-* Expand and escape environment variables correctly in output template
-* Add format types `j` (json), `l` (comma delimited list), `q` (quoted for terminal) in output template
-* [downloader] Allow streaming some unmerged formats to stdout using ffmpeg
-* [youtube] **Age-gate bypass**
-    * Add `agegate` clients by [pukkandan](https://github.com/pukkandan), [MinePlayersPE](https://github.com/MinePlayersPE)
-    * Add `thirdParty` to agegate clients to bypass more videos
-    * Simplify client definitions, expose `embedded` clients
-    * Improve age-gate detection by [coletdjnz](https://github.com/coletdjnz)
-    * Fix default global API key by [coletdjnz](https://github.com/coletdjnz)
-    * Add `creator` clients for age-gate bypass using unverified accounts by [zerodytrash](https://github.com/zerodytrash), [coletdjnz](https://github.com/coletdjnz), [pukkandan](https://github.com/pukkandan)
-* [adobepass] Add MSO Sling TV by [wesnm](https://github.com/wesnm)
-* [CBS] Add ParamountPlusSeriesIE by [Ashish0804](https://github.com/Ashish0804)
-* [dplay] Add `ScienceChannelIE` by [Sipherdrakon](https://github.com/Sipherdrakon)
-* [UtreonIE] Add extractor by [Ashish0804](https://github.com/Ashish0804)
-* [youtube] Add `mweb` client by [coletdjnz](https://github.com/coletdjnz)
-* [youtube] Add `player_client=all`
-* [youtube] Force `hl=en` for comments by [coletdjnz](https://github.com/coletdjnz)
-* [youtube] Fix format sorting when using alternate clients
-* [youtube] Misc cleanup by [pukkandan](https://github.com/pukkandan), [coletdjnz](https://github.com/coletdjnz)
-* [youtube] Extract SAPISID only once
-* [CBS] Add fallback by [llacb47](https://github.com/llacb47), [pukkandan](https://github.com/pukkandan)
-* [Hotstar] Support cookies by [Ashish0804](https://github.com/Ashish0804)
-* [HotStarSeriesIE] Fix regex by [Ashish0804](https://github.com/Ashish0804)
-* [bilibili] Improve `_VALID_URL`
-* [mediaset] Fix extraction by [nixxo](https://github.com/nixxo)
-* [Mxplayer] Add h265 formats by [Ashish0804](https://github.com/Ashish0804)
-* [RCTIPlus] Remove PhantomJS dependency by [MinePlayersPE](https://github.com/MinePlayersPE)
-* [tenplay] Add MA15+ age limit by [pento](https://github.com/pento)
-* [vidio] Fix login error detection by [MinePlayersPE](https://github.com/MinePlayersPE)
-* [vimeo] Better extraction of original file by [Ashish0804](https://github.com/Ashish0804)
-* [generic] Support KVS player (replaces ThisVidIE) by [rigstot](https://github.com/rigstot)
-* Add compat-option `no-clean-infojson`
-* Remove `asr` appearing twice in `-F`
-* Set `home:` as the default key for `-P`
-* [utils] Fix slicing of reversed `LazyList`
-* [FormatSort] Fix bug for audio with unknown codec
-* [test:download] Support testing with `ignore_no_formats_error`
-* [cleanup] Refactor some code
-
-
-### 2021.07.24
-
-* [youtube:tab] Extract video duration early
-* [downloader] Pass `info_dict` to `progress_hook`s
-* [youtube] Fix age-gated videos for API clients when cookies are supplied by [coletdjnz](https://github.com/coletdjnz)
-* [youtube] Disable `get_video_info` age-gate workaround - This endpoint seems to be completely dead
-* [youtube] Try all clients even if age-gated
-* [youtube] Fix subtitles only being extracted from the first client
-* [youtube] Simplify `_get_text`
-* [cookies] bugfix for microsoft edge on macOS
-* [cookies] Handle `sqlite` `ImportError` gracefully by [mbway](https://github.com/mbway)
-* [cookies] Handle errors when importing `keyring`
-
-### 2021.07.21
-
-* **Add option `--cookies-from-browser`** to load cookies from a browser by [mbway](https://github.com/mbway)
-    * Usage: `--cookies-from-browser BROWSER[:PROFILE_NAME_OR_PATH]`
-    * Also added `--no-cookies-from-browser`
-    * To decrypt chromium cookies, `keyring` is needed for UNIX and `pycryptodome` for Windows
-* Add option `--exec-before-download`
-* Add field `live_status`
-* [FFmpegMetadata] Add language of each stream and some refactoring
-* [douyin] Add extractor by [pukkandan](https://github.com/pukkandan), [pyx](https://github.com/pyx)
-* [pornflip] Add extractor by [mzbaulhaque](https://github.com/mzbaulhaque)
-* **[youtube] Extract data from multiple clients** by [pukkandan](https://github.com/pukkandan), [coletdjnz](https://github.com/coletdjnz)
-    * `player_client` now accepts multiple clients
-    * Default `player_client` = `android,web`
-        * This uses twice as many requests, but avoids throttling for most videos while also not losing any formats
-    * Music clients can be specifically requested and is enabled by default if `music.youtube.com`
-    * Added `player_client=ios` (Known issue: formats from ios are not sorted correctly)
-    * Add age-gate bypass for android and ios clients
-* [youtube] Extract more thumbnails
-    * The thumbnail URLs are hard-coded and their actual existence is tested lazily
-    * Added option `--no-check-formats` to not test them
-* [youtube] Misc fixes
-    * Improve extraction of livestream metadata by [pukkandan](https://github.com/pukkandan), [krichbanana](https://github.com/krichbanana)
-    * Hide live dash formats since they can't be downloaded anyway
-    * Fix authentication when using multiple accounts by [coletdjnz](https://github.com/coletdjnz)
-    * Fix controversial videos when requested via API by [coletdjnz](https://github.com/coletdjnz)
-    * Fix session index extraction and headers for non-web player clients by [coletdjnz](https://github.com/coletdjnz)
-    * Make `--extractor-retries` work for more errors
-    * Fix sorting of 3gp format
-    * Sanity check `chapters` (and refactor related code)
-    * Make `parse_time_text` and `_extract_chapters` non-fatal
-    * Misc cleanup and bug fixes by [coletdjnz](https://github.com/coletdjnz)
-* [youtube:tab] Fix channels tab
-* [youtube:tab] Extract playlist availability by [coletdjnz](https://github.com/coletdjnz)
-* **[youtube:comments] Move comment extraction to new API** by [coletdjnz](https://github.com/coletdjnz)
-    * Adds extractor-args `comment_sort` (`top`/`new`), `max_comments`, `max_comment_depth`
-* [youtube:comments] Fix `is_favorited`, improve `like_count` parsing by [coletdjnz](https://github.com/coletdjnz)
-* [BravoTV] Improve metadata extraction by [kevinoconnor7](https://github.com/kevinoconnor7)
-* [crunchyroll:playlist] Force http
-* [yahoo:gyao:player] Relax `_VALID_URL` by [nao20010128nao](https://github.com/nao20010128nao)
-* [nebula] Authentication via tokens from cookie jar by [hheimbuerger](https://github.com/hheimbuerger), [TpmKranz](https://github.com/TpmKranz)
-* [RTP] Fix extraction and add subtitles by [fstirlitz](https://github.com/fstirlitz)
-* [viki] Rewrite extractors and add extractor-arg `video_types` to `vikichannel` by [zackmark29](https://github.com/zackmark29), [pukkandan](https://github.com/pukkandan)
-* [vlive] Extract thumbnail directly in addition to the one from Naver
-* [generic] Extract previously missed subtitles by [fstirlitz](https://github.com/fstirlitz)
-* [generic] Extract everything in the SMIL manifest and detect discarded subtitles by [fstirlitz](https://github.com/fstirlitz)
-* [embedthumbnail] Fix `_get_thumbnail_resolution`
-* [metadatafromfield] Do not detect numbers as field names
-* Fix selectors `all`, `mergeall` and add tests
-* Errors in playlist extraction should obey `--ignore-errors`
-* Fix bug where `original_url` was not propagated when `_type`=`url`
-* Revert "Merge webm formats into mkv if thumbnails are to be embedded (#173)"
-    * This was wrongly checking for `write_thumbnail`
-* Improve `extractor_args` parsing
-* Rename `NOTE` in `-F` to `MORE INFO` since it's often confused to be the same as `format_note`
-* Add `only_once` param for `write_debug` and `report_warning`
-* [extractor] Allow extracting multiple groups in `_search_regex` by [fstirlitz](https://github.com/fstirlitz)
-* [utils] Improve `traverse_obj`
-* [utils] Add `variadic`
-* [utils] Improve `js_to_json` comment regex by [fstirlitz](https://github.com/fstirlitz)
-* [webtt] Fix timestamps
-* [compat] Remove unnecessary code
-* [docs] fix default of multistreams
-
-
-### 2021.07.07
-
-* Merge youtube-dl: Upto [commit/a803582](https://github.com/ytdl-org/youtube-dl/commit/a8035827177d6b59aca03bd717acb6a9bdd75ada)
-* Add `--extractor-args` to pass some extractor-specific arguments. See [readme](https://github.com/yt-dlp/yt-dlp#extractor-arguments)
-    * Add extractor option `skip` for `youtube`. Eg: `--extractor-args youtube:skip=hls,dash`
-    * Deprecates `--youtube-skip-dash-manifest`, `--youtube-skip-hls-manifest`, `--youtube-include-dash-manifest`, `--youtube-include-hls-manifest`
-* Allow `--list...` options to work with `--print`, `--quiet` and other `--list...` options
-* [youtube] Use `player` API for additional video extraction requests by [coletdjnz](https://github.com/coletdjnz)
-    * **Fixes youtube premium music** (format 141) extraction
-    * Adds extractor option `player_client` = `web`/`android`
-        * **`--extractor-args youtube:player_client=android` works around the throttling** for the time-being
-    * Adds extractor option `player_skip=config`
-    * Adds age-gate fallback using embedded client
-* [youtube] Choose correct Live chat API for upcoming streams by [krichbanana](https://github.com/krichbanana)
-* [youtube] Fix subtitle names for age-gated videos
-* [youtube:comments] Fix error handling and add `itct` to params by [coletdjnz](https://github.com/coletdjnz)
-* [youtube_live_chat] Fix download with cookies by [siikamiika](https://github.com/siikamiika)
-* [youtube_live_chat] use `clickTrackingParams` by [siikamiika](https://github.com/siikamiika)
-* [Funimation] Rewrite extractor
-    * Add `FunimationShowIE` by [Mevious](https://github.com/Mevious)
-    * **Treat the different versions of an episode as different formats of a single video**
-        * This changes the video `id` and will break break existing archives
-        * Compat option `seperate-video-versions` to fall back to old behavior including using the old video ids
-    * Support direct `/player/` URL
-    * Extractor options `language` and `version` to pre-select them during extraction
-        * These options may be removed in the future if we can extract all formats without additional network requests
-        * Do not rely on these for format selection and use `-f` filters instead
-* [AdobePass] Add Spectrum MSO by [kevinoconnor7](https://github.com/kevinoconnor7), [ohmybahgosh](https://github.com/ohmybahgosh)
-* [facebook] Extract description and fix title
-* [fancode] Fix extraction, support live and allow login with refresh token by [zenerdi0de](https://github.com/zenerdi0de)
-* [plutotv] Improve `_VALID_URL`
-* [RCTIPlus] Add extractor by [MinePlayersPE](https://github.com/MinePlayersPE)
-* [Soundcloud] Allow login using oauth token by [blackjack4494](https://github.com/blackjack4494)
-* [TBS] Support livestreams by [llacb47](https://github.com/llacb47)
-* [videa] Fix extraction by [nyuszika7h](https://github.com/nyuszika7h)
-* [yahoo] Fix extraction by [llacb47](https://github.com/llacb47), [pukkandan](https://github.com/pukkandan)
-* Process videos when using `--ignore-no-formats-error` by [krichbanana](https://github.com/krichbanana)
-* Fix `--throttled-rate` when using `--load-info-json`
-* Fix `--flat-playlist` when entry has no `ie_key`
-* Fix `check_formats` catching `ExtractorError` instead of `DownloadError`
-* Fix deprecated option `--list-formats-old`
-* [downloader/ffmpeg] Fix `--ppa` when using simultaneous download
-* [extractor] Prevent unnecessary download of hls manifests and refactor `hls_split_discontinuity`
-* [fragment] Handle status of download and errors in threads correctly; and minor refactoring
-* [thumbnailsconvertor] Treat `jpeg` as `jpg`
-* [utils] Fix issues with `LazyList` reversal
-* [extractor] Allow extractors to set their own login hint
-* [cleanup] Simplify format selector code with `LazyList` and `yield from`
-* [cleanup] Clean `extractor.common._merge_subtitles` signature
-* [cleanup] Fix some typos
-
-
-### 2021.06.23
-
-* Merge youtube-dl: Upto [commit/379f52a](https://github.com/ytdl-org/youtube-dl/commit/379f52a4954013767219d25099cce9e0f9401961)
-* **Add option `--throttled-rate`** below which video data is re-extracted
-* [fragment] **Merge during download for `-N`**, and refactor `hls`/`dash`
-* [websockets] Add `WebSocketFragmentFD` by [nao20010128nao](https://github.com/nao20010128nao), [pukkandan](https://github.com/pukkandan)
-* Allow `images` formats in addition to video/audio
-* [downloader/mhtml] Add new downloader for slideshows/storyboards by [fstirlitz](https://github.com/fstirlitz)
-* [youtube] Temporary **fix for age-gate**
-* [youtube] Support ongoing live chat by [siikamiika](https://github.com/siikamiika)
-* [youtube] Improve SAPISID cookie handling by [coletdjnz](https://github.com/coletdjnz)
-* [youtube] Login is not needed for `:ytrec`
-* [youtube] Non-fatal alert reporting for unavailable videos page by [coletdjnz](https://github.com/coletdjnz)
-* [twitcasting] Websocket support by [nao20010128nao](https://github.com/nao20010128nao)
-* [mediasite] Extract slides by [fstirlitz](https://github.com/fstirlitz)
-* [funimation] Extract subtitles 
-* [pornhub] Extract `cast`
-* [hotstar] Use server time for authentication instead of local time
-* [EmbedThumbnail] Fix for already downloaded thumbnail
-* [EmbedThumbnail] Add compat-option `embed-thumbnail-atomicparsley`
-* Expand `--check-formats` to thumbnails
-* Fix id sanitization in filenames
-* Skip fixup of existing files and add `--fixup force` to force it
-* Better error handling of syntax errors in `-f`
-* Use `NamedTemporaryFile` for `--check-formats`
-* [aria2c] Lower `--min-split-size` for HTTP downloads
-* [options] Rename `--add-metadata` to `--embed-metadata`
-* [utils] Improve `LazyList` and add tests
-* [build] Build Windows x86 version with py3.7 and remove redundant tests by [pukkandan](https://github.com/pukkandan), [shirt](https://github.com/shirt-dev)
-* [docs] Clarify that `--embed-metadata` embeds chapter markers
-* [cleanup] Refactor fixup
-
-
-### 2021.06.09
-
-* Fix bug where `%(field)d` in filename template throws error
-* Improve offset parsing in outtmpl
-* [test] More rigorous tests for `prepare_filename`
-
-### 2021.06.08
-
-* Remove support for obsolete Python versions: Only 3.6+ is now supported
-* Merge youtube-dl: Upto [commit/c2350ca](https://github.com/ytdl-org/youtube-dl/commit/c2350cac243ba1ec1586fe85b0d62d1b700047a2)
-* [hls] Fix decryption for multithreaded downloader
-* [extractor] Fix pre-checking archive for some extractors
-* [extractor] Fix FourCC fallback when parsing ISM by [fstirlitz](https://github.com/fstirlitz)
-* [twitcasting] Add TwitCastingUserIE, TwitCastingLiveIE by [pukkandan](https://github.com/pukkandan), [nao20010128nao](https://github.com/nao20010128nao)
-* [vidio] Add VidioPremierIE and VidioLiveIE by [MinePlayersPE](Https://github.com/MinePlayersPE)
-* [viki] Fix extraction from [ytdl-org/youtube-dl@59e583f](https://github.com/ytdl-org/youtube-dl/commit/59e583f7e8530ca92776c866897d895c072e2a82)
-* [youtube] Support shorts URL
-* [zoom] Extract transcripts as subtitles
-* Add field `original_url` with the user-inputted URL
-* Fix and refactor `prepare_outtmpl`
-* Make more fields available for `--print` when used with `--flat-playlist`
-* [utils] Generalize `traverse_dict` to `traverse_obj`
-* [downloader/ffmpeg] Hide FFmpeg banner unless in verbose mode by [fstirlitz](https://github.com/fstirlitz)
-* [build] Release `yt-dlp.tar.gz`
-* [build,update] Add GNU-style SHA512 and prepare updater for simlar SHA256 by [nihil-admirari](https://github.com/nihil-admirari)
-* [pyinst] Show Python version in exe metadata by [nihil-admirari](https://github.com/nihil-admirari)
-* [docs] Improve documentation of dependencies
-* [cleanup] Mark unused files
-* [cleanup] Point all shebang to `python3` by [fstirlitz](https://github.com/fstirlitz)
-* [cleanup] Remove duplicate file `trovolive.py`
-
-
-### 2021.06.01
-
-* Merge youtube-dl: Upto [commit/d495292](https://github.com/ytdl-org/youtube-dl/commit/d495292852b6c2f1bd58bc2141ff2b0265c952cf)
-* Pre-check archive and filters during playlist extraction
-* Handle Basic Auth `user:pass` in URLs by [hhirtz](https://github.com/hhirtz) and [pukkandan](https://github.com/pukkandan)
-* [archiveorg] Add YoutubeWebArchiveIE by [coletdjnz](https://github.com/coletdjnz) and [alex-gedeon](https://github.com/alex-gedeon)
-* [fancode] Add extractor by [rhsmachine](https://github.com/rhsmachine)
-* [patreon] Support vimeo embeds by [rhsmachine](https://github.com/rhsmachine)
-* [Saitosan] Add new extractor by [llacb47](https://github.com/llacb47)
-* [ShemarooMe] Add extractor by [Ashish0804](https://github.com/Ashish0804) and [pukkandan](https://github.com/pukkandan)
-* [telemundo] Add extractor by [king-millez](https://github.com/king-millez)
-* [SonyLIV] Add SonyLIVSeriesIE and subtitle support by [Ashish0804](https://github.com/Ashish0804)
-* [Hotstar] Add HotStarSeriesIE by [Ashish0804](https://github.com/Ashish0804)
-* [Voot] Add VootSeriesIE by [Ashish0804](https://github.com/Ashish0804)
-* [vidio] Support login and premium videos by [MinePlayersPE](https://github.com/MinePlayersPE)
-* [fragment] When using `-N`, do not keep the fragment content in memory
-* [ffmpeg] Download and merge in a single step if possible
-* [ThumbnailsConvertor] Support conversion to `png` and make it the default by [louie-github](https://github.com/louie-github)
-* [VideoConvertor] Generalize with remuxer and allow conditional recoding
-* [EmbedThumbnail] Embed in `mp4`/`m4a` using mutagen by [tripulse](https://github.com/tripulse) and [pukkandan](https://github.com/pukkandan)
-* [EmbedThumbnail] Embed if any thumbnail was downloaded, not just the best
-* [EmbedThumbnail] Correctly escape filename
-* [update] replace self without launching a subprocess in windows
-* [update] Block further update for unsupported systems
-* Refactor `__process_playlist` by creating `LazyList`
-* Write messages to `stderr` when both `quiet` and `verbose`
-* Sanitize and sort playlist thumbnails
-* Remove `None` values from `info.json`
-* [extractor] Always prefer native hls downloader by default
-* [extractor] Skip subtitles without URI in m3u8 manifests by [hheimbuerger](https://github.com/hheimbuerger)
-* [extractor] Functions to parse `socket.io` response as `json` by [pukkandan](https://github.com/pukkandan) and [llacb47](https://github.com/llacb47)
-* [extractor] Allow `note=False` when extracting manifests
-* [utils] Escape URLs in `sanitized_Request`, not `sanitize_url`
-* [hls] Disable external downloader for `webtt`
-* [youtube] `/live` URLs should raise error if channel is not live
-* [youtube] Bug fixes
-* [zee5] Fix m3u8 formats' extension
-* [ard] Allow URLs without `-` before id by [olifre](https://github.com/olifre)
-* [cleanup] `YoutubeDL._match_entry`
-* [cleanup] Refactor updater
-* [cleanup] Refactor ffmpeg convertors
-* [cleanup] setup.py
-
-
-### 2021.05.20
-
-* **Youtube improvements**: 
-    * Support youtube music `MP`, `VL` and `browse` pages
-    * Extract more formats for youtube music by [craftingmod](https://github.com/craftingmod), [coletdjnz](https://github.com/coletdjnz) and [pukkandan](https://github.com/pukkandan)
-    * Extract multiple subtitles in same language by [pukkandan](https://github.com/pukkandan) and [tpikonen](https://github.com/tpikonen)
-    * Redirect channels that doesn't have a `videos` tab to their `UU` playlists
-    * Support in-channel search
-    * Sort audio-only formats correctly
-    * Always extract `maxresdefault` thumbnail
-    * Extract audio language
-    * Add subtitle language names by [nixxo](https://github.com/nixxo) and [tpikonen](https://github.com/tpikonen)
-    * Show alerts only from the final webpage
-    * Add `html5=1` param to `get_video_info` page requests by [coletdjnz](https://github.com/coletdjnz)
-    * Better message when login required
-* **Add option `--print`**: to print any field/template
-    * Makes redundant: `--get-description`, `--get-duration`, `--get-filename`, `--get-format`, `--get-id`, `--get-thumbnail`, `--get-title`, `--get-url`
-* Field `additional_urls` to download additional videos from metadata using [`--parse-metadata`](https://github.com/yt-dlp/yt-dlp#modifying-metadata)
-* Merge youtube-dl: Upto [commit/dfbbe29](https://github.com/ytdl-org/youtube-dl/commit/dfbbe2902fc67f0f93ee47a8077c148055c67a9b)
-* Write thumbnail of playlist and add `pl_thumbnail` outtmpl key
-* [embedthumbnail] Add `flac` support and refactor `mutagen` code by [pukkandan](https://github.com/pukkandan) and [tripulse](https://github.com/tripulse)
-* [audius:artist] Add extractor by [king-millez](https://github.com/king-millez)
-* [parlview] Add extractor by [king-millez](https://github.com/king-millez)
-* [tenplay] Fix extractor by [king-millez](https://github.com/king-millez)
-* [rmcdecouverte] Generalize `_VALID_URL`
-* Add compat-option `no-attach-infojson`
-* Add field `name` for subtitles
-* Ensure `post_extract` and `pre_process` only run once
-* Fix `--check-formats` when there is network error
-* Standardize `write_debug` and `get_param`
-* [options] Alias `--write-comments`, `--no-write-comments`
-* [options] Refactor callbacks
-* [test:download] Only extract enough videos for `playlist_mincount`
-* [extractor] bugfix for when `compat_opts` is not given
-* [build] Fix x86 build by [shirt](https://github.com/shirt-dev)
-* [cleanup] code formatting, youtube tests and readme
-
-### 2021.05.11
-* **Deprecate support for python versions < 3.6**
-* **Subtitle extraction from manifests** by [fstirlitz](https://github.com/fstirlitz). See [be6202f](https://github.com/yt-dlp/yt-dlp/commit/be6202f12b97858b9d716e608394b51065d0419f) for details
-* **Improve output template:**
-    * Allow slicing lists/strings using `field.start:end:step`
-    * A field can also be used as offset like `field1+num+field2`
-    * A default value can be given using `field|default`
-    * Prevent invalid fields from causing errors
-* **Merge youtube-dl**: Upto [commit/a726009](https://github.com/ytdl-org/youtube-dl/commit/a7260099873acc6dc7d76cafad2f6b139087afd0)
-* **Remove options** `-l`, `-t`, `-A` completely and disable `--auto-number`, `--title`, `--literal`, `--id`
-* [Plugins] Prioritize plugins over standard extractors and prevent plugins from overwriting the standard extractor classes
-* [downloader] Fix `quiet` and `to_stderr`
-* [fragment] Ensure the file is closed on error
-* [fragment] Make sure first segment is not skipped
-* [aria2c] Fix whitespace being stripped off
-* [embedthumbnail] Fix bug where jpeg thumbnails were converted again
-* [FormatSort] Fix for when some formats have quality and others don't
-* [utils] Add `network_exceptions`
-* [utils] Escape URL while sanitizing
-* [ukcolumn] Add Extractor
-* [whowatch] Add extractor by [nao20010128nao](https://github.com/nao20010128nao)
-* [CBS] Improve `_VALID_URL` to support movies
-* [crackle] Improve extraction
-* [curiositystream] Fix collections
-* [francetvinfo] Improve video id extraction
-* [generic] Respect the encoding in manifest
-* [limelight] Obey `allow_unplayable_formats`
-* [mediasite] Generalize URL pattern by [fstirlitz](https://github.com/fstirlitz)
-* [mxplayer] Add MxplayerShowIE by [Ashish0804](https://github.com/Ashish0804)
-* [nebula] Move to nebula.app by [Lamieur](https://github.com/Lamieur)
-* [niconico] Fix HLS formats by [CXwudi](https://github.com/CXwudi), [tsukumijima](https://github.com/tsukumijima), [nao20010128nao](https://github.com/nao20010128nao) and [pukkandan](https://github.com/pukkandan)
-* [niconico] Fix title and thumbnail extraction by [CXwudi](https://github.com/CXwudi)
-* [plutotv] Extract subtitles from manifests
-* [plutotv] Fix format extraction for some urls
-* [rmcdecouverte] Improve `_VALID_URL`
-* [sonyliv] Fix `title` and `series` extraction by [Ashish0804](https://github.com/Ashish0804)
-* [tubi] Raise "no video formats" error when video url is empty
-* [youtube:tab] Detect playlists inside community posts
-* [youtube] Add `oembed` to reserved names
-* [zee5] Fix extraction for some URLs by [Hadi0609](https://github.com/Hadi0609)
-* [zee5] Fix py2 compatibility
-* Fix `playlist_index` and add `playlist_autonumber`. See [#302](https://github.com/yt-dlp/yt-dlp/issues/302) for details
-* Add experimental option `--check-formats` to test the URLs before format selection
-* Option `--compat-options` to revert [some of yt-dlp's changes](https://github.com/yt-dlp/yt-dlp#differences-in-default-behavior)
-    * Deprecates `--list-formats-as-table`, `--list-formats-old`
-* Fix number of digits in `%(playlist_index)s`
-* Fix case sensitivity of format selector
-* Revert "[core] be able to hand over id and title using url_result"
-* Do not strip out whitespaces in `-o` and `-P`
-* Fix `preload_download_archive` writing verbose message to `stdout`
-* Move option warnings to `YoutubeDL`so that they obey `--no-warnings` and can output colors
-* Py2 compatibility for `FileNotFoundError`
-
-
-### 2021.04.22
-* **Improve output template:**
-    * Objects can be traversed like `%(field.key1.key2)s`
-    * An offset can be added to numeric fields as `%(field+N)s`
-    * Deprecates `--autonumber-start`
-* **Improve `--sub-langs`:**
-    * Treat `--sub-langs` entries as regex
-    * `all` can be used to refer to all the subtitles
-    * language codes can be prefixed with `-` to exclude it
-    * Deprecates `--all-subs`
-* Add option `--ignore-no-formats-error` to ignore the "no video format" and similar errors
-* Add option `--skip-playlist-after-errors` to skip the rest of a playlist after a given number of errors are encountered
-* Merge youtube-dl: Upto [commit/7e8b3f9](https://github.com/ytdl-org/youtube-dl/commit/7e8b3f9439ebefb3a3a4e5da9c0bd2b595976438)
-* [downloader] Fix bug in downloader selection
-* [BilibiliChannel] Fix pagination by [nao20010128nao](https://github.com/nao20010128nao) and [pukkandan](https://github.com/pukkandan)
-* [rai] Add support for http formats by [nixxo](https://github.com/nixxo)
-* [TubiTv] Add TubiTvShowIE by [Ashish0804](https://github.com/Ashish0804)
-* [twitcasting] Fix extractor
-* [viu:ott] Fix extractor and support series by [lkho](https://github.com/lkho) and [pukkandan](https://github.com/pukkandan)
-* [youtube:tab] Show unavailable videos in playlists by [coletdjnz](https://github.com/coletdjnz)
-* [youtube:tab] Reload with unavailable videos for all playlists
-* [youtube] Ignore invalid stretch ratio
-* [youtube] Improve channel syncid extraction to support ytcfg by [coletdjnz](https://github.com/coletdjnz)
-* [youtube] Standardize API calls for tabs, mixes and search by [coletdjnz](https://github.com/coletdjnz)
-* [youtube] Bugfix in `_extract_ytcfg`
-* [mildom:user:vod] Download only necessary amount of pages
-* [mildom] Remove proxy completely by [fstirlitz](https://github.com/fstirlitz)
-* [go] Fix `_VALID_URL`
-* [MetadataFromField] Improve regex and add tests
-* [Exec] Ensure backward compatibility when the command contains `%`
-* [extractor] Fix inconsistent use of `report_warning`
-* Ensure `mergeall` selects best format when multistreams are disabled
-* Improve the yt-dlp.sh script by [fstirlitz](https://github.com/fstirlitz)
-* [lazy_extractor] Do not load plugins
-* [ci] Disable fail-fast
-* [docs] Clarify which deprecated options still work
-* [docs] Fix typos
-
-
-### 2021.04.11
-* Add option `--convert-thumbnails` (only jpg currently supported)
-* Format selector `mergeall` to download and merge all formats
-* Pass any field to `--exec` using similar syntax to output template
-* Choose downloader for each protocol using `--downloader PROTO:NAME`
-    * Alias `--downloader` for `--external-downloader`
-    * Added `native` as an option for the downloader
-* Merge youtube-dl: Upto [commit/4fb25ff](https://github.com/ytdl-org/youtube-dl/commit/4fb25ff5a3be5206bb72e5c4046715b1529fb2c7) (except vimeo)
-* [DiscoveryPlusIndia] Add DiscoveryPlusIndiaShowIE by [Ashish0804](https://github.com/Ashish0804)
-* [NFHSNetwork] Add extractor by [llacb47](https://github.com/llacb47)
-* [nebula] Add extractor (watchnebula.com) by [hheimbuerger](https://github.com/hheimbuerger)
-* [nitter] Fix extraction of reply tweets and update instance list by [B0pol](https://github.com/B0pol)
-* [nitter] Fix thumbnails by [B0pol](https://github.com/B0pol)
-* [youtube] Fix thumbnail URL
-* [youtube] Parse API parameters from initial webpage by [coletdjnz](https://github.com/coletdjnz)
-* [youtube] Extract comments' approximate timestamp by [coletdjnz](https://github.com/coletdjnz)
-* [youtube] Fix alert extraction
-* [bilibili] Fix uploader
-* [utils] Add `datetime_from_str` and `datetime_add_months` by [coletdjnz](https://github.com/coletdjnz)
-* Run some `postprocessors` before actual download
-* Improve argument parsing for `-P`, `-o`, `-S`
-* Fix some `m3u8` not obeying `--allow-unplayable-formats`
-* Fix default of `dynamic_mpd`
-* Deprecate `--all-formats`, `--include-ads`, `--hls-prefer-native`, `--hls-prefer-ffmpeg`
-* [docs] Improvements
-
-### 2021.04.03
-* Merge youtube-dl: Upto [commit/654b4f4](https://github.com/ytdl-org/youtube-dl/commit/654b4f4ff2718f38b3182c1188c5d569c14cc70a)
-* Ability to set a specific field in the file's metadata using `--parse-metadata`
-* Ability to select n'th best format like `-f bv*.2`
-* [DiscoveryPlus] Add discoveryplus.in
-* [la7] Add podcasts and podcast playlists by [nixxo](https://github.com/nixxo)
-* [mildom] Update extractor with current proxy by [nao20010128nao](https://github.com/nao20010128nao)
-* [ard:mediathek] Fix video id extraction
-* [generic] Detect Invidious' link element
-* [youtube] Show premium state in `availability` by [coletdjnz](https://github.com/coletdjnz)
-* [viewsource] Add extractor to handle `view-source:`
-* [sponskrub] Run before embedding thumbnail
-* [docs] Improve `--parse-metadata` documentation
-
-
-### 2021.03.24.1
-* Revert [commit/8562218](https://github.com/ytdl-org/youtube-dl/commit/8562218350a79d4709da8593bb0c538aa0824acf)
-
-### 2021.03.24
-* Merge youtube-dl: Upto 2021.03.25 ([commit/8562218](https://github.com/ytdl-org/youtube-dl/commit/8562218350a79d4709da8593bb0c538aa0824acf))
-* Parse metadata from multiple fields using `--parse-metadata`
-* Ability to load playlist infojson using `--load-info-json`
-* Write current epoch to infojson when using `--no-clean-infojson`
-* [youtube_live_chat] fix bug when trying to set cookies
-* [niconico] Fix for when logged in by [CXwudi](https://github.com/CXwudi) and [xtkoba](https://github.com/xtkoba)
-* [linuxacadamy] Fix login
-
-
-### 2021.03.21
-* Merge youtube-dl: Upto [commit/7e79ba7](https://github.com/ytdl-org/youtube-dl/commit/7e79ba7dd6e6649dd2ce3a74004b2044f2182881)
-* Option `--no-clean-infojson` to keep private keys in the infojson
-* [aria2c] Support retry/abort unavailable fragments by [damianoamatruda](https://github.com/damianoamatruda)
-* [aria2c] Better default arguments
-* [movefiles] Fix bugs and make more robust
-* [formatSort] Fix `quality` being ignored
-* [splitchapters] Fix for older ffmpeg
-* [sponskrub] Pass proxy to sponskrub
-* Make sure `post_hook` gets the final filename
-* Recursively remove any private keys from infojson
-* Embed video URL metadata inside `mp4` by [damianoamatruda](https://github.com/damianoamatruda) and [pukkandan](https://github.com/pukkandan)
-* Merge `webm` formats into `mkv` if thumbnails are to be embedded by [damianoamatruda](https://github.com/damianoamatruda)
-* Use headers and cookies when downloading subtitles by [damianoamatruda](https://github.com/damianoamatruda)
-* Parse resolution in info dictionary by [damianoamatruda](https://github.com/damianoamatruda)
-* More consistent warning messages by [damianoamatruda](https://github.com/damianoamatruda) and [pukkandan](https://github.com/pukkandan)
-* [docs] Add deprecated options and aliases in readme
-* [docs] Fix some minor mistakes
-
-* [niconico] Partial fix adapted from [animelover1984/youtube-dl@b5eff52](https://github.com/animelover1984/youtube-dl/commit/b5eff52dd9ed5565672ea1694b38c9296db3fade) (login and smile formats still don't work)
-* [niconico] Add user extractor by [animelover1984](https://github.com/animelover1984)
-* [bilibili] Add anthology support by [animelover1984](https://github.com/animelover1984)
-* [amcnetworks] Fix extractor by [2ShedsJackson](https://github.com/2ShedsJackson)
-* [stitcher] Merge from youtube-dl by [nixxo](https://github.com/nixxo)
-* [rcs] Improved extraction by [nixxo](https://github.com/nixxo)
-* [linuxacadamy] Improve regex
-* [youtube] Show if video is `private`, `unlisted` etc in info (`availability`) by [coletdjnz](https://github.com/coletdjnz) and [pukkandan](https://github.com/pukkandan)
-* [youtube] bugfix for channel playlist extraction
-* [nbc] Improve metadata extraction by [2ShedsJackson](https://github.com/2ShedsJackson)
-
-
-### 2021.03.15
-* **Split video by chapters**: using option `--split-chapters`
-    * The output file of the split files can be set with `-o`/`-P` using the prefix `chapter:`
-    * Additional keys `section_title`, `section_number`, `section_start`, `section_end` are available in the output template
-* **Parallel fragment downloads** by [shirt](https://github.com/shirt-dev)
-    * Use option `--concurrent-fragments` (`-N`) to set the number of threads (default 1)
-* Merge youtube-dl: Upto [commit/3be0980](https://github.com/ytdl-org/youtube-dl/commit/3be098010f667b14075e3dfad1e74e5e2becc8ea)
-* [zee5] Add Show Extractor by [Ashish0804](https://github.com/Ashish0804) and [pukkandan](https://github.com/pukkandan)
-* [rai] fix drm check [nixxo](https://github.com/nixxo)
-* [wimtv] Add extractor by [nixxo](https://github.com/nixxo)
-* [mtv] Add mtv.it and extract series metadata by [nixxo](https://github.com/nixxo)
-* [pluto.tv] Add extractor by [kevinoconnor7](https://github.com/kevinoconnor7)
-* [youtube] Rewrite comment extraction by [coletdjnz](https://github.com/coletdjnz)
-* [embedthumbnail] Set mtime correctly
-* Refactor some postprocessor/downloader code by [pukkandan](https://github.com/pukkandan) and [shirt](https://github.com/shirt-dev)
-
-
-### 2021.03.07
-* [youtube] Fix history, mixes, community pages and trending by [pukkandan](https://github.com/pukkandan) and [coletdjnz](https://github.com/coletdjnz)
-* [youtube] Fix private feeds/playlists on multi-channel accounts by [coletdjnz](https://github.com/coletdjnz)
-* [youtube] Extract alerts from continuation by [coletdjnz](https://github.com/coletdjnz)
-* [cbs] Add support for ParamountPlus by [shirt](https://github.com/shirt-dev)
-* [mxplayer] Rewrite extractor with show support by [pukkandan](https://github.com/pukkandan) and [Ashish0804](https://github.com/Ashish0804)
-* [gedi] Improvements from youtube-dl by [nixxo](https://github.com/nixxo)
-* [vimeo] Fix videos with password by [teesid](https://github.com/teesid)
-* [lbry] Support `lbry://` url by [nixxo](https://github.com/nixxo)
-* [bilibili] Change `Accept` header by [pukkandan](https://github.com/pukkandan) and [animelover1984](https://github.com/animelover1984)
-* [trovo] Pass origin header
-* [rai] Check for DRM by [nixxo](https://github.com/nixxo)
-* [downloader] Fix bug for `ffmpeg`/`httpie`
-* [update] Fix updater removing the executable bit on some UNIX distros
-* [update] Fix current build hash for UNIX
-* [docs] Include wget/curl/aria2c install instructions for Unix by [Ashish0804](https://github.com/Ashish0804)
-* Fix some videos downloading with `m3u8` extension
-* Remove "fixup is ignored" warning when fixup wasn't passed by user
-
-
-### 2021.03.03.2
-* [build] Fix bug
-
 ### 2021.03.03
-* [youtube] Use new browse API for continuation page extraction by [coletdjnz](https://github.com/coletdjnz) and [pukkandan](https://github.com/pukkandan)
+* [youtube] Use new browse API for continuation page extraction by @colethedj and @pukkandan
-* Fix HLS playlist downloading by [shirt](https://github.com/shirt-dev)
+* Fix HLS playlist downloading by @shirt
-* Merge youtube-dl: Upto [2021.03.03](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.03.03)
+* **Merge youtube-dl:** Upto [2021.03.03](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.03.03)
 * [mtv] Fix extractor
-* [nick] Fix extractor by [DennyDai](https://github.com/DennyDai)
+* [nick] Fix extractor by @DennyDai
-* [mxplayer] Add new extractor by [codeasashu](https://github.com/codeasashu)
+* [mxplayer] Add new extractor by@codeasashu
 * [youtube] Throw error when `--extractor-retries` are exhausted
 * Reduce default of `--extractor-retries` to 3
-* Fix packaging bugs by [hseg](https://github.com/hseg)
+* Fix packaging bugs by @hseg
 
 
 ### 2021.03.01
@@ -757,10 +55,10 @@ ### 2021.02.24
 * Moved project to an organization [yt-dlp](https://github.com/yt-dlp)
 * **Completely changed project name to yt-dlp** by [Pccode66](https://github.com/Pccode66) and [pukkandan](https://github.com/pukkandan)
     * Also, `youtube-dlc` config files are no longer loaded
-* Merge youtube-dl: Upto [commit/4460329](https://github.com/ytdl-org/youtube-dl/commit/44603290e5002153f3ebad6230cc73aef42cc2cd) (except tmz, gedi)
+* **Merge youtube-dl:** Upto [commit/4460329](https://github.com/ytdl-org/youtube-dl/commit/44603290e5002153f3ebad6230cc73aef42cc2cd) (except tmz, gedi)
 * [Readthedocs](https://yt-dlp.readthedocs.io) support by [shirt](https://github.com/shirt-dev)
 * [youtube] Show if video was a live stream in info (`was_live`)
-* [Zee5] Add new extractor by [Ashish0804](https://github.com/Ashish0804) and [pukkandan](https://github.com/pukkandan)
+* [Zee5] Add new extractor by [Ashish](https://github.com/Ashish) and [pukkandan](https://github.com/pukkandan)
 * [jwplatform] Add support for `hyland.com`
 * [tennistv] Fix extractor
 * [hls] Support media initialization by [shirt](https://github.com/shirt-dev)
@@ -768,14 +66,14 @@ ### 2021.02.24
 * [ffmpeg] Allow passing custom arguments before -i using `--ppa "ffmpeg_i1:ARGS"` syntax
 * Fix `--windows-filenames` removing `/` from UNIX paths
 * [hls] Show warning if pycryptodome is not found
-* [docs] Improvements
+* [documentation] Improvements
     * Fix documentation of `Extractor Options`
     * Document `all` in format selection
     * Document `playable_in_embed` in output templates
 
 
 ### 2021.02.19
-* Merge youtube-dl: Upto [commit/cf2dbec](https://github.com/ytdl-org/youtube-dl/commit/cf2dbec6301177a1fddf72862de05fa912d9869d) (except kakao)
+* **Merge youtube-dl:** Upto [commit/cf2dbec](https://github.com/ytdl-org/youtube-dl/commit/cf2dbec6301177a1fddf72862de05fa912d9869d) (except kakao)
 * [viki] Fix extractor
 * [niconico] Extract `channel` and `channel_id` by [kurumigi](https://github.com/kurumigi)
 * [youtube] Multiple page support for hashtag URLs
@@ -796,12 +94,12 @@ ### 2021.02.19
     * Exclude `vcruntime140.dll` from UPX by [jbruchon](https://github.com/jbruchon)
     * Set version number based on UTC time, not local time
     * Publish on PyPi only if token is set
-* [docs] Better document `--prefer-free-formats` and add `--no-prefer-free-format`
+* [documentation] Better document `--prefer-free-formats` and add `--no-prefer-free-format`
 
 
 ### 2021.02.15
-* Merge youtube-dl: Upto [2021.02.10](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.02.10) (except archive.org)
+* **Merge youtube-dl:** Upto [2021.02.10](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.02.10) (except archive.org)
-* [niconico] Improved extraction and support encrypted/SMILE movies by [kurumigi](https://github.com/kurumigi), [tsukumijima](https://github.com/tsukumijima), [bbepis](https://github.com/bbepis), [pukkandan](https://github.com/pukkandan)
+* [niconico] Improved extraction and support encrypted/SMILE movies by [kurumigi](https://github.com/kurumigi), [tsukumi](https://github.com/tsukumi), [bbepis](https://github.com/bbepis), [pukkandan](https://github.com/pukkandan)
 * Fix HLS AES-128 with multiple keys in external downloaders by [shirt](https://github.com/shirt-dev)
 * [youtube_live_chat] Fix by using POST API by [siikamiika](https://github.com/siikamiika)
 * [rumble] Add support for video page
@@ -839,11 +137,11 @@ ### 2021.02.09
 * [movefiles] Fix compatibility with python2
 * [remuxvideo] Fix validation of conditional remux
 * [sponskrub] Don't raise error when the video does not exist
-* [docs] Crypto is an optional dependency
+* [documentation] Crypto is an optional dependency
 
 
 ### 2021.02.04
-* Merge youtube-dl: Upto [2021.02.04.1](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.02.04.1)
+* **Merge youtube-dl:** Upto [2021.02.04.1](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.02.04.1)
 * **Date/time formatting in output template:**
     * You can use [`strftime`](https://docs.python.org/3/library/datetime.html#strftime-and-strptime-format-codes) to format date/time fields. Example: `%(upload_date>%Y-%m-%d)s`
 * **Multiple output templates:**
@@ -897,13 +195,13 @@ ### 2021.01.29
 
 
 ### 2021.01.24
-* Merge youtube-dl: Upto [2021.01.24](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.01.16)
+* **Merge youtube-dl:** Upto [2021.01.24](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.01.16)
 * Plugin support ([documentation](https://github.com/yt-dlp/yt-dlp#plugins))
 * **Multiple paths**: New option `-P`/`--paths` to give different paths for different types of files
-    * The syntax is `-P "type:path" -P "type:path"`
+    * The syntax is `-P "type:path" -P "type:path"` ([documentation](https://github.com/yt-dlp/yt-dlp#:~:text=-P,%20--paths%20TYPE:PATH))
     * Valid types are: home, temp, description, annotation, subtitle, infojson, thumbnail
-    * Additionally, configuration file is taken from home directory or current directory
+    * Additionally, configuration file is taken from home directory or current directory ([documentation](https://github.com/yt-dlp/yt-dlp#:~:text=Home%20Configuration))
-* Allow passing different arguments to different external downloaders
+* Allow passing different arguments to different external downloaders ([documentation](https://github.com/yt-dlp/yt-dlp#:~:text=--downloader-args%20NAME:ARGS))
 * [mildom] Add extractor by [nao20010128nao](https://github.com/nao20010128nao)
 * Warn when using old style `--external-downloader-args` and `--post-processor-args`
 * Fix `--no-overwrite` when using `--write-link`
@@ -926,7 +224,7 @@ ### 2021.01.20
 
 
 ### 2021.01.16
-* Merge youtube-dl: Upto [2021.01.16](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.01.16)
+* **Merge youtube-dl:** Upto [2021.01.16](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.01.16)
 * **Configuration files:**
     * Portable configuration file: `./yt-dlp.conf`
     * Allow the configuration files to be named `yt-dlp` instead of `youtube-dlc`. See [this](https://github.com/yt-dlp/yt-dlp#configuration) for details
@@ -938,9 +236,9 @@ ### 2021.01.14
 * [roosterteeth.com] Fix for bonus episodes by [Zocker1999NET](https://github.com/Zocker1999NET)
 * [tiktok] Fix for when share_info is empty
 * [EmbedThumbnail] Fix bug due to incorrect function name
-* [docs] Changed sponskrub links to point to [yt-dlp/SponSkrub](https://github.com/yt-dlp/SponSkrub) since I am now providing both linux and windows releases
+* [documentation] Changed sponskrub links to point to [yt-dlp/SponSkrub](https://github.com/yt-dlp/SponSkrub) since I am now providing both linux and windows releases
-* [docs] Change all links to correctly point to new fork URL
+* [documentation] Change all links to correctly point to new fork URL
-* [docs] Fixes typos
+* [documentation] Fixes typos
 
 
 ### 2021.01.12
@@ -956,7 +254,7 @@ ### 2021.01.10
 * [archive.org] Fix extractor and add support for audio and playlists by [wporr](https://github.com/wporr)
 * [Animelab] Added by [mariuszskon](https://github.com/mariuszskon)
 * [youtube:search] Fix view_count by [ohnonot](https://github.com/ohnonot)
-* [youtube] Show if video is embeddable in info (`playable_in_embed`)
+* [youtube] Show if video is embeddable in info
 * Update version badge automatically in README
 * Enable `test_youtube_search_matching`
 * Create `to_screen` and similar functions in postprocessor/common
@@ -972,8 +270,9 @@ ### 2021.01.09
 
 
 ### 2021.01.08
-* Merge youtube-dl: Upto [2021.01.08](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.01.08) except stitcher ([1](https://github.com/ytdl-org/youtube-dl/commit/bb38a1215718cdf36d73ff0a7830a64cd9fa37cc), [2](https://github.com/ytdl-org/youtube-dl/commit/a563c97c5cddf55f8989ed7ea8314ef78e30107f))
+* **Merge youtube-dl:** Upto [2021.01.08](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.01.08)
-* Moved changelog to separate file
+    * Extractor stitcher ([1](https://github.com/ytdl-org/youtube-dl/commit/bb38a1215718cdf36d73ff0a7830a64cd9fa37cc), [2](https://github.com/ytdl-org/youtube-dl/commit/a563c97c5cddf55f8989ed7ea8314ef78e30107f)) have not been merged
+* Moved changelog to seperate file
 
 
 ### 2021.01.07-1
@@ -1011,7 +310,7 @@ ### 2021.01.05
     * Changed video format sorting to show video only files and video+audio files together.
     * Added `--video-multistreams`, `--no-video-multistreams`, `--audio-multistreams`, `--no-audio-multistreams`
     * Added `b`,`w`,`v`,`a` as alias for `best`, `worst`, `video` and `audio` respectively
-* Shortcut Options: Added `--write-link`, `--write-url-link`, `--write-webloc-link`, `--write-desktop-link` by [h-h-h-h](https://github.com/h-h-h-h) - See [Internet Shortcut Options](README.md#internet-shortcut-options) for details
+* **Shortcut Options:** Added `--write-link`, `--write-url-link`, `--write-webloc-link`, `--write-desktop-link` by [h-h-h-h](https://github.com/h-h-h-h) - See [Internet Shortcut Options](README.md#internet-shortcut-options) for details
 * **Sponskrub integration:** Added `--sponskrub`, `--sponskrub-cut`, `--sponskrub-force`, `--sponskrub-location`, `--sponskrub-args` - See [SponSkrub Options](README.md#sponskrub-sponsorblock-options) for details
 * Added `--force-download-archive` (`--force-write-archive`) by [h-h-h-h](https://github.com/h-h-h-h)
 * Added `--list-formats-as-table`,  `--list-formats-old`
@@ -1021,38 +320,36 @@ ### 2021.01.05
 * Relaxed validation for format filters so that any arbitrary field can be used
 * Fix for embedding thumbnail in mp3 by [pauldubois98](https://github.com/pauldubois98) ([ytdl-org/youtube-dl#21569](https://github.com/ytdl-org/youtube-dl/pull/21569))
 * Make Twitch Video ID output from Playlist and VOD extractor same. This is only a temporary fix
-* Merge youtube-dl: Upto [2021.01.03](https://github.com/ytdl-org/youtube-dl/commit/8e953dcbb10a1a42f4e12e4e132657cb0100a1f8) - See [blackjack4494/yt-dlc#280](https://github.com/blackjack4494/yt-dlc/pull/280) for details
+* **Merge youtube-dl:** Upto [2021.01.03](https://github.com/ytdl-org/youtube-dl/commit/8e953dcbb10a1a42f4e12e4e132657cb0100a1f8) - See [blackjack4494/yt-dlc#280](https://github.com/blackjack4494/yt-dlc/pull/280) for details
     * Extractors [tiktok](https://github.com/ytdl-org/youtube-dl/commit/fb626c05867deab04425bad0c0b16b55473841a2) and [hotstar](https://github.com/ytdl-org/youtube-dl/commit/bb38a1215718cdf36d73ff0a7830a64cd9fa37cc) have not been merged
 * Cleaned up the fork for public use
 
 
-**PS**: All uncredited changes above this point are authored by [pukkandan](https://github.com/pukkandan)
-
 ### Unreleased changes in [blackjack4494/yt-dlc](https://github.com/blackjack4494/yt-dlc)
-* Updated to youtube-dl release 2020.11.26 by [pukkandan](https://github.com/pukkandan)
+* Updated to youtube-dl release 2020.11.26
-* Youtube improvements by [pukkandan](https://github.com/pukkandan)
+* [youtube]
     * Implemented all Youtube Feeds (ytfav, ytwatchlater, ytsubs, ythistory, ytrec) and SearchURL
+    * Fix ytsearch not returning results sometimes due to promoted content
+    * Temporary fix for automatic captions - disable json3
     * Fix some improper Youtube URLs
     * Redirect channel home to /video
     * Print youtube's warning message
-    * Handle Multiple pages for feeds better
+    * Multiple pages are handled better for feeds
-* [youtube] Fix ytsearch not returning results sometimes due to promoted content by [coletdjnz](https://github.com/coletdjnz)
-* [youtube] Temporary fix for automatic captions - disable json3 by [blackjack4494](https://github.com/blackjack4494)
 * Add --break-on-existing by [gergesh](https://github.com/gergesh)
-* Pre-check video IDs in the archive before downloading by [pukkandan](https://github.com/pukkandan)
+* Pre-check video IDs in the archive before downloading
-* [bitwave.tv] New extractor by [lorpus](https://github.com/lorpus)
+* [bitwave.tv] New extractor
-* [Gedi] Add extractor by [nixxo](https://github.com/nixxo)
+* [Gedi] Add extractor
-* [Rcs] Add new extractor by [nixxo](https://github.com/nixxo)
+* [Rcs] Add new extractor
-* [skyit] New skyitalia extractor by [nixxo](https://github.com/nixxo)
+* [skyit] Add support for multiple Sky Italia website and removed old skyitalia extractor
-* [france.tv] Fix thumbnail URL by [renalid](https://github.com/renalid)
+* [france.tv] Fix thumbnail URL
-* [ina] support mobile links by [B0pol](https://github.com/B0pol)
+* [ina] support mobile links
-* [instagram] Fix thumbnail extractor by [nao20010128nao](https://github.com/nao20010128nao)
+* [instagram] Fix extractor
-* [SouthparkDe] Support for English URLs by [xypwn](https://github.com/xypwn)
+* [itv] BTCC new pages' URL update (articles instead of races)
-* [spreaker] fix SpreakerShowIE test URL by [pukkandan](https://github.com/pukkandan)
+* [SouthparkDe] Support for English URLs
-* [Vlive] Fix playlist handling when downloading a channel by [kyuyeunk](https://github.com/kyuyeunk)
+* [spreaker] fix SpreakerShowIE test URL
-* [tmz] Fix extractor by [diegorodriguezv](https://github.com/diegorodriguezv)
+* [Vlive] Fix playlist handling when downloading a channel
-* [generic] Detect embedded bitchute videos by [pukkandan](https://github.com/pukkandan)
+* [generic] Detect embedded bitchute videos
-* [generic] Extract embedded youtube and twitter videos by [diegorodriguezv](https://github.com/diegorodriguezv)
+* [generic] Extract embedded youtube and twitter videos
-* [ffmpeg] Ensure all streams are copied by [pukkandan](https://github.com/pukkandan)
+* [ffmpeg] Ensure all streams are copied
-* [embedthumbnail] Fix for os.rename error by [pukkandan](https://github.com/pukkandan)
+* Fix for os.rename error when embedding thumbnail to video in a different drive
-* make_win.bat: don't use UPX to pack vcruntime140.dll by [jbruchon](https://github.com/jbruchon)
+* make_win.bat: don't use UPX to pack vcruntime140.dll

Collaborators.md

@@ -1,39 +0,0 @@
-# Collaborators
-
-This is a list of the collaborators of the project and their major contributions. See the [Changelog](Changelog.md) for more details.
-
-You can also find lists of all [contributors of yt-dlp](CONTRIBUTORS) and [authors of youtube-dl](https://github.com/ytdl-org/youtube-dl/blob/master/AUTHORS)
-
-
-## [pukkandan](https://github.com/pukkandan)
-
-[![ko-fi](https://img.shields.io/badge/_-Ko--fi-red.svg?logo=kofi&labelColor=555555&style=for-the-badge)](https://ko-fi.com/pukkandan)
-
-* Owner of the fork
-
-
-
-## [shirt](https://github.com/shirt-dev)
-
-[![ko-fi](https://img.shields.io/badge/_-Ko--fi-red.svg?logo=kofi&labelColor=555555&style=for-the-badge)](https://ko-fi.com/shirt)
-
-* Multithreading (`-N`) and aria2c support for fragment downloads
-* Support for media initialization and discontinuity in HLS
-* The self-updater (`-U`)
-
-
-
-## [coletdjnz](https://github.com/coletdjnz)
-
-[![gh-sponsor](https://img.shields.io/badge/_-Sponsor-red.svg?logo=githubsponsors&labelColor=555555&style=for-the-badge)](https://github.com/sponsors/coletdjnz)
-
-* YouTube improvements including: age-gate bypass, private playlists, multiple-clients (to avoid throttling) and a lot of under-the-hood improvements
-
-
-
-## [Ashish0804](https://github.com/Ashish0804)
-
-[![ko-fi](https://img.shields.io/badge/_-Ko--fi-red.svg?logo=kofi&labelColor=555555&style=for-the-badge)](https://ko-fi.com/ashish0804)
-
-* Added support for new websites Zee5, MXPlayer, DiscoveryPlusIndia, ShemarooMe, Utreon etc
-* Added playlist/series downloads for TubiTv, SonyLIV, Voot, HotStar etc

Makefile

@@ -1,4 +1,4 @@
-all: yt-dlp doc pypi-files
+all: yt-dlp doc
 clean: clean-test clean-dist clean-cache
 completions: completion-bash completion-fish completion-zsh
 doc: README.md CONTRIBUTING.md issuetemplates supportedsites
@@ -13,7 +13,7 @@ pypi-files: AUTHORS Changelog.md LICENSE README.md README.txt supportedsites com
 .PHONY: all clean install test tar pypi-files completions ot offlinetest codetest supportedsites
 
 clean-test:
-	rm -rf *.dump *.part* *.ytdl *.info.json *.mp4 *.m4a *.flv *.mp3 *.avi *.mkv *.webm *.3gp *.wav *.ape *.swf *.jpg *.png *.frag *.frag.urls *.frag.aria2 test/testdata/player-*.js *.opus *.webp *.ttml *.vtt *.jpeg
+	rm -rf *.dump *.part* *.ytdl *.info.json *.mp4 *.m4a *.flv *.mp3 *.avi *.mkv *.webm *.3gp *.wav *.ape *.swf *.jpg *.png *.frag *.frag.urls *.frag.aria2
 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 .mailmap
 clean-cache:
@@ -25,7 +25,6 @@ completion-zsh: completions/zsh/_yt-dlp
 lazy-extractors: yt_dlp/extractor/lazy_extractors.py
 
 PREFIX ?= /usr/local
-DESTDIR ?= .
 BINDIR ?= $(PREFIX)/bin
 MANDIR ?= $(PREFIX)/man
 SHAREDIR ?= $(PREFIX)/share
@@ -49,11 +48,23 @@ codetest:
 	flake8 .
 
 test:
-	$(PYTHON) -m pytest
+	#nosetests --with-coverage --cover-package=yt_dlp --cover-html --verbose --processes 4 test
+	nosetests --verbose test
 	$(MAKE) codetest
 
+# Keep this list in sync with devscripts/run_tests.sh
 offlinetest: codetest
-	$(PYTHON) -m pytest -k "not download"
+	$(PYTHON) -m nose --verbose test \
+		--exclude test_age_restriction.py \
+		--exclude test_download.py \
+		--exclude test_iqiyi_sdk_interpreter.py \
+		--exclude test_overwrites.py \
+		--exclude test_socks.py \
+		--exclude test_subtitles.py \
+		--exclude test_write_annotations.py \
+		--exclude test_youtube_lists.py \
+		--exclude test_youtube_signature.py \
+		--exclude test_post_hooks.py
 
 yt-dlp: yt_dlp/*.py yt_dlp/*/*.py
 	mkdir -p zip
@@ -110,7 +121,7 @@ _EXTRACTOR_FILES = $(shell find yt_dlp/extractor -iname '*.py' -and -not -iname
 yt_dlp/extractor/lazy_extractors.py: devscripts/make_lazy_extractors.py devscripts/lazy_load_template.py $(_EXTRACTOR_FILES)
 	$(PYTHON) devscripts/make_lazy_extractors.py $@
 
-yt-dlp.tar.gz: yt-dlp README.md supportedsites.md yt-dlp.1 completions Changelog.md AUTHORS
+yt-dlp.tar.gz: README.md yt-dlp.1 completions Changelog.md AUTHORS
 	@tar -czf $(DESTDIR)/yt-dlp.tar.gz --transform "s|^|yt-dlp/|" --owner 0 --group 0 \
 		--exclude '*.DS_Store' \
 		--exclude '*.kate-swp' \
@@ -124,7 +135,7 @@ yt-dlp.tar.gz: yt-dlp README.md supportedsites.md yt-dlp.1 completions Changelog
 		devscripts test \
 		Changelog.md AUTHORS LICENSE README.md supportedsites.md \
 		Makefile MANIFEST.in yt-dlp.1 completions \
-		setup.py setup.cfg yt-dlp yt_dlp
+		setup.py setup.cfg yt-dlp
 
 AUTHORS: .mailmap
 	git shortlog -s -n | cut -f2 | sort > AUTHORS

devscripts/bash-completion.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals
 
 import os

devscripts/buildserver.py

@@ -1,5 +1,3 @@
-# UNUSED
-
 #!/usr/bin/python3
 
 import argparse

devscripts/check-porn.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals
 
 """

devscripts/create-github-release.py

@@ -1,6 +1,6 @@
 # Unused
 
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals
 
 import io

devscripts/fish-completion.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals
 
 import optparse

devscripts/generate_aes_testdata.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 from __future__ import unicode_literals
 
 import codecs

devscripts/gh-pages/update-copyright.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # coding: utf-8
 
 from __future__ import with_statement, unicode_literals

devscripts/lazy_load_template.py

@@ -1,25 +1,19 @@
 # coding: utf-8
+from __future__ import unicode_literals
+
 import re
 
 
-class LazyLoadMetaClass(type):
+class LazyLoadExtractor(object):
-    def __getattr__(cls, name):
-        return getattr(cls._get_real_class(), name)
-
-
-class LazyLoadExtractor(metaclass=LazyLoadMetaClass):
     _module = None
-    _WORKING = True
 
     @classmethod
-    def _get_real_class(cls):
+    def ie_key(cls):
-        if '__real_class' not in cls.__dict__:
+        return cls.__name__[:-2]
-            mod = __import__(cls._module, fromlist=(cls.__name__,))
-            cls.__real_class = getattr(mod, cls.__name__)
-        return cls.__real_class
 
     def __new__(cls, *args, **kwargs):
-        real_cls = cls._get_real_class()
+        mod = __import__(cls._module, fromlist=(cls.__name__,))
+        real_cls = getattr(mod, cls.__name__)
         instance = real_cls.__new__(real_cls)
         instance.__init__(*args, **kwargs)
         return instance

devscripts/make_contributing.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals
 
 # import io

devscripts/make_issue_template.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals
 
 import io

devscripts/make_lazy_extractors.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 from __future__ import unicode_literals, print_function
 
 from inspect import getsource
@@ -15,29 +14,19 @@
 if os.path.exists(lazy_extractors_filename):
     os.remove(lazy_extractors_filename)
 
-# Block plugins from loading
-plugins_dirname = 'ytdlp_plugins'
-plugins_blocked_dirname = 'ytdlp_plugins_blocked'
-if os.path.exists(plugins_dirname):
-    os.rename(plugins_dirname, plugins_blocked_dirname)
-
 from yt_dlp.extractor import _ALL_CLASSES
 from yt_dlp.extractor.common import InfoExtractor, SearchInfoExtractor
 
-if os.path.exists(plugins_blocked_dirname):
-    os.rename(plugins_blocked_dirname, plugins_dirname)
-
 with open('devscripts/lazy_load_template.py', 'rt') as f:
     module_template = f.read()
 
-CLASS_PROPERTIES = ['ie_key', 'working', '_match_valid_url', 'suitable', '_match_id', 'get_temp_id']
 module_contents = [
-    module_template,
+    module_template + '\n' + getsource(InfoExtractor.suitable) + '\n',
-    *[getsource(getattr(InfoExtractor, k)) for k in CLASS_PROPERTIES],
+    'class LazyLoadSearchExtractor(LazyLoadExtractor):\n    pass\n']
-    '\nclass LazyLoadSearchExtractor(LazyLoadExtractor):\n    pass\n']
 
 ie_template = '''
 class {name}({bases}):
+    _VALID_URL = {valid_url!r}
     _module = '{module}'
 '''
 
@@ -58,17 +47,14 @@ def get_base_name(base):
 
 
 def build_lazy_ie(ie, name):
+    valid_url = getattr(ie, '_VALID_URL', None)
     s = ie_template.format(
         name=name,
         bases=', '.join(map(get_base_name, ie.__bases__)),
+        valid_url=valid_url,
         module=ie.__module__)
-    valid_url = getattr(ie, '_VALID_URL', None)
-    if valid_url:
-        s += f'    _VALID_URL = {valid_url!r}\n'
-    if not ie._WORKING:
-        s += '    _WORKING = False\n'
     if ie.suitable.__func__ is not InfoExtractor.suitable.__func__:
-        s += f'\n{getsource(ie.suitable)}'
+        s += '\n' + getsource(ie.suitable)
     if hasattr(ie, '_make_valid_url'):
         # search extractors
         s += make_valid_template.format(valid_url=ie._make_valid_url())
@@ -106,7 +92,7 @@ def build_lazy_ie(ie, name):
         names.append(name)
 
 module_contents.append(
-    '\n_ALL_CLASSES = [{0}]'.format(', '.join(names)))
+    '_ALL_CLASSES = [{0}]'.format(', '.join(names)))
 
 module_src = '\n'.join(module_contents) + '\n'
 

devscripts/make_readme.py

@@ -1,8 +1,3 @@
-#!/usr/bin/env python3
-
-# yt-dlp --help | make_readme.py
-# This must be run in a console of correct width
-
 from __future__ import unicode_literals
 
 import io

devscripts/make_supportedsites.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals
 
 import io

devscripts/prepare_manpage.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 from __future__ import unicode_literals
 
 import io

devscripts/release.sh

@@ -1,5 +1,4 @@
 # Unused
-
 #!/bin/bash
 
 # IMPORTANT: the following assumptions are made

devscripts/run_tests.bat

@@ -1,16 +1,17 @@
-@setlocal
 @echo off
-cd /d %~dp0..
 
-if ["%~1"]==[""] (
+rem Keep this list in sync with the `offlinetest` target in Makefile
-    set "test_set="
+set DOWNLOAD_TESTS="age_restriction^|download^|iqiyi_sdk_interpreter^|socks^|subtitles^|write_annotations^|youtube_lists^|youtube_signature^|post_hooks"
-) else if ["%~1"]==["core"] (
+
-    set "test_set=-k "not download""
+if "%YTDL_TEST_SET%" == "core" (
-) else if ["%~1"]==["download"] (
+    set test_set="-I test_("%DOWNLOAD_TESTS%")\.py"
-    set "test_set=-k download"
+    set multiprocess_args=""
+) else if "%YTDL_TEST_SET%" == "download" (
+    set test_set="-I test_(?!"%DOWNLOAD_TESTS%").+\.py"
+    set multiprocess_args="--processes=4 --process-timeout=540"
 ) else (
-    echo.Invalid test type "%~1". Use "core" ^| "download"
+    echo YTDL_TEST_SET is not set or invalid
     exit /b 1
 )
 
-pytest %test_set%
+nosetests test --verbose %test_set:"=% %multiprocess_args:"=%

devscripts/run_tests.sh

@@ -1,14 +1,22 @@
-#!/bin/sh
+#!/bin/bash
 
-if [ -z $1 ]; then
+# Keep this list in sync with the `offlinetest` target in Makefile
-    test_set='test'
+DOWNLOAD_TESTS="age_restriction|download|iqiyi_sdk_interpreter|overwrites|socks|subtitles|write_annotations|youtube_lists|youtube_signature|post_hooks"
-elif [ $1 = 'core' ]; then
-    test_set='not download'
-elif [ $1 = 'download' ]; then
-    test_set='download'
-else
-    echo 'Invalid test type "'$1'". Use "core" | "download"'
-    exit 1
-fi
 
-python3 -m pytest -k "$test_set"
+test_set=""
+multiprocess_args=""
+
+case "$YTDL_TEST_SET" in
+    core)
+        test_set="-I test_($DOWNLOAD_TESTS)\.py"
+    ;;
+    download)
+        test_set="-I test_(?!$DOWNLOAD_TESTS).+\.py"
+        multiprocess_args="--processes=4 --process-timeout=540"
+    ;;
+    *)
+        break
+    ;;
+esac
+
+nosetests test --verbose $test_set $multiprocess_args

devscripts/show-downloads-statistics.py

@@ -1,6 +1,6 @@
 # Unused
 
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals
 
 import itertools

devscripts/update-formulae.py

@@ -1,37 +0,0 @@
-#!/usr/bin/env python3
-from __future__ import unicode_literals
-
-import json
-import os
-import re
-import sys
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-from yt_dlp.compat import compat_urllib_request
-
-
-# usage: python3 ./devscripts/update-formulae.py <path-to-formulae-rb> <version>
-# version can be either 0-aligned (yt-dlp version) or normalized (PyPl version)
-
-filename, version = sys.argv[1:]
-
-normalized_version = '.'.join(str(int(x)) for x in version.split('.'))
-
-pypi_release = json.loads(compat_urllib_request.urlopen(
-    'https://pypi.org/pypi/yt-dlp/%s/json' % normalized_version
-).read().decode('utf-8'))
-
-tarball_file = next(x for x in pypi_release['urls'] if x['filename'].endswith('.tar.gz'))
-
-sha256sum = tarball_file['digests']['sha256']
-url = tarball_file['url']
-
-with open(filename, 'r') as r:
-    formulae_text = r.read()
-
-formulae_text = re.sub(r'sha256 "[0-9a-f]*?"', 'sha256 "%s"' % sha256sum, formulae_text)
-formulae_text = re.sub(r'url "[^"]*?"', 'url "%s"' % url, formulae_text)
-
-with open(filename, 'w') as w:
-    w.write(formulae_text)

devscripts/update-version.py

@@ -1,6 +1,4 @@
-#!/usr/bin/env python3
 from __future__ import unicode_literals
-
 from datetime import datetime
 # import urllib.request
 

devscripts/wine-py2exe.sh

@@ -1,5 +1,3 @@
-# UNUSED
-
 #!/bin/bash
 
 # Run with as parameter a setup.py that works in the current directory

devscripts/zsh-completion.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals
 
 import os

docs/Collaborators.md

@@ -1,5 +0,0 @@
----
-orphan: true
----
-```{include} ../Collaborators.md
-```

pyinst.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # coding: utf-8
 
 from __future__ import unicode_literals
@@ -6,7 +6,6 @@
 # import os
 import platform
 
-from PyInstaller.utils.hooks import collect_submodules
 from PyInstaller.utils.win32.versioninfo import (
     VarStruct, VarFileInfo, StringStruct, StringTable,
     StringFileInfo, FixedFileInfo, VSVersionInfo, SetVersion,
@@ -18,7 +17,7 @@
 print('Building %sbit version' % arch)
 _x86 = '_x86' if arch == '32' else ''
 
-FILE_DESCRIPTION = 'yt-dlp%s' % (' (32 Bit)' if _x86 else '')
+FILE_DESCRIPTION = 'Media Downloader%s' % (' (32 Bit)' if _x86 else '')
 
 # root_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
 # print('Changing working directory to %s' % root_dir)
@@ -59,23 +58,21 @@
                     ),
                     StringStruct('OriginalFilename', 'yt-dlp%s.exe' % _x86),
                     StringStruct('ProductName', 'yt-dlp%s' % _x86),
-                    StringStruct(
+                    StringStruct('ProductVersion', '%s%s' % (VERSION, _x86)),
-                        'ProductVersion',
-                        '%s%s on Python %s' % (VERSION, _x86, platform.python_version())),
                 ])]),
         VarFileInfo([VarStruct('Translation', [0, 1200])])
     ]
 )
 
-dependancies = ['Crypto', 'mutagen'] + collect_submodules('websockets')
-excluded_modules = ['test', 'ytdlp_plugins', 'youtube-dl', 'youtube-dlc']
-
 PyInstaller.__main__.run([
     '--name=yt-dlp%s' % _x86,
     '--onefile',
-    '--icon=devscripts/logo.ico',
+    '--icon=devscripts/cloud.ico',
-    *[f'--exclude-module={module}' for module in excluded_modules],
+    '--exclude-module=youtube_dl',
-    *[f'--hidden-import={module}' for module in dependancies],
+    '--exclude-module=test',
+    '--exclude-module=ytdlp_plugins',
+    '--hidden-import=mutagen',
+    '--hidden-import=Crypto',
     '--upx-exclude=vcruntime140.dll',
     'yt_dlp/__main__.py',
 ])

pytest.ini

@@ -1,4 +0,0 @@
-[pytest]
-addopts = -ra -v --strict-markers
-markers =
-    download

requirements.txt

@@ -1,3 +1,2 @@
 mutagen
 pycryptodome
-websockets

setup.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # coding: utf-8
 
 from setuptools import setup, Command, find_packages
@@ -9,22 +9,23 @@
 
 
 # Get the version from yt_dlp/version.py without importing the package
-exec(compile(open('yt_dlp/version.py').read(), 'yt_dlp/version.py', 'exec'))
+exec(compile(open('yt_dlp/version.py').read(),
+             'yt_dlp/version.py', 'exec'))
 
 
 DESCRIPTION = 'Command-line program to download videos from YouTube.com and many other other video platforms.'
 
 LONG_DESCRIPTION = '\n\n'.join((
     'Official repository: <https://github.com/yt-dlp/yt-dlp>',
-    '**PS**: Some links in this document will not work since this is a copy of the README.md from Github',
+    '**PS**: Many links in this document will not work since this is a copy of the README.md from Github',
-    open('README.md', 'r', encoding='utf-8').read()))
+    open("README.md", "r", encoding="utf-8").read()))
 
-REQUIREMENTS = ['mutagen', 'pycryptodome', 'websockets']
+REQUIREMENTS = ['mutagen', 'pycryptodome']
-
-if sys.argv[1:2] == ['py2exe']:
-    raise NotImplementedError('py2exe is not currently supported; instead, use "pyinst.py" to build with pyinstaller')
 
 
+if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
+    print("inv")
+else:
     files_spec = [
         ('share/bash-completion/completions', ['completions/bash/yt-dlp']),
         ('share/zsh/site-functions', ['completions/zsh/_yt-dlp']),
@@ -38,7 +39,7 @@
         resfiles = []
         for fn in files:
             if not os.path.exists(fn):
-            warnings.warn('Skipping file %s since it is not present. Try running `make pypi-files` first' % fn)
+                warnings.warn('Skipping file %s since it is not present. Try running `make pypi-files` first.' % fn)
             else:
                 resfiles.append(fn)
         data_files.append((dirname, resfiles))
@@ -60,21 +61,23 @@ def finalize_options(self):
         pass
 
     def run(self):
-        spawn([sys.executable, 'devscripts/make_lazy_extractors.py', 'yt_dlp/extractor/lazy_extractors.py'],
+        spawn(
-              dry_run=self.dry_run)
+            [sys.executable, 'devscripts/make_lazy_extractors.py', 'yt_dlp/extractor/lazy_extractors.py'],
+            dry_run=self.dry_run,
+        )
 
 
-packages = find_packages(exclude=('youtube_dl', 'test', 'ytdlp_plugins'))
+packages = find_packages(exclude=("youtube_dl", "test", "ytdlp_plugins"))
 
 setup(
-    name='yt-dlp',
+    name="yt-dlp",
     version=__version__,
-    maintainer='pukkandan',
+    maintainer="pukkandan",
-    maintainer_email='pukkandan.ytdlp@gmail.com',
+    maintainer_email="pukkandan.ytdlp@gmail.com",
     description=DESCRIPTION,
     long_description=LONG_DESCRIPTION,
-    long_description_content_type='text/markdown',
+    long_description_content_type="text/markdown",
-    url='https://github.com/yt-dlp/yt-dlp',
+    url="https://github.com/yt-dlp/yt-dlp",
     packages=packages,
     install_requires=REQUIREMENTS,
     project_urls={
@@ -84,20 +87,30 @@ def run(self):
         #'Funding': 'https://donate.pypi.org',
     },
     classifiers=[
-        'Topic :: Multimedia :: Video',
+        "Topic :: Multimedia :: Video",
-        'Development Status :: 5 - Production/Stable',
+        "Development Status :: 5 - Production/Stable",
-        'Environment :: Console',
+        "Environment :: Console",
-        'Programming Language :: Python',
+        "Programming Language :: Python",
-        'Programming Language :: Python :: 3.6',
+        "Programming Language :: Python :: 2",
-        'Programming Language :: Python :: 3.7',
+        "Programming Language :: Python :: 2.6",
-        'Programming Language :: Python :: 3.8',
+        "Programming Language :: Python :: 2.7",
-        'Programming Language :: Python :: Implementation',
+        "Programming Language :: Python :: 3",
-        'Programming Language :: Python :: Implementation :: CPython',
+        "Programming Language :: Python :: 3.2",
-        'Programming Language :: Python :: Implementation :: PyPy',
+        "Programming Language :: Python :: 3.3",
-        'License :: Public Domain',
+        "Programming Language :: Python :: 3.4",
-        'Operating System :: OS Independent',
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: Implementation",
+        "Programming Language :: Python :: Implementation :: CPython",
+        "Programming Language :: Python :: Implementation :: IronPython",
+        "Programming Language :: Python :: Implementation :: Jython",
+        "Programming Language :: Python :: Implementation :: PyPy",
+        "License :: Public Domain",
+        "Operating System :: OS Independent",
     ],
-    python_requires='>=3.6',
+    python_requires='>=2.6',
 
     cmdclass={'build_lazy_extractors': build_lazy_extractors},
     **params

supportedsites.md

@@ -3,7 +3,6 @@ # Supported sites
  - **20min**
  - **220.ro**
  - **23video**
- - **247sports**
  - **24video**
  - **3qsdn**: 3Q SDN
  - **3sat**
@@ -82,7 +81,6 @@ # Supported sites
  - **audiomack**
  - **audiomack:album**
  - **Audius**: Audius.co
- - **audius:artist**: Audius.co profile/artist pages
  - **audius:playlist**: Audius.co playlists
  - **audius:track**: Audius track ID or API link. Prepend with "audius:"
  - **AWAAN**
@@ -95,14 +93,11 @@ # Supported sites
  - **Bandcamp**
  - **Bandcamp:album**
  - **Bandcamp:weekly**
- - **BandcampMusic**
  - **bangumi.bilibili.com**: BiliBili番剧
- - **BannedVideo**
  - **bbc**: BBC
  - **bbc.co.uk**: BBC iPlayer
  - **bbc.co.uk:article**: BBC articles
- - **bbc.co.uk:iplayer:episodes**
+ - **bbc.co.uk:iplayer:playlist**
- - **bbc.co.uk:iplayer:group**
  - **bbc.co.uk:playlist**
  - **BBVTV**
  - **Beatport**
@@ -119,7 +114,6 @@ # Supported sites
  - **Bigflix**
  - **Bild**: Bild.de
  - **BiliBili**
- - **Bilibili category extractor**
  - **BilibiliAudio**
  - **BilibiliAudioAlbum**
  - **BilibiliChannel**
@@ -132,9 +126,9 @@ # Supported sites
  - **BitChuteChannel**
  - **bitwave:replay**
  - **bitwave:stream**
- - **BlackboardCollaborate**
  - **BleacherReport**
  - **BleacherReportCMS**
+ - **blinkx**
  - **Bloomberg**
  - **BokeCC**
  - **BongaCams**
@@ -155,6 +149,7 @@ # Supported sites
  - **Camdemy**
  - **CamdemyFolder**
  - **CamModels**
+ - **CamTube**
  - **CamWithHer**
  - **canalc2.tv**
  - **Canalplus**: mycanal.fr and piwiplus.fr
@@ -175,8 +170,7 @@ # Supported sites
  - **cbsnews**: CBS News
  - **cbsnews:embed**
  - **cbsnews:livevideo**: CBS News Live Videos
- - **cbssports**
+ - **CBSSports**
- - **cbssports:embed**
  - **CCMA**
  - **CCTV**: 央视网
  - **CDA**
@@ -254,15 +248,12 @@ # Supported sites
  - **DiscoveryGoPlaylist**
  - **DiscoveryNetworksDe**
  - **DiscoveryPlus**
- - **DiscoveryPlusIndia**
- - **DiscoveryPlusIndiaShow**
  - **DiscoveryVR**
  - **Disney**
  - **dlive:stream**
  - **dlive:vod**
  - **DoodStream**
  - **Dotsub**
- - **Douyin**
  - **DouyuShow**
  - **DouyuTV**: 斗鱼
  - **DPlay**
@@ -296,11 +287,8 @@ # Supported sites
  - **Embedly**
  - **EMPFlix**
  - **Engadget**
- - **Epicon**
- - **EpiconSeries**
  - **Eporner**
  - **EroProfile**
- - **EroProfile:album**
  - **Escapist**
  - **ESPN**
  - **ESPNArticle**
@@ -313,13 +301,10 @@ # Supported sites
  - **EyedoTV**
  - **facebook**
  - **FacebookPluginsVideo**
- - **fancode:live**
- - **fancode:vod**
  - **faz.net**
  - **fc2**
  - **fc2:embed**
  - **Fczenit**
- - **Filmmodu**
  - **filmon**
  - **filmon:channel**
  - **Filmweb**
@@ -352,12 +337,9 @@ # Supported sites
  - **FrontendMastersLesson**
  - **FujiTVFODPlus7**
  - **Funimation**
- - **funimation:page**
- - **funimation:show**
  - **Funk**
  - **Fusion**
  - **Fux**
- - **GabTV**
  - **Gaia**
  - **GameInformer**
  - **GameSpot**
@@ -365,7 +347,8 @@ # Supported sites
  - **Gaskrank**
  - **Gazeta**
  - **GDCVault**
- - **GediDigital**
+ - **Gedi**
+ - **GediEmbeds**
  - **generic**: Generic downloader that works on some sites
  - **Gfycat**
  - **GiantBomb**
@@ -404,7 +387,6 @@ # Supported sites
  - **HotNewHipHop**
  - **hotstar**
  - **hotstar:playlist**
- - **hotstar:series**
  - **Howcast**
  - **HowStuffWorks**
  - **hrfernsehen**
@@ -413,7 +395,6 @@ # Supported sites
  - **Huajiao**: 花椒直播
  - **HuffPost**: Huffington Post
  - **Hungama**
- - **HungamaAlbumPlaylist**
  - **HungamaSong**
  - **Hypem**
  - **ign.com**
@@ -476,8 +457,6 @@ # Supported sites
  - **kuwo:singer**: 酷我音乐 - 歌手
  - **kuwo:song**: 酷我音乐
  - **la7.it**
- - **la7.it:pod:episode**
- - **la7.it:podcast**
  - **laola1tv**
  - **laola1tv:embed**
  - **lbry**
@@ -501,14 +480,14 @@ # Supported sites
  - **limelight**
  - **limelight:channel**
  - **limelight:channel_list**
- - **LineLive**
- - **LineLiveChannel**
  - **LineTV**
  - **linkedin:learning**
  - **linkedin:learning:course**
  - **LinuxAcademy**
  - **LiTV**
  - **LiveJournal**
+ - **LiveLeak**
+ - **LiveLeakEmbed**
  - **livestream**
  - **livestream:original**
  - **LnkGo**
@@ -526,11 +505,7 @@ # Supported sites
  - **MallTV**
  - **mangomolo:live**
  - **mangomolo:video**
- - **ManotoTV**: Manoto TV (Episode)
- - **ManotoTVLive**: Manoto TV (Live)
- - **ManotoTVShow**: Manoto TV (Show)
  - **ManyVids**
- - **MaoriTV**
  - **Markiza**
  - **MarkizaPage**
  - **massengeschmack.tv**
@@ -564,14 +539,11 @@ # Supported sites
  - **MinistryGrid**
  - **Minoto**
  - **miomio.tv**
- - **mirrativ**
- - **mirrativ:user**
  - **MiTele**: mitele.es
  - **mixcloud**
  - **mixcloud:playlist**
  - **mixcloud:user**
  - **MLB**
- - **MLBVideo**
  - **Mnet**
  - **MNetTV**
  - **MoeVideo**: LetitBit video services: moevideo.net, playreplay.net and videochart.net
@@ -590,8 +562,6 @@ # Supported sites
  - **mtg**: MTG services
  - **mtv**
  - **mtv.de**
- - **mtv.it**
- - **mtv.it:programma**
  - **mtv:video**
  - **mtvjapan**
  - **mtvservices:embedded**
@@ -602,7 +572,6 @@ # Supported sites
  - **Mwave**
  - **MwaveMeetGreet**
  - **Mxplayer**
- - **MxplayerShow**
  - **MyChannels**
  - **MySpace**
  - **MySpace:album**
@@ -634,7 +603,6 @@ # Supported sites
  - **ndr:embed**
  - **ndr:embed:base**
  - **NDTV**
- - **Nebula**
  - **NerdCubedFeed**
  - **netease:album**: 网易云音乐 - 专辑
  - **netease:djradio**: 网易云音乐 - 电台
@@ -653,7 +621,6 @@ # Supported sites
  - **NextTV**: 壹電視
  - **Nexx**
  - **NexxEmbed**
- - **NFHSNetwork**
  - **nfl.com** (Currently broken)
  - **nfl.com:article** (Currently broken)
  - **NhkVod**
@@ -666,10 +633,6 @@ # Supported sites
  - **nicknight**
  - **niconico**: ニコニコ動画
  - **NiconicoPlaylist**
- - **NiconicoUser**
- - **nicovideo:search**: Nico video searches
- - **nicovideo:search:date**: Nico video searches, newest first
- - **nicovideo:search_url**: Nico video search URLs
  - **Nintendo**
  - **Nitter**
  - **njoy**: N-JOY
@@ -720,8 +683,6 @@ # Supported sites
  - **OnionStudios**
  - **Ooyala**
  - **OoyalaExternal**
- - **openrec**
- - **openrec:capture**
  - **OraTV**
  - **orf:burgenland**: Radio Burgenland
  - **orf:fm4**: radio FM4
@@ -742,22 +703,13 @@ # Supported sites
  - **OutsideTV**
  - **PacktPub**
  - **PacktPubCourse**
- - **PalcoMP3:artist**
- - **PalcoMP3:song**
- - **PalcoMP3:video**
  - **pandora.tv**: 판도라TV
  - **ParamountNetwork**
- - **ParamountPlus**
- - **ParamountPlusSeries**
  - **parliamentlive.tv**: UK parliament videos
- - **Parlview**
  - **Patreon**
- - **PatreonUser**
  - **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)
  - **PearVideo**
  - **PeerTube**
- - **peloton**
- - **peloton:live**: Peloton Live
  - **People**
  - **PerformGroup**
  - **periscope**: Periscope
@@ -777,14 +729,12 @@ # Supported sites
  - **play.fm**
  - **player.sky.it**
  - **PlayPlusTV**
- - **PlayStuff**
  - **PlaysTV**
  - **Playtvak**: Playtvak.cz, iDNES.cz and Lidovky.cz
  - **Playvid**
  - **Playwire**
  - **pluralsight**
  - **pluralsight:course**
- - **PlutoTV**
  - **podomatic**
  - **Pokemon**
  - **PokemonWatch**
@@ -794,11 +744,9 @@ # Supported sites
  - **PopcornTV**
  - **PornCom**
  - **PornerBros**
- - **PornFlip**
  - **PornHd**
  - **PornHub**: PornHub and Thumbzilla
  - **PornHubPagedVideoList**
- - **PornHubPlaylist**
  - **PornHubUser**
  - **PornHubUserVideosUpload**
  - **Pornotube**
@@ -806,7 +754,6 @@ # Supported sites
  - **PornoXO**
  - **PornTube**
  - **PressTV**
- - **ProjectVeritas**
  - **prosiebensat1**: ProSiebenSat.1 Digital
  - **puhutv**
  - **puhutv:serie**
@@ -823,8 +770,6 @@ # Supported sites
  - **QuicklineLive**
  - **R7**
  - **R7Article**
- - **Radiko**
- - **RadikoRadio**
  - **radio.de**
  - **radiobremen**
  - **radiocanada**
@@ -841,9 +786,6 @@ # Supported sites
  - **RCS**
  - **RCSEmbeds**
  - **RCSVarious**
- - **RCTIPlus**
- - **RCTIPlusSeries**
- - **RCTIPlusTV**
  - **RDS**: RDS.ca
  - **RedBull**
  - **RedBullEmbed**
@@ -894,7 +836,6 @@ # Supported sites
  - **safari**: safaribooksonline.com online video
  - **safari:api**
  - **safari:course**: safaribooksonline.com online courses
- - **Saitosan**
  - **SAKTV**
  - **SaltTV**
  - **SampleFocus**
@@ -902,7 +843,6 @@ # Supported sites
  - **savefrom.net**
  - **SBS**: sbs.com.au
  - **schooltv**
- - **ScienceChannel**
  - **screen.yahoo:search**: Yahoo screen search
  - **Screencast**
  - **ScreencastOMatic**
@@ -920,7 +860,6 @@ # Supported sites
  - **Shahid**
  - **ShahidShow**
  - **Shared**: shared.sx
- - **ShemarooMe**
  - **ShowRoomLive**
  - **simplecast**
  - **simplecast:episode**
@@ -940,7 +879,6 @@ # Supported sites
  - **Snotr**
  - **Sohu**
  - **SonyLIV**
- - **SonyLIVSeries**
  - **soundcloud**
  - **soundcloud:playlist**
  - **soundcloud:search**: Soundcloud search
@@ -975,10 +913,8 @@ # Supported sites
  - **SRGSSR**
  - **SRGSSRPlay**: srf.ch, rts.ch, rsi.ch, rtr.ch and swissinfo.ch play sites
  - **stanfordoc**: Stanford Open ClassRoom
- - **startv**
  - **Steam**
  - **Stitcher**
- - **StitcherShow**
  - **StoryFire**
  - **StoryFireSeries**
  - **StoryFireUser**
@@ -1020,7 +956,6 @@ # Supported sites
  - **Telecinco**: telecinco.es, cuatro.com and mediaset.es
  - **Telegraaf**
  - **TeleMB**
- - **Telemundo**
  - **TeleQuebec**
  - **TeleQuebecEmission**
  - **TeleQuebecLive**
@@ -1042,15 +977,13 @@ # Supported sites
  - **ThisAmericanLife**
  - **ThisAV**
  - **ThisOldHouse**
+ - **ThisVid**
  - **TikTok**
- - **tiktok:user**
  - **tinypic**: tinypic.com videos
  - **TMZ**
  - **TNAFlix**
  - **TNAFlixNetworkEmbed**
  - **toggle**
- - **Tokentube**
- - **Tokentube:channel**
  - **ToonGoggles**
  - **tou.tv**
  - **Toypics**: Toypics video
@@ -1063,7 +996,6 @@ # Supported sites
  - **TruTV**
  - **Tube8**
  - **TubiTv**
- - **TubiTvShow**
  - **Tumblr**
  - **tunein:clip**
  - **tunein:program**
@@ -1073,11 +1005,10 @@ # Supported sites
  - **Turbo**
  - **tv.dfb.de**
  - **TV2**
+ - **tv2.hu**
  - **TV2Article**
  - **TV2DK**
  - **TV2DKBornholmPlay**
- - **tv2play.hu**
- - **tv2playseries.hu**
  - **TV4**: tv4.se and tv4play.se
  - **TV5MondePlus**: TV5MONDE+
  - **tv5unis**
@@ -1107,8 +1038,6 @@ # Supported sites
  - **TVPlayHome**
  - **Tweakers**
  - **TwitCasting**
- - **TwitCastingLive**
- - **TwitCastingUser**
  - **twitch:clips**
  - **twitch:stream**
  - **twitch:vod**
@@ -1126,7 +1055,6 @@ # Supported sites
  - **UDNEmbed**: 聯合影音
  - **UFCArabia**
  - **UFCTV**
- - **ukcolumn**
  - **UKTVPlay**
  - **umg:de**: Universal Music Deutschland
  - **Unistra**
@@ -1142,7 +1070,6 @@ # Supported sites
  - **ustream:channel**
  - **ustudio**
  - **ustudio:embed**
- - **Utreon**
  - **Varzesh3**
  - **Vbox7**
  - **VeeHD**
@@ -1160,7 +1087,6 @@ # Supported sites
  - **Vidbit**
  - **Viddler**
  - **Videa**
- - **video.arnes.si**: Arnes Video
  - **video.google:search**: Google Video search
  - **video.sky.it**
  - **video.sky.it:live**
@@ -1171,8 +1097,6 @@ # Supported sites
  - **videomore:video**
  - **VideoPress**
  - **Vidio**
- - **VidioLive**
- - **VidioPremier**
  - **VidLii**
  - **vidme**
  - **vidme:user**
@@ -1211,10 +1135,7 @@ # Supported sites
  - **VODPl**
  - **VODPlatform**
  - **VoiceRepublic**
- - **voicy**
- - **voicy:channel**
  - **Voot**
- - **VootSeries**
  - **VoxMedia**
  - **VoxMediaVolume**
  - **vpro**: npo.nl, ntr.nl, omroepwnl.nl, zapp.nl and npo3.nl
@@ -1244,7 +1165,6 @@ # Supported sites
  - **wdr:mobile**
  - **WDRElefant**
  - **WDRPage**
- - **web.archive:youtube**: web.archive.org saved youtube videos
  - **Webcaster**
  - **WebcasterFeed**
  - **WebOfStories**
@@ -1252,8 +1172,6 @@ # Supported sites
  - **Weibo**
  - **WeiboMobile**
  - **WeiqiTV**: WQTV
- - **whowatch**
- - **WimTV**
  - **Wistia**
  - **WistiaPlaylist**
  - **wnl**: npo.nl, ntr.nl, omroepwnl.nl, zapp.nl and npo3.nl
@@ -1263,7 +1181,7 @@ # Supported sites
  - **WWE**
  - **XBef**
  - **XboxClips**
- - **XFileShare**: XFileShare based sites: Aparat, ClipWatching, GoUnlimited, GoVid, HolaVid, Streamty, TheVideoBee, Uqload, VidBom, vidlo, VidLocker, VidShare, VUp, WolfStream, XVideoSharing
+ - **XFileShare**: XFileShare based sites: Aparat, ClipWatching, GoUnlimited, GoVid, HolaVid, Streamty, TheVideoBee, Uqload, VidBom, vidlo, VidLocker, VidShare, VUp, XVideoSharing
  - **XHamster**
  - **XHamsterEmbed**
  - **XHamsterUser**
@@ -1324,9 +1242,7 @@ # Supported sites
  - **ZDF**
  - **ZDFChannel**
  - **Zee5**
- - **zee5:series**
  - **Zhihu**
  - **zingmp3**: mp3.zing.vn
- - **zingmp3:album**
  - **zoom**
  - **Zype**

test/helper.py

@@ -22,14 +22,6 @@
 )
 
 
-if "pytest" in sys.modules:
-    import pytest
-    is_download_test = pytest.mark.download
-else:
-    def is_download_test(testClass):
-        return testClass
-
-
 def get_params(override=None):
     PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)),
                                    "parameters.json")
@@ -198,10 +190,7 @@ def expect_info_dict(self, got_dict, expected_dict):
     expect_dict(self, got_dict, expected_dict)
     # Check for the presence of mandatory fields
     if got_dict.get('_type') not in ('playlist', 'multi_video'):
-        mandatory_fields = ['id', 'title']
+        for key in ('id', 'url', 'title', 'ext'):
-        if expected_dict.get('ext'):
-            mandatory_fields.extend(('url', 'ext'))
-        for key in mandatory_fields:
             self.assertTrue(got_dict.get(key), 'Missing mandatory field %s' % key)
     # Check for mandatory fields that are automatically set by YoutubeDL
     for key in ['webpage_url', 'extractor', 'extractor_key']:

test/parameters.json

@@ -1,5 +1,4 @@
 {
-    "check_formats": false,
     "consoletitle": false, 
     "continuedl": true, 
     "forcedescription": false, 
@@ -20,6 +19,7 @@
     "noprogress": false, 
     "outtmpl": "%(id)s.%(ext)s", 
     "password": null, 
+    "playlistend": -1, 
     "playliststart": 1, 
     "prefer_free_formats": false, 
     "quiet": false, 

test/test_InfoExtractor.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 
 from __future__ import unicode_literals
 
@@ -35,13 +35,13 @@ def do_GET(self):
             assert False
 
 
-class DummyIE(InfoExtractor):
+class TestIE(InfoExtractor):
     pass
 
 
 class TestInfoExtractor(unittest.TestCase):
     def setUp(self):
-        self.ie = DummyIE(FakeYDL())
+        self.ie = TestIE(FakeYDL())
 
     def test_ie_key(self):
         self.assertEqual(get_info_extractor(YoutubeIE.ie_key()), YoutubeIE)
@@ -450,7 +450,7 @@ def test_parse_m3u8_formats(self):
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'language': 'en',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'audio_ext': 'mp4',
                 }, {
                     'format_id': 'aud2-English',
@@ -458,7 +458,7 @@ def test_parse_m3u8_formats(self):
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'language': 'en',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'audio_ext': 'mp4',
                 }, {
                     'format_id': 'aud3-English',
@@ -466,14 +466,14 @@ def test_parse_m3u8_formats(self):
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'language': 'en',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'audio_ext': 'mp4',
                 }, {
                     'format_id': '530',
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v2/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 480,
                     'height': 270,
                     'vcodec': 'avc1.640015',
@@ -482,7 +482,7 @@ def test_parse_m3u8_formats(self):
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v2/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 480,
                     'height': 270,
                     'vcodec': 'avc1.640015',
@@ -491,7 +491,7 @@ def test_parse_m3u8_formats(self):
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v2/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 480,
                     'height': 270,
                     'vcodec': 'avc1.640015',
@@ -500,7 +500,7 @@ def test_parse_m3u8_formats(self):
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v3/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 640,
                     'height': 360,
                     'vcodec': 'avc1.64001e',
@@ -509,7 +509,7 @@ def test_parse_m3u8_formats(self):
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v3/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 640,
                     'height': 360,
                     'vcodec': 'avc1.64001e',
@@ -518,7 +518,7 @@ def test_parse_m3u8_formats(self):
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v3/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 640,
                     'height': 360,
                     'vcodec': 'avc1.64001e',
@@ -527,7 +527,7 @@ def test_parse_m3u8_formats(self):
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v4/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 768,
                     'height': 432,
                     'vcodec': 'avc1.64001e',
@@ -536,7 +536,7 @@ def test_parse_m3u8_formats(self):
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v4/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 768,
                     'height': 432,
                     'vcodec': 'avc1.64001e',
@@ -545,7 +545,7 @@ def test_parse_m3u8_formats(self):
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v4/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 768,
                     'height': 432,
                     'vcodec': 'avc1.64001e',
@@ -554,7 +554,7 @@ def test_parse_m3u8_formats(self):
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v5/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 960,
                     'height': 540,
                     'vcodec': 'avc1.640020',
@@ -563,7 +563,7 @@ def test_parse_m3u8_formats(self):
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v5/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 960,
                     'height': 540,
                     'vcodec': 'avc1.640020',
@@ -572,7 +572,7 @@ def test_parse_m3u8_formats(self):
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v5/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 960,
                     'height': 540,
                     'vcodec': 'avc1.640020',
@@ -581,7 +581,7 @@ def test_parse_m3u8_formats(self):
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v6/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 1280,
                     'height': 720,
                     'vcodec': 'avc1.640020',
@@ -590,7 +590,7 @@ def test_parse_m3u8_formats(self):
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v6/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 1280,
                     'height': 720,
                     'vcodec': 'avc1.640020',
@@ -599,7 +599,7 @@ def test_parse_m3u8_formats(self):
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v6/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 1280,
                     'height': 720,
                     'vcodec': 'avc1.640020',
@@ -608,7 +608,7 @@ def test_parse_m3u8_formats(self):
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v7/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 1920,
                     'height': 1080,
                     'vcodec': 'avc1.64002a',
@@ -617,7 +617,7 @@ def test_parse_m3u8_formats(self):
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v7/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 1920,
                     'height': 1080,
                     'vcodec': 'avc1.64002a',
@@ -626,7 +626,7 @@ def test_parse_m3u8_formats(self):
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v7/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 1920,
                     'height': 1080,
                     'vcodec': 'avc1.64002a',
@@ -635,7 +635,7 @@ def test_parse_m3u8_formats(self):
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v8/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 1920,
                     'height': 1080,
                     'vcodec': 'avc1.64002a',
@@ -644,7 +644,7 @@ def test_parse_m3u8_formats(self):
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v8/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 1920,
                     'height': 1080,
                     'vcodec': 'avc1.64002a',
@@ -653,7 +653,7 @@ def test_parse_m3u8_formats(self):
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v8/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 1920,
                     'height': 1080,
                     'vcodec': 'avc1.64002a',
@@ -662,7 +662,7 @@ def test_parse_m3u8_formats(self):
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v9/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 1920,
                     'height': 1080,
                     'vcodec': 'avc1.64002a',
@@ -671,7 +671,7 @@ def test_parse_m3u8_formats(self):
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v9/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 1920,
                     'height': 1080,
                     'vcodec': 'avc1.64002a',
@@ -680,190 +680,21 @@ def test_parse_m3u8_formats(self):
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v9/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                     'ext': 'mp4',
-                    'protocol': 'm3u8_native',
+                    'protocol': 'm3u8',
                     'width': 1920,
                     'height': 1080,
                     'vcodec': 'avc1.64002a',
-                }],
+                }]
-                {}
-            ),
-            (
-                'bipbop_16x9',
-                'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/bipbop_16x9_variant.m3u8',
-                [{
-                    'format_id': 'bipbop_audio-BipBop Audio 2',
-                    'format_index': None,
-                    'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/alternate_audio_aac/prog_index.m3u8',
-                    'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/bipbop_16x9_variant.m3u8',
-                    'language': 'eng',
-                    'ext': 'mp4',
-                    'protocol': 'm3u8_native',
-                    'preference': None,
-                    'quality': None,
-                    'vcodec': 'none',
-                    'audio_ext': 'mp4',
-                    'video_ext': 'none',
-                }, {
-                    'format_id': '41',
-                    'format_index': None,
-                    'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/gear0/prog_index.m3u8',
-                    'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/bipbop_16x9_variant.m3u8',
-                    'tbr': 41.457,
-                    'ext': 'mp4',
-                    'fps': None,
-                    'protocol': 'm3u8_native',
-                    'preference': None,
-                    'quality': None,
-                    'vcodec': 'none',
-                    'acodec': 'mp4a.40.2',
-                    'audio_ext': 'mp4',
-                    'video_ext': 'none',
-                    'abr': 41.457,
-                }, {
-                    'format_id': '263',
-                    'format_index': None,
-                    'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/gear1/prog_index.m3u8',
-                    'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/bipbop_16x9_variant.m3u8',
-                    'tbr': 263.851,
-                    'ext': 'mp4',
-                    'fps': None,
-                    'protocol': 'm3u8_native',
-                    'preference': None,
-                    'quality': None,
-                    'width': 416,
-                    'height': 234,
-                    'vcodec': 'avc1.4d400d',
-                    'acodec': 'mp4a.40.2',
-                    'video_ext': 'mp4',
-                    'audio_ext': 'none',
-                    'vbr': 263.851,
-                    'abr': 0,
-                }, {
-                    'format_id': '577',
-                    'format_index': None,
-                    'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/gear2/prog_index.m3u8',
-                    'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/bipbop_16x9_variant.m3u8',
-                    'tbr': 577.61,
-                    'ext': 'mp4',
-                    'fps': None,
-                    'protocol': 'm3u8_native',
-                    'preference': None,
-                    'quality': None,
-                    'width': 640,
-                    'height': 360,
-                    'vcodec': 'avc1.4d401e',
-                    'acodec': 'mp4a.40.2',
-                    'video_ext': 'mp4',
-                    'audio_ext': 'none',
-                    'vbr': 577.61,
-                    'abr': 0,
-                }, {
-                    'format_id': '915',
-                    'format_index': None,
-                    'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/gear3/prog_index.m3u8',
-                    'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/bipbop_16x9_variant.m3u8',
-                    'tbr': 915.905,
-                    'ext': 'mp4',
-                    'fps': None,
-                    'protocol': 'm3u8_native',
-                    'preference': None,
-                    'quality': None,
-                    'width': 960,
-                    'height': 540,
-                    'vcodec': 'avc1.4d401f',
-                    'acodec': 'mp4a.40.2',
-                    'video_ext': 'mp4',
-                    'audio_ext': 'none',
-                    'vbr': 915.905,
-                    'abr': 0,
-                }, {
-                    'format_id': '1030',
-                    'format_index': None,
-                    'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/gear4/prog_index.m3u8',
-                    'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/bipbop_16x9_variant.m3u8',
-                    'tbr': 1030.138,
-                    'ext': 'mp4',
-                    'fps': None,
-                    'protocol': 'm3u8_native',
-                    'preference': None,
-                    'quality': None,
-                    'width': 1280,
-                    'height': 720,
-                    'vcodec': 'avc1.4d401f',
-                    'acodec': 'mp4a.40.2',
-                    'video_ext': 'mp4',
-                    'audio_ext': 'none',
-                    'vbr': 1030.138,
-                    'abr': 0,
-                }, {
-                    'format_id': '1924',
-                    'format_index': None,
-                    'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/gear5/prog_index.m3u8',
-                    'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/bipbop_16x9_variant.m3u8',
-                    'tbr': 1924.009,
-                    'ext': 'mp4',
-                    'fps': None,
-                    'protocol': 'm3u8_native',
-                    'preference': None,
-                    'quality': None,
-                    'width': 1920,
-                    'height': 1080,
-                    'vcodec': 'avc1.4d401f',
-                    'acodec': 'mp4a.40.2',
-                    'video_ext': 'mp4',
-                    'audio_ext': 'none',
-                    'vbr': 1924.009,
-                    'abr': 0,
-                }],
-                {
-                    'en': [{
-                        'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/subtitles/eng/prog_index.m3u8',
-                        'ext': 'vtt',
-                        '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'
-                    }],
-                    'fr': [{
-                        'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/subtitles/fra/prog_index.m3u8',
-                        'ext': 'vtt',
-                        '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'
-                    }],
-                    'es': [{
-                        'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/subtitles/spa/prog_index.m3u8',
-                        'ext': 'vtt',
-                        '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'
-                    }],
-                    'ja': [{
-                        'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/subtitles/jpn/prog_index.m3u8',
-                        'ext': 'vtt',
-                        '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'
-                    }],
-                }
             ),
         ]
 
-        for m3u8_file, m3u8_url, expected_formats, expected_subs in _TEST_CASES:
+        for m3u8_file, m3u8_url, expected_formats in _TEST_CASES:
             with io.open('./test/testdata/m3u8/%s.m3u8' % m3u8_file,
                          mode='r', encoding='utf-8') as f:
-                formats, subs = self.ie._parse_m3u8_formats_and_subtitles(
+                formats = self.ie._parse_m3u8_formats(
                     f.read(), m3u8_url, ext='mp4')
                 self.ie._sort_formats(formats)
                 expect_value(self, formats, expected_formats, None)
-                expect_value(self, subs, expected_subs, None)
 
     def test_parse_mpd_formats(self):
         _TEST_CASES = [
@@ -949,8 +780,7 @@ def test_parse_mpd_formats(self):
                     'tbr': 5997.485,
                     'width': 1920,
                     'height': 1080,
-                }],
+                }]
-                {},
             ), (
                 # https://github.com/ytdl-org/youtube-dl/pull/14844
                 'urls_only',
@@ -1033,8 +863,7 @@ def test_parse_mpd_formats(self):
                     'tbr': 4400,
                     'width': 1920,
                     'height': 1080,
-                }],
+                }]
-                {},
             ), (
                 # https://github.com/ytdl-org/youtube-dl/issues/20346
                 # Media considered unfragmented even though it contains
@@ -1080,328 +909,18 @@ def test_parse_mpd_formats(self):
                     'width': 360,
                     'height': 360,
                     'fps': 30,
-                }],
+                }]
-                {},
-            ), (
-                'subtitles',
-                'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/',
-                [{
-                    'format_id': 'audio=128001',
-                    'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                    'ext': 'm4a',
-                    'tbr': 128.001,
-                    'asr': 48000,
-                    'format_note': 'DASH audio',
-                    'container': 'm4a_dash',
-                    'vcodec': 'none',
-                    'acodec': 'mp4a.40.2',
-                    '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',
-                    'audio_ext': 'm4a',
-                    'video_ext': 'none',
-                    'abr': 128.001,
-                }, {
-                    'format_id': 'video=100000',
-                    'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                    'ext': 'mp4',
-                    'width': 336,
-                    'height': 144,
-                    'tbr': 100,
-                    'format_note': 'DASH video',
-                    'container': 'mp4_dash',
-                    'vcodec': 'avc1.4D401F',
-                    'acodec': 'none',
-                    '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',
-                    'video_ext': 'mp4',
-                    'audio_ext': 'none',
-                    'vbr': 100,
-                }, {
-                    'format_id': 'video=326000',
-                    'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                    'ext': 'mp4',
-                    'width': 562,
-                    'height': 240,
-                    'tbr': 326,
-                    'format_note': 'DASH video',
-                    'container': 'mp4_dash',
-                    'vcodec': 'avc1.4D401F',
-                    'acodec': 'none',
-                    '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',
-                    'video_ext': 'mp4',
-                    'audio_ext': 'none',
-                    'vbr': 326,
-                }, {
-                    'format_id': 'video=698000',
-                    'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                    'ext': 'mp4',
-                    'width': 844,
-                    'height': 360,
-                    'tbr': 698,
-                    'format_note': 'DASH video',
-                    'container': 'mp4_dash',
-                    'vcodec': 'avc1.4D401F',
-                    'acodec': 'none',
-                    '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',
-                    'video_ext': 'mp4',
-                    'audio_ext': 'none',
-                    'vbr': 698,
-                }, {
-                    'format_id': 'video=1493000',
-                    'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                    'ext': 'mp4',
-                    'width': 1126,
-                    'height': 480,
-                    'tbr': 1493,
-                    'format_note': 'DASH video',
-                    'container': 'mp4_dash',
-                    'vcodec': 'avc1.4D401F',
-                    'acodec': 'none',
-                    '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',
-                    'video_ext': 'mp4',
-                    'audio_ext': 'none',
-                    'vbr': 1493,
-                }, {
-                    'format_id': 'video=4482000',
-                    'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                    'ext': 'mp4',
-                    'width': 1688,
-                    'height': 720,
-                    'tbr': 4482,
-                    'format_note': 'DASH video',
-                    'container': 'mp4_dash',
-                    'vcodec': 'avc1.4D401F',
-                    'acodec': 'none',
-                    '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',
-                    'video_ext': 'mp4',
-                    'audio_ext': 'none',
-                    'vbr': 4482,
-                }],
-                {
-                    'en': [
-                        {
-                            'ext': 'mp4',
-                            'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                            '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:
+        for mpd_file, mpd_url, mpd_base_url, expected_formats in _TEST_CASES:
             with io.open('./test/testdata/mpd/%s.mpd' % mpd_file,
                          mode='r', encoding='utf-8') as f:
-                formats, subtitles = self.ie._parse_mpd_formats_and_subtitles(
+                formats = self.ie._parse_mpd_formats(
                     compat_etree_fromstring(f.read().encode('utf-8')),
                     mpd_base_url=mpd_base_url, mpd_url=mpd_url)
                 self.ie._sort_formats(formats)
                 expect_value(self, formats, expected_formats, None)
-                expect_value(self, subtitles, expected_subtitles, None)
-
-    def test_parse_ism_formats(self):
-        _TEST_CASES = [
-            (
-                'sintel',
-                'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
-                [{
-                    'format_id': 'audio-128',
-                    'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
-                    'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
-                    'ext': 'isma',
-                    'tbr': 128,
-                    'asr': 48000,
-                    'vcodec': 'none',
-                    'acodec': 'AACL',
-                    'protocol': 'ism',
-                    '_download_params': {
-                        'stream_type': 'audio',
-                        'duration': 8880746666,
-                        'timescale': 10000000,
-                        'width': 0,
-                        'height': 0,
-                        'fourcc': 'AACL',
-                        'codec_private_data': '1190',
-                        'sampling_rate': 48000,
-                        'channels': 2,
-                        'bits_per_sample': 16,
-                        'nal_unit_length_field': 4
-                    },
-                    'audio_ext': 'isma',
-                    'video_ext': 'none',
-                    'abr': 128,
-                }, {
-                    'format_id': 'video-100',
-                    'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
-                    'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
-                    'ext': 'ismv',
-                    'width': 336,
-                    'height': 144,
-                    'tbr': 100,
-                    'vcodec': 'AVC1',
-                    'acodec': 'none',
-                    'protocol': 'ism',
-                    '_download_params': {
-                        'stream_type': 'video',
-                        'duration': 8880746666,
-                        'timescale': 10000000,
-                        'width': 336,
-                        'height': 144,
-                        'fourcc': 'AVC1',
-                        'codec_private_data': '00000001674D401FDA0544EFFC2D002CBC40000003004000000C03C60CA80000000168EF32C8',
-                        'channels': 2,
-                        'bits_per_sample': 16,
-                        'nal_unit_length_field': 4
-                    },
-                    'video_ext': 'ismv',
-                    'audio_ext': 'none',
-                    'vbr': 100,
-                }, {
-                    'format_id': 'video-326',
-                    'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
-                    'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
-                    'ext': 'ismv',
-                    'width': 562,
-                    'height': 240,
-                    'tbr': 326,
-                    'vcodec': 'AVC1',
-                    'acodec': 'none',
-                    'protocol': 'ism',
-                    '_download_params': {
-                        'stream_type': 'video',
-                        'duration': 8880746666,
-                        'timescale': 10000000,
-                        'width': 562,
-                        'height': 240,
-                        'fourcc': 'AVC1',
-                        'codec_private_data': '00000001674D401FDA0241FE23FFC3BC83BA44000003000400000300C03C60CA800000000168EF32C8',
-                        'channels': 2,
-                        'bits_per_sample': 16,
-                        'nal_unit_length_field': 4
-                    },
-                    'video_ext': 'ismv',
-                    'audio_ext': 'none',
-                    'vbr': 326,
-                }, {
-                    'format_id': 'video-698',
-                    'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
-                    'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
-                    'ext': 'ismv',
-                    'width': 844,
-                    'height': 360,
-                    'tbr': 698,
-                    'vcodec': 'AVC1',
-                    'acodec': 'none',
-                    'protocol': 'ism',
-                    '_download_params': {
-                        'stream_type': 'video',
-                        'duration': 8880746666,
-                        'timescale': 10000000,
-                        'width': 844,
-                        'height': 360,
-                        'fourcc': 'AVC1',
-                        'codec_private_data': '00000001674D401FDA0350BFB97FF06AF06AD1000003000100000300300F1832A00000000168EF32C8',
-                        'channels': 2,
-                        'bits_per_sample': 16,
-                        'nal_unit_length_field': 4
-                    },
-                    'video_ext': 'ismv',
-                    'audio_ext': 'none',
-                    'vbr': 698,
-                }, {
-                    'format_id': 'video-1493',
-                    'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
-                    'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
-                    'ext': 'ismv',
-                    'width': 1126,
-                    'height': 480,
-                    'tbr': 1493,
-                    'vcodec': 'AVC1',
-                    'acodec': 'none',
-                    'protocol': 'ism',
-                    '_download_params': {
-                        'stream_type': 'video',
-                        'duration': 8880746666,
-                        'timescale': 10000000,
-                        'width': 1126,
-                        'height': 480,
-                        'fourcc': 'AVC1',
-                        'codec_private_data': '00000001674D401FDA011C3DE6FFF0D890D871000003000100000300300F1832A00000000168EF32C8',
-                        'channels': 2,
-                        'bits_per_sample': 16,
-                        'nal_unit_length_field': 4
-                    },
-                    'video_ext': 'ismv',
-                    'audio_ext': 'none',
-                    'vbr': 1493,
-                }, {
-                    'format_id': 'video-4482',
-                    'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
-                    'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
-                    'ext': 'ismv',
-                    'width': 1688,
-                    'height': 720,
-                    'tbr': 4482,
-                    'vcodec': 'AVC1',
-                    'acodec': 'none',
-                    'protocol': 'ism',
-                    '_download_params': {
-                        'stream_type': 'video',
-                        'duration': 8880746666,
-                        'timescale': 10000000,
-                        'width': 1688,
-                        'height': 720,
-                        'fourcc': 'AVC1',
-                        'codec_private_data': '00000001674D401FDA01A816F97FFC1ABC1AB440000003004000000C03C60CA80000000168EF32C8',
-                        'channels': 2,
-                        'bits_per_sample': 16,
-                        'nal_unit_length_field': 4
-                    },
-                    'video_ext': 'ismv',
-                    'audio_ext': 'none',
-                    'vbr': 4482,
-                }],
-                {
-                    'eng': [
-                        {
-                            'ext': 'ismt',
-                            'protocol': 'ism',
-                            'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
-                            'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
-                            '_download_params': {
-                                'stream_type': 'text',
-                                'duration': 8880746666,
-                                'timescale': 10000000,
-                                'fourcc': 'TTML',
-                                'codec_private_data': ''
-                            }
-                        }
-                    ]
-                },
-            ),
-        ]
-
-        for ism_file, ism_url, expected_formats, expected_subtitles in _TEST_CASES:
-            with io.open('./test/testdata/ism/%s.Manifest' % ism_file,
-                         mode='r', encoding='utf-8') as f:
-                formats, subtitles = self.ie._parse_ism_formats_and_subtitles(
-                    compat_etree_fromstring(f.read().encode('utf-8')), ism_url=ism_url)
-                self.ie._sort_formats(formats)
-                expect_value(self, formats, expected_formats, None)
-                expect_value(self, subtitles, expected_subtitles, None)
 
     def test_parse_f4m_formats(self):
         _TEST_CASES = [

test/test_YoutubeDL.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # coding: utf-8
 
 from __future__ import unicode_literals
@@ -10,15 +10,14 @@
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 import copy
-import json
 
 from test.helper import FakeYDL, assertRegexpMatches
 from yt_dlp import YoutubeDL
-from yt_dlp.compat import compat_os_name, compat_setenv, compat_str, compat_urllib_error
+from yt_dlp.compat import compat_str, compat_urllib_error
 from yt_dlp.extractor import YoutubeIE
 from yt_dlp.extractor.common import InfoExtractor
 from yt_dlp.postprocessor.common import PostProcessor
-from yt_dlp.utils import ExtractorError, int_or_none, match_filter_func, LazyList
+from yt_dlp.utils import ExtractorError, match_filter_func
 
 TEST_URL = 'http://localhost/sample.mp4'
 
@@ -30,15 +29,11 @@ def __init__(self, *args, **kwargs):
         self.msgs = []
 
     def process_info(self, info_dict):
-        info_dict.pop('__original_infodict', None)
         self.downloaded_info_dicts.append(info_dict)
 
     def to_screen(self, msg):
         self.msgs.append(msg)
 
-    def dl(self, *args, **kwargs):
-        assert False, 'Downloader must not be invoked for test_YoutubeDL'
-
 
 def _make_result(formats, **kwargs):
     res = {
@@ -121,24 +116,35 @@ def test_format_selection(self):
         ]
         info_dict = _make_result(formats)
 
-        def test(inp, *expected, multi=False):
+        ydl = YDL({'format': '20/47'})
-            ydl = YDL({
-                'format': inp,
-                'allow_multiple_video_streams': multi,
-                'allow_multiple_audio_streams': multi,
-            })
         ydl.process_ie_result(info_dict.copy())
-            downloaded = map(lambda x: x['format_id'], ydl.downloaded_info_dicts)
+        downloaded = ydl.downloaded_info_dicts[0]
-            self.assertEqual(list(downloaded), list(expected))
+        self.assertEqual(downloaded['format_id'], '47')
 
-        test('20/47', '47')
+        ydl = YDL({'format': '20/71/worst'})
-        test('20/71/worst', '35')
+        ydl.process_ie_result(info_dict.copy())
-        test(None, '2')
+        downloaded = ydl.downloaded_info_dicts[0]
-        test('webm/mp4', '47')
+        self.assertEqual(downloaded['format_id'], '35')
-        test('3gp/40/mp4', '35')
+
-        test('example-with-dashes', 'example-with-dashes')
+        ydl = YDL()
-        test('all', '35', 'example-with-dashes', '45', '47', '2')  # Order doesn't actually matter for this
+        ydl.process_ie_result(info_dict.copy())
-        test('mergeall', '2+47+45+example-with-dashes+35', multi=True)
+        downloaded = ydl.downloaded_info_dicts[0]
+        self.assertEqual(downloaded['format_id'], '2')
+
+        ydl = YDL({'format': 'webm/mp4'})
+        ydl.process_ie_result(info_dict.copy())
+        downloaded = ydl.downloaded_info_dicts[0]
+        self.assertEqual(downloaded['format_id'], '47')
+
+        ydl = YDL({'format': '3gp/40/mp4'})
+        ydl.process_ie_result(info_dict.copy())
+        downloaded = ydl.downloaded_info_dicts[0]
+        self.assertEqual(downloaded['format_id'], '35')
+
+        ydl = YDL({'format': 'example-with-dashes'})
+        ydl.process_ie_result(info_dict.copy())
+        downloaded = ydl.downloaded_info_dicts[0]
+        self.assertEqual(downloaded['format_id'], 'example-with-dashes')
 
     def test_format_selection_audio(self):
         formats = [
@@ -305,8 +311,8 @@ def test_format_selection_string_ops(self):
         self.assertRaises(ExtractorError, ydl.process_ie_result, info_dict.copy())
 
     def test_youtube_format_selection(self):
-        # FIXME: Rewrite in accordance with the new format sorting options
         return
+        # disabled for now - this needs some changes
 
         order = [
             '38', '37', '46', '22', '45', '35', '44', '18', '34', '43', '6', '5', '17', '36', '13',
@@ -454,13 +460,14 @@ def test_format_selection_issue_10083(self):
 
     def test_invalid_format_specs(self):
         def assert_syntax_error(format_spec):
-            self.assertRaises(SyntaxError, YDL, {'format': format_spec})
+            ydl = YDL({'format': format_spec})
+            info_dict = _make_result([{'format_id': 'foo', 'url': TEST_URL}])
+            self.assertRaises(SyntaxError, ydl.process_ie_result, info_dict)
 
         assert_syntax_error('bestvideo,,best')
         assert_syntax_error('+bestaudio')
         assert_syntax_error('bestvideo+')
         assert_syntax_error('/')
-        assert_syntax_error('[720<height]')
 
     def test_format_filtering(self):
         formats = [
@@ -594,26 +601,6 @@ def get_info(params={}):
         self.assertTrue(subs)
         self.assertEqual(set(subs.keys()), set(['es', 'fr']))
 
-        result = get_info({'writesubtitles': True, 'subtitleslangs': ['all', '-en']})
-        subs = result['requested_subtitles']
-        self.assertTrue(subs)
-        self.assertEqual(set(subs.keys()), set(['es', 'fr']))
-
-        result = get_info({'writesubtitles': True, 'subtitleslangs': ['en', 'fr', '-en']})
-        subs = result['requested_subtitles']
-        self.assertTrue(subs)
-        self.assertEqual(set(subs.keys()), set(['fr']))
-
-        result = get_info({'writesubtitles': True, 'subtitleslangs': ['-en', 'en']})
-        subs = result['requested_subtitles']
-        self.assertTrue(subs)
-        self.assertEqual(set(subs.keys()), set(['en']))
-
-        result = get_info({'writesubtitles': True, 'subtitleslangs': ['e.+']})
-        subs = result['requested_subtitles']
-        self.assertTrue(subs)
-        self.assertEqual(set(subs.keys()), set(['es', 'en']))
-
         result = get_info({'writesubtitles': True, 'writeautomaticsub': True, 'subtitleslangs': ['es', 'pt']})
         subs = result['requested_subtitles']
         self.assertTrue(subs)
@@ -640,175 +627,47 @@ def test_add_extra_info(self):
         self.assertEqual(test_dict['extractor'], 'Foo')
         self.assertEqual(test_dict['playlist'], 'funny videos')
 
-    outtmpl_info = {
+    def test_prepare_filename(self):
+        info = {
             'id': '1234',
             'ext': 'mp4',
             'width': None,
             'height': 1080,
             'title1': '$PATH',
             'title2': '%PATH%',
-        'title3': 'foo/bar\\test',
-        'title4': 'foo "bar" test',
-        'timestamp': 1618488000,
-        'duration': 100000,
-        'playlist_index': 1,
-        '_last_playlist_index': 100,
-        'n_entries': 10,
-        'formats': [{'id': 'id1'}, {'id': 'id2'}, {'id': 'id3'}]
         }
 
-    def test_prepare_outtmpl_and_filename(self):
+        def fname(templ, na_placeholder='NA'):
-        def test(tmpl, expected, *, info=None, **params):
+            params = {'outtmpl': templ}
-            params['outtmpl'] = tmpl
+            if na_placeholder != 'NA':
+                params['outtmpl_na_placeholder'] = na_placeholder
             ydl = YoutubeDL(params)
-            ydl._num_downloads = 1
+            return ydl.prepare_filename(info)
-            self.assertEqual(ydl.validate_outtmpl(tmpl), None)
+        self.assertEqual(fname('%(id)s.%(ext)s'), '1234.mp4')
-
+        self.assertEqual(fname('%(id)s-%(width)s.%(ext)s'), '1234-NA.mp4')
-            outtmpl, tmpl_dict = ydl.prepare_outtmpl(tmpl, info or self.outtmpl_info)
+        NA_TEST_OUTTMPL = '%(uploader_date)s-%(width)d-%(id)s.%(ext)s'
-            out = ydl.escape_outtmpl(outtmpl) % tmpl_dict
+        # Replace missing fields with 'NA' by default
-            fname = ydl.prepare_filename(info or self.outtmpl_info)
+        self.assertEqual(fname(NA_TEST_OUTTMPL), 'NA-NA-1234.mp4')
-
+        # Or by provided placeholder
-            if not isinstance(expected, (list, tuple)):
+        self.assertEqual(fname(NA_TEST_OUTTMPL, na_placeholder='none'), 'none-none-1234.mp4')
-                expected = (expected, expected)
+        self.assertEqual(fname(NA_TEST_OUTTMPL, na_placeholder=''), '--1234.mp4')
-            for (name, got), expect in zip((('outtmpl', out), ('filename', fname)), expected):
+        self.assertEqual(fname('%(height)d.%(ext)s'), '1080.mp4')
-                if callable(expect):
+        self.assertEqual(fname('%(height)6d.%(ext)s'), '  1080.mp4')
-                    self.assertTrue(expect(got), f'Wrong {name} from {tmpl}')
+        self.assertEqual(fname('%(height)-6d.%(ext)s'), '1080  .mp4')
-                else:
+        self.assertEqual(fname('%(height)06d.%(ext)s'), '001080.mp4')
-                    self.assertEqual(got, expect, f'Wrong {name} from {tmpl}')
+        self.assertEqual(fname('%(height) 06d.%(ext)s'), ' 01080.mp4')
-
+        self.assertEqual(fname('%(height)   06d.%(ext)s'), ' 01080.mp4')
-        # Side-effects
+        self.assertEqual(fname('%(height)0 6d.%(ext)s'), ' 01080.mp4')
-        original_infodict = dict(self.outtmpl_info)
+        self.assertEqual(fname('%(height)0   6d.%(ext)s'), ' 01080.mp4')
-        test('foo.bar', 'foo.bar')
+        self.assertEqual(fname('%(height)   0   6d.%(ext)s'), ' 01080.mp4')
-        original_infodict['epoch'] = self.outtmpl_info.get('epoch')
+        self.assertEqual(fname('%%'), '%')
-        self.assertTrue(isinstance(original_infodict['epoch'], int))
+        self.assertEqual(fname('%%%%'), '%%')
-        test('%(epoch)d', int_or_none)
+        self.assertEqual(fname('%%(height)06d.%(ext)s'), '%(height)06d.mp4')
-        self.assertEqual(original_infodict, self.outtmpl_info)
+        self.assertEqual(fname('%(width)06d.%(ext)s'), 'NA.mp4')
-
+        self.assertEqual(fname('%(width)06d.%%(ext)s'), 'NA.%(ext)s')
-        # Auto-generated fields
+        self.assertEqual(fname('%%(width)06d.%(ext)s'), '%(width)06d.mp4')
-        test('%(id)s.%(ext)s', '1234.mp4')
+        self.assertEqual(fname('Hello %(title1)s'), 'Hello $PATH')
-        test('%(duration_string)s', ('27:46:40', '27-46-40'))
+        self.assertEqual(fname('Hello %(title2)s'), 'Hello %PATH%')
-        test('%(resolution)s', '1080p')
-        test('%(playlist_index)s', '001')
-        test('%(autonumber)s', '00001')
-        test('%(autonumber+2)03d', '005', autonumber_start=3)
-        test('%(autonumber)s', '001', autonumber_size=3)
-
-        # Escaping %
-        test('%', '%')
-        test('%%', '%')
-        test('%%%%', '%%')
-        test('%s', '%s')
-        test('%%%s', '%%s')
-        test('%d', '%d')
-        test('%abc%', '%abc%')
-        test('%%(width)06d.%(ext)s', '%(width)06d.mp4')
-        test('%%%(height)s', '%1080')
-        test('%(width)06d.%(ext)s', 'NA.mp4')
-        test('%(width)06d.%%(ext)s', 'NA.%(ext)s')
-        test('%%(width)06d.%(ext)s', '%(width)06d.mp4')
-
-        # ID sanitization
-        test('%(id)s', '_abcd', info={'id': '_abcd'})
-        test('%(some_id)s', '_abcd', info={'some_id': '_abcd'})
-        test('%(formats.0.id)s', '_abcd', info={'formats': [{'id': '_abcd'}]})
-        test('%(id)s', '-abcd', info={'id': '-abcd'})
-        test('%(id)s', '.abcd', info={'id': '.abcd'})
-        test('%(id)s', 'ab__cd', info={'id': 'ab__cd'})
-        test('%(id)s', ('ab:cd', 'ab -cd'), info={'id': 'ab:cd'})
-
-        # Invalid templates
-        self.assertTrue(isinstance(YoutubeDL.validate_outtmpl('%(title)'), ValueError))
-        test('%(invalid@tmpl|def)s', 'none', outtmpl_na_placeholder='none')
-        test('%(..)s', 'NA')
-
-        # Entire info_dict
-        def expect_same_infodict(out):
-            got_dict = json.loads(out)
-            for info_field, expected in self.outtmpl_info.items():
-                self.assertEqual(got_dict.get(info_field), expected, info_field)
-            return True
-
-        test('%()j', (expect_same_infodict, str))
-
-        # NA placeholder
-        NA_TEST_OUTTMPL = '%(uploader_date)s-%(width)d-%(x|def)s-%(id)s.%(ext)s'
-        test(NA_TEST_OUTTMPL, 'NA-NA-def-1234.mp4')
-        test(NA_TEST_OUTTMPL, 'none-none-def-1234.mp4', outtmpl_na_placeholder='none')
-        test(NA_TEST_OUTTMPL, '--def-1234.mp4', outtmpl_na_placeholder='')
-
-        # String formatting
-        FMT_TEST_OUTTMPL = '%%(height)%s.%%(ext)s'
-        test(FMT_TEST_OUTTMPL % 's', '1080.mp4')
-        test(FMT_TEST_OUTTMPL % 'd', '1080.mp4')
-        test(FMT_TEST_OUTTMPL % '6d', '  1080.mp4')
-        test(FMT_TEST_OUTTMPL % '-6d', '1080  .mp4')
-        test(FMT_TEST_OUTTMPL % '06d', '001080.mp4')
-        test(FMT_TEST_OUTTMPL % ' 06d', ' 01080.mp4')
-        test(FMT_TEST_OUTTMPL % '   06d', ' 01080.mp4')
-        test(FMT_TEST_OUTTMPL % '0 6d', ' 01080.mp4')
-        test(FMT_TEST_OUTTMPL % '0   6d', ' 01080.mp4')
-        test(FMT_TEST_OUTTMPL % '   0   6d', ' 01080.mp4')
-
-        # Type casting
-        test('%(id)d', '1234')
-        test('%(height)c', '1')
-        test('%(ext)c', 'm')
-        test('%(id)d %(id)r', "1234 '1234'")
-        test('%(id)r %(height)r', "'1234' 1080")
-        test('%(ext)s-%(ext|def)d', 'mp4-def')
-        test('%(width|0)04d', '0000')
-        test('a%(width|)d', 'a', outtmpl_na_placeholder='none')
-
-        FORMATS = self.outtmpl_info['formats']
-        sanitize = lambda x: x.replace(':', ' -').replace('"', "'")
-
-        # Custom type casting
-        test('%(formats.:.id)l', 'id1, id2, id3')
-        test('%(ext)l', 'mp4')
-        test('%(formats.:.id) 15l', '  id1, id2, id3')
-        test('%(formats)j', (json.dumps(FORMATS), sanitize(json.dumps(FORMATS))))
-        if compat_os_name == 'nt':
-            test('%(title4)q', ('"foo \\"bar\\" test"', "'foo _'bar_' test'"))
-        else:
-            test('%(title4)q', ('\'foo "bar" test\'', "'foo 'bar' test'"))
-
-        # Internal formatting
-        test('%(timestamp-1000>%H-%M-%S)s', '11-43-20')
-        test('%(title|%)s %(title|%%)s', '% %%')
-        test('%(id+1-height+3)05d', '00158')
-        test('%(width+100)05d', 'NA')
-        test('%(formats.0) 15s', ('% 15s' % FORMATS[0], '% 15s' % sanitize(str(FORMATS[0]))))
-        test('%(formats.0)r', (repr(FORMATS[0]), sanitize(repr(FORMATS[0]))))
-        test('%(height.0)03d', '001')
-        test('%(-height.0)04d', '-001')
-        test('%(formats.-1.id)s', FORMATS[-1]['id'])
-        test('%(formats.0.id.-1)d', FORMATS[0]['id'][-1])
-        test('%(formats.3)s', 'NA')
-        test('%(formats.:2:-1)r', repr(FORMATS[:2:-1]))
-        test('%(formats.0.id.-1+id)f', '1235.000000')
-        test('%(formats.0.id.-1+formats.1.id.-1)d', '3')
-
-        # Laziness
-        def gen():
-            yield from range(5)
-            raise self.assertTrue(False, 'LazyList should not be evaluated till here')
-        test('%(key.4)s', '4', info={'key': LazyList(gen())})
-
-        # Empty filename
-        test('%(foo|)s-%(bar|)s.%(ext)s', '-.mp4')
-        # test('%(foo|)s.%(ext)s', ('.mp4', '_.mp4'))  # fixme
-        # test('%(foo|)s', ('', '_'))  # fixme
-
-        # Environment variable expansion for prepare_filename
-        compat_setenv('__yt_dlp_var', 'expanded')
-        envvar = '%__yt_dlp_var%' if compat_os_name == 'nt' else '$__yt_dlp_var'
-        test(envvar, (envvar, 'expanded'))
-
-        # Path expansion and escaping
-        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', 'folder%sfoo_bar_test' % os.path.sep))
 
     def test_format_note(self):
         ydl = YoutubeDL()
@@ -867,7 +726,7 @@ def __init__(self, *args, **kwargs):
             def process_info(self, info_dict):
                 super(YDL, self).process_info(info_dict)
 
-            def _match_entry(self, info_dict, incomplete=False):
+            def _match_entry(self, info_dict, incomplete):
                 res = super(FilterYDL, self)._match_entry(info_dict, incomplete)
                 if res is None:
                     self.downloaded_info_dicts.append(info_dict)
@@ -978,31 +837,54 @@ def get_downloaded_info_dicts(params):
             ydl.process_ie_result(copy.deepcopy(playlist))
             return ydl.downloaded_info_dicts
 
-        def test_selection(params, expected_ids):
+        def get_ids(params):
-            results = [
+            return [int(v['id']) for v in get_downloaded_info_dicts(params)]
-                (v['playlist_autonumber'] - 1, (int(v['id']), v['playlist_index']))
-                for v in get_downloaded_info_dicts(params)]
-            self.assertEqual(results, list(enumerate(zip(expected_ids, expected_ids))))
 
-        test_selection({}, [1, 2, 3, 4])
+        result = get_ids({})
-        test_selection({'playlistend': 10}, [1, 2, 3, 4])
+        self.assertEqual(result, [1, 2, 3, 4])
-        test_selection({'playlistend': 2}, [1, 2])
+
-        test_selection({'playliststart': 10}, [])
+        result = get_ids({'playlistend': 10})
-        test_selection({'playliststart': 2}, [2, 3, 4])
+        self.assertEqual(result, [1, 2, 3, 4])
-        test_selection({'playlist_items': '2-4'}, [2, 3, 4])
+
-        test_selection({'playlist_items': '2,4'}, [2, 4])
+        result = get_ids({'playlistend': 2})
-        test_selection({'playlist_items': '10'}, [])
+        self.assertEqual(result, [1, 2])
+
+        result = get_ids({'playliststart': 10})
+        self.assertEqual(result, [])
+
+        result = get_ids({'playliststart': 2})
+        self.assertEqual(result, [2, 3, 4])
+
+        result = get_ids({'playlist_items': '2-4'})
+        self.assertEqual(result, [2, 3, 4])
+
+        result = get_ids({'playlist_items': '2,4'})
+        self.assertEqual(result, [2, 4])
+
+        result = get_ids({'playlist_items': '10'})
+        self.assertEqual(result, [])
+
+        result = get_ids({'playlist_items': '3-10'})
+        self.assertEqual(result, [3, 4])
+
+        result = get_ids({'playlist_items': '2-4,3-4,3'})
+        self.assertEqual(result, [2, 3, 4])
 
         # Tests for https://github.com/ytdl-org/youtube-dl/issues/10591
-        test_selection({'playlist_items': '2-4,3-4,3'}, [2, 3, 4])
+        # @{
-        test_selection({'playlist_items': '4,2'}, [4, 2])
+        result = get_downloaded_info_dicts({'playlist_items': '2-4,3-4,3'})
+        self.assertEqual(result[0]['playlist_index'], 2)
+        self.assertEqual(result[1]['playlist_index'], 3)
 
-        # Tests for https://github.com/yt-dlp/yt-dlp/issues/720
+        result = get_downloaded_info_dicts({'playlist_items': '2-4,3-4,3'})
-        # https://github.com/yt-dlp/yt-dlp/issues/302
+        self.assertEqual(result[0]['playlist_index'], 2)
-        test_selection({'playlistreverse': True}, [4, 3, 2, 1])
+        self.assertEqual(result[1]['playlist_index'], 3)
-        test_selection({'playliststart': 2, 'playlistreverse': True}, [4, 3, 2])
+        self.assertEqual(result[2]['playlist_index'], 4)
-        test_selection({'playlist_items': '2,4', 'playlistreverse': True}, [4, 2])
+
-        test_selection({'playlist_items': '4,2'}, [4, 2])
+        result = get_downloaded_info_dicts({'playlist_items': '4,2'})
+        self.assertEqual(result[0]['playlist_index'], 4)
+        self.assertEqual(result[1]['playlist_index'], 2)
+        # @}
 
     def test_urlopen_no_file_protocol(self):
         # see https://github.com/ytdl-org/youtube-dl/issues/8227

test/test_YoutubeDLCookieJar.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # coding: utf-8
 
 from __future__ import unicode_literals

test/test_aes.py

@@ -1,4 +1,5 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
+
 from __future__ import unicode_literals
 
 # Allow direct execution

test/test_age_restriction.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals
 
 # Allow direct execution
@@ -7,7 +7,8 @@
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from test.helper import try_rm, is_download_test
+from test.helper import try_rm
+
 
 from yt_dlp import YoutubeDL
 
@@ -31,7 +32,6 @@ def _download_restricted(url, filename, age):
     return res
 
 
-@is_download_test
 class TestAgeRestriction(unittest.TestCase):
     def _assert_restricted(self, url, filename, age, old_age=None):
         self.assertTrue(_download_restricted(url, filename, old_age))

test/test_all_urls.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 
 from __future__ import unicode_literals
 
@@ -37,6 +37,7 @@ def test_youtube_playlist_matching(self):
         assertPlaylist('PL63F0C78739B09958')
         assertTab('https://www.youtube.com/AsapSCIENCE')
         assertTab('https://www.youtube.com/embedded')
+        assertTab('https://www.youtube.com/feed')  # Own channel's home page
         assertTab('https://www.youtube.com/playlist?list=UUBABnxM4Ar9ten8Mdjj1j0Q')
         assertTab('https://www.youtube.com/course?list=ECUl4u3cNGP61MdtwGTqZA0MreSaDybji8')
         assertTab('https://www.youtube.com/playlist?list=PLwP_SiAcdui0KVebT0mU9Apz359a4ubsC')
@@ -72,6 +73,15 @@ def test_youtube_search_matching(self):
         self.assertMatch('http://www.youtube.com/results?search_query=making+mustard', ['youtube:search_url'])
         self.assertMatch('https://www.youtube.com/results?baz=bar&search_query=youtube-dl+test+video&filters=video&lclk=video', ['youtube:search_url'])
 
+    def test_youtube_extract(self):
+        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')
+        assertExtractId('https://www.youtube.com/watch_popup?v=BaW_jenozKc', 'BaW_jenozKc')
+        assertExtractId('http://www.youtube.com/watch?v=BaW_jenozKcsharePLED17F32AD9753930', 'BaW_jenozKc')
+        assertExtractId('BaW_jenozKc', 'BaW_jenozKc')
+
     def test_facebook_matching(self):
         self.assertTrue(FacebookIE.suitable('https://www.facebook.com/Shiniknoh#!/photo.php?v=10153317450565268'))
         self.assertTrue(FacebookIE.suitable('https://www.facebook.com/cindyweather?fref=ts#!/photo.php?v=10152183998945793'))

test/test_cache.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # coding: utf-8
 
 from __future__ import unicode_literals

test/test_compat.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # coding: utf-8
 
 from __future__ import unicode_literals

test/test_cookies.py

@@ -1,96 +0,0 @@
-import unittest
-from datetime import datetime, timezone
-
-from yt_dlp import cookies
-from yt_dlp.cookies import (
-    CRYPTO_AVAILABLE,
-    LinuxChromeCookieDecryptor,
-    MacChromeCookieDecryptor,
-    WindowsChromeCookieDecryptor,
-    YDLLogger,
-    parse_safari_cookies,
-    pbkdf2_sha1,
-)
-
-
-class MonkeyPatch:
-    def __init__(self, module, temporary_values):
-        self._module = module
-        self._temporary_values = temporary_values
-        self._backup_values = {}
-
-    def __enter__(self):
-        for name, temp_value in self._temporary_values.items():
-            self._backup_values[name] = getattr(self._module, name)
-            setattr(self._module, name, temp_value)
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        for name, backup_value in self._backup_values.items():
-            setattr(self._module, name, backup_value)
-
-
-class TestCookies(unittest.TestCase):
-    def test_chrome_cookie_decryptor_linux_derive_key(self):
-        key = LinuxChromeCookieDecryptor.derive_key(b'abc')
-        self.assertEqual(key, b'7\xa1\xec\xd4m\xfcA\xc7\xb19Z\xd0\x19\xdcM\x17')
-
-    def test_chrome_cookie_decryptor_mac_derive_key(self):
-        key = MacChromeCookieDecryptor.derive_key(b'abc')
-        self.assertEqual(key, b'Y\xe2\xc0\xd0P\xf6\xf4\xe1l\xc1\x8cQ\xcb|\xcdY')
-
-    def test_chrome_cookie_decryptor_linux_v10(self):
-        with MonkeyPatch(cookies, {'_get_linux_keyring_password': lambda *args, **kwargs: b''}):
-            encrypted_value = b'v10\xccW%\xcd\xe6\xe6\x9fM" \xa7\xb0\xca\xe4\x07\xd6'
-            value = 'USD'
-            decryptor = LinuxChromeCookieDecryptor('Chrome', YDLLogger())
-            self.assertEqual(decryptor.decrypt(encrypted_value), value)
-
-    def test_chrome_cookie_decryptor_linux_v11(self):
-        with MonkeyPatch(cookies, {'_get_linux_keyring_password': lambda *args, **kwargs: b'',
-                                   'KEYRING_AVAILABLE': True}):
-            encrypted_value = b'v11#\x81\x10>`w\x8f)\xc0\xb2\xc1\r\xf4\x1al\xdd\x93\xfd\xf8\xf8N\xf2\xa9\x83\xf1\xe9o\x0elVQd'
-            value = 'tz=Europe.London'
-            decryptor = LinuxChromeCookieDecryptor('Chrome', YDLLogger())
-            self.assertEqual(decryptor.decrypt(encrypted_value), value)
-
-    @unittest.skipIf(not CRYPTO_AVAILABLE, 'cryptography library not available')
-    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&'
-        }):
-            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('', YDLLogger())
-            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'
-            value = '2021-06-01-22'
-            decryptor = MacChromeCookieDecryptor('', YDLLogger())
-            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('
-
-        jar = parse_safari_cookies(cookies)
-        self.assertEqual(len(jar), 1)
-        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 = datetime(2021, 6, 18, 21, 39, 19, tzinfo=timezone.utc)
-        self.assertEqual(cookie.expires, int(expected_expiration.timestamp()))
-
-    def test_pbkdf2_sha1(self):
-        key = pbkdf2_sha1(b'peanuts', b' ' * 16, 1, 16)
-        self.assertEqual(key, b'g\xe1\x8e\x0fQ\x1c\x9b\xf3\xc9`!\xaa\x90\xd9\xd34')

test/test_download.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 
 from __future__ import unicode_literals
 
@@ -10,13 +10,12 @@
 
 from test.helper import (
     assertGreaterEqual,
-    expect_info_dict,
     expect_warnings,
     get_params,
     gettestcases,
-    is_download_test,
+    expect_info_dict,
-    report_warning,
     try_rm,
+    report_warning,
 )
 
 
@@ -65,7 +64,6 @@ def _file_md5(fn):
 defs = gettestcases()
 
 
-@is_download_test
 class TestDownload(unittest.TestCase):
     # Parallel testing in nosetests. See
     # http://nose.readthedocs.org/en/latest/doc_tests/test_multiprocess/multiprocess.html
@@ -73,8 +71,6 @@ class TestDownload(unittest.TestCase):
 
     maxDiff = None
 
-    COMPLETED_TESTS = {}
-
     def __str__(self):
         """Identify each test with the `add_ie` attribute, if available."""
 
@@ -96,9 +92,6 @@ def setUp(self):
 def generator(test_case, tname):
 
     def test_template(self):
-        if self.COMPLETED_TESTS.get(tname):
-            return
-        self.COMPLETED_TESTS[tname] = True
         ie = yt_dlp.extractor.get_info_extractor(test_case['name'])()
         other_ies = [get_info_extractor(ie_key)() for ie_key in test_case.get('add_ie', [])]
         is_playlist = any(k.startswith('playlist') for k in test_case)
@@ -113,13 +106,8 @@ def print_skipping(reason):
 
         for tc in test_cases:
             info_dict = tc.get('info_dict', {})
-            params = tc.get('params', {})
+            if not (info_dict.get('id') and info_dict.get('ext')):
-            if not info_dict.get('id'):
+                raise Exception('Test definition incorrect. The output file cannot be known. Are both \'id\' and \'ext\' keys present?')
-                raise Exception('Test definition incorrect. \'id\' key is not present')
-            elif not info_dict.get('ext'):
-                if params.get('skip_download') and params.get('ignore_no_formats_error'):
-                    continue
-                raise Exception('Test definition incorrect. The output file cannot be known. \'ext\' key is not present')
 
         if 'skip' in test_case:
             print_skipping(test_case['skip'])
@@ -133,7 +121,6 @@ def print_skipping(reason):
         params['outtmpl'] = tname + '_' + params['outtmpl']
         if is_playlist and 'playlist' not in test_case:
             params.setdefault('extract_flat', 'in_playlist')
-            params.setdefault('playlistend', test_case.get('playlist_mincount'))
             params.setdefault('skip_download', True)
 
         ydl = YoutubeDL(params, auto_init=False)
@@ -147,7 +134,7 @@ def _hook(status):
         expect_warnings(ydl, test_case.get('expected_warnings', []))
 
         def get_tc_filename(tc):
-            return ydl.prepare_filename(dict(tc.get('info_dict', {})))
+            return ydl.prepare_filename(tc.get('info_dict', {}))
 
         res_dict = None
 
@@ -260,12 +247,12 @@ def try_rm_tcs_files(tcs=None):
 
 
 # And add them to TestDownload
-tests_counter = {}
+for n, test_case in enumerate(defs):
-for test_case in defs:
+    tname = 'test_' + str(test_case['name'])
-    name = test_case['name']
+    i = 1
-    i = tests_counter.get(name, 0)
+    while hasattr(TestDownload, tname):
-    tests_counter[name] = i + 1
+        tname = 'test_%s_%d' % (test_case['name'], i)
-    tname = f'test_{name}_{i}' if i else f'test_{name}'
+        i += 1
     test_method = generator(test_case, tname)
     test_method.__name__ = str(tname)
     ie_list = test_case.get('add_ie')
@@ -274,22 +261,5 @@ def try_rm_tcs_files(tcs=None):
     del test_method
 
 
-def batch_generator(name, num_tests):
-
-    def test_template(self):
-        for i in range(num_tests):
-            getattr(self, f'test_{name}_{i}' if i else f'test_{name}')()
-
-    return test_template
-
-
-for name, num_tests in tests_counter.items():
-    test_method = batch_generator(name, num_tests)
-    test_method.__name__ = f'test_{name}_all'
-    test_method.add_ie = ''
-    setattr(TestDownload, test_method.__name__, test_method)
-    del test_method
-
-
 if __name__ == '__main__':
     unittest.main()

test/test_downloader_http.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # coding: utf-8
 from __future__ import unicode_literals
 

test/test_execution.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # coding: utf-8
 
 from __future__ import unicode_literals
@@ -39,16 +39,6 @@ def test_cmdline_umlauts(self):
         _, stderr = p.communicate()
         self.assertFalse(stderr)
 
-    def test_lazy_extractors(self):
-        try:
-            subprocess.check_call([sys.executable, 'devscripts/make_lazy_extractors.py', 'yt_dlp/extractor/lazy_extractors.py'], cwd=rootDir, stdout=_DEV_NULL)
-            subprocess.check_call([sys.executable, 'test/test_all_urls.py'], cwd=rootDir, stdout=_DEV_NULL)
-        finally:
-            try:
-                os.remove('yt_dlp/extractor/lazy_extractors.py')
-            except (IOError, OSError):
-                pass
-
 
 if __name__ == '__main__':
     unittest.main()

test/test_http.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # coding: utf-8
 from __future__ import unicode_literals
 

test/test_iqiyi_sdk_interpreter.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 
 from __future__ import unicode_literals
 
@@ -8,7 +8,7 @@
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from test.helper import FakeYDL, is_download_test
+from test.helper import FakeYDL
 from yt_dlp.extractor import IqiyiIE
 
 
@@ -31,7 +31,6 @@ def error(self, msg):
         pass
 
 
-@is_download_test
 class TestIqiyiSDKInterpreter(unittest.TestCase):
     def test_iqiyi_sdk_interpreter(self):
         '''

test/test_jsinterp.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 
 from __future__ import unicode_literals
 

test/test_overwrites.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals
 
 import os
@@ -8,14 +8,13 @@
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from test.helper import is_download_test, try_rm
+from test.helper import try_rm
 
 
 root_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 download_file = join(root_dir, 'test.webm')
 
 
-@is_download_test
 class TestOverwrites(unittest.TestCase):
     def setUp(self):
         # create an empty file

test/test_post_hooks.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 
 from __future__ import unicode_literals
 
@@ -7,7 +7,7 @@
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from test.helper import get_params, try_rm, is_download_test
+from test.helper import get_params, try_rm
 import yt_dlp.YoutubeDL
 from yt_dlp.utils import DownloadError
 
@@ -22,7 +22,6 @@ def __init__(self, *args, **kwargs):
 EXPECTED_NAME = 'gr51aVj-mLg'
 
 
-@is_download_test
 class TestPostHooks(unittest.TestCase):
     def setUp(self):
         self.stored_name_1 = None

test/test_postprocessors.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 
 from __future__ import unicode_literals
 
@@ -6,525 +6,18 @@
 import os
 import sys
 import unittest
-
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from yt_dlp import YoutubeDL
+from yt_dlp.postprocessor import MetadataFromFieldPP, MetadataFromTitlePP
-from yt_dlp.compat import compat_shlex_quote
-from yt_dlp.postprocessor import (
-    ExecPP,
-    FFmpegThumbnailsConvertorPP,
-    MetadataFromFieldPP,
-    MetadataParserPP,
-    ModifyChaptersPP
-)
 
 
 class TestMetadataFromField(unittest.TestCase):
-
     def test_format_to_regex(self):
-        self.assertEqual(
+        pp = MetadataFromFieldPP(None, ['title:%(title)s - %(artist)s'])
-            MetadataParserPP.format_to_regex('%(title)s - %(artist)s'),
+        self.assertEqual(pp._data[0]['regex'], r'(?P<title>[^\r\n]+)\ \-\ (?P<artist>[^\r\n]+)')
-            r'(?P<title>.+)\ \-\ (?P<artist>.+)')
-        self.assertEqual(MetadataParserPP.format_to_regex(r'(?P<x>.+)'), r'(?P<x>.+)')
-
-    def test_field_to_template(self):
-        self.assertEqual(MetadataParserPP.field_to_template('title'), '%(title)s')
-        self.assertEqual(MetadataParserPP.field_to_template('1'), '1')
-        self.assertEqual(MetadataParserPP.field_to_template('foo bar'), 'foo bar')
-        self.assertEqual(MetadataParserPP.field_to_template(' literal'), ' literal')
-
-    def test_metadatafromfield(self):
-        self.assertEqual(
-            MetadataFromFieldPP.to_action('%(title)s \\: %(artist)s:%(title)s : %(artist)s'),
-            (MetadataParserPP.Actions.INTERPRET, '%(title)s : %(artist)s', '%(title)s : %(artist)s'))
 
 
-class TestConvertThumbnail(unittest.TestCase):
+class TestMetadataFromTitle(unittest.TestCase):
-    def test_escaping(self):
+    def test_format_to_regex(self):
-        pp = FFmpegThumbnailsConvertorPP()
+        pp = MetadataFromTitlePP(None, '%(title)s - %(artist)s')
-        if not pp.available:
+        self.assertEqual(pp._titleregex, r'(?P<title>[^\r\n]+)\ \-\ (?P<artist>[^\r\n]+)')
-            print('Skipping: ffmpeg not found')
-            return
-
-        file = 'test/testdata/thumbnails/foo %d bar/foo_%d.{}'
-        tests = (('webp', 'png'), ('png', 'jpg'))
-
-        for inp, out in tests:
-            out_file = file.format(out)
-            if os.path.exists(out_file):
-                os.remove(out_file)
-            pp.convert_thumbnail(file.format(inp), out)
-            assert os.path.exists(out_file)
-
-        for _, out in tests:
-            os.remove(file.format(out))
-
-
-class TestExec(unittest.TestCase):
-    def test_parse_cmd(self):
-        pp = ExecPP(YoutubeDL(), '')
-        info = {'filepath': 'file name'}
-        cmd = 'echo %s' % compat_shlex_quote(info['filepath'])
-
-        self.assertEqual(pp.parse_cmd('echo', info), cmd)
-        self.assertEqual(pp.parse_cmd('echo {}', info), cmd)
-        self.assertEqual(pp.parse_cmd('echo %(filepath)q', info), cmd)
-
-
-class TestModifyChaptersPP(unittest.TestCase):
-    def setUp(self):
-        self._pp = ModifyChaptersPP(YoutubeDL())
-
-    @staticmethod
-    def _sponsor_chapter(start, end, cat, remove=False):
-        c = {'start_time': start, 'end_time': end, '_categories': [(cat, start, end)]}
-        if remove:
-            c['remove'] = True
-        return c
-
-    @staticmethod
-    def _chapter(start, end, title=None, remove=False):
-        c = {'start_time': start, 'end_time': end}
-        if title is not None:
-            c['title'] = title
-        if remove:
-            c['remove'] = True
-        return c
-
-    def _chapters(self, ends, titles):
-        self.assertEqual(len(ends), len(titles))
-        start = 0
-        chapters = []
-        for e, t in zip(ends, titles):
-            chapters.append(self._chapter(start, e, t))
-            start = e
-        return chapters
-
-    def _remove_marked_arrange_sponsors_test_impl(
-            self, chapters, expected_chapters, expected_removed):
-        actual_chapters, actual_removed = (
-            self._pp._remove_marked_arrange_sponsors(chapters))
-        for c in actual_removed:
-            c.pop('title', None)
-            c.pop('_categories', None)
-        actual_chapters = [{
-            'start_time': c['start_time'],
-            'end_time': c['end_time'],
-            'title': c['title'],
-        } for c in actual_chapters]
-        self.assertSequenceEqual(expected_chapters, actual_chapters)
-        self.assertSequenceEqual(expected_removed, actual_removed)
-
-    def test_remove_marked_arrange_sponsors_CanGetThroughUnaltered(self):
-        chapters = self._chapters([10, 20, 30, 40], ['c1', 'c2', 'c3', 'c4'])
-        self._remove_marked_arrange_sponsors_test_impl(chapters, chapters, [])
-
-    def test_remove_marked_arrange_sponsors_ChapterWithSponsors(self):
-        chapters = self._chapters([70], ['c']) + [
-            self._sponsor_chapter(10, 20, 'sponsor'),
-            self._sponsor_chapter(30, 40, 'preview'),
-            self._sponsor_chapter(50, 60, 'sponsor')]
-        expected = self._chapters(
-            [10, 20, 30, 40, 50, 60, 70],
-            ['c', '[SponsorBlock]: Sponsor', 'c', '[SponsorBlock]: Preview/Recap',
-             'c', '[SponsorBlock]: Sponsor', 'c'])
-        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')]
-        expected = self._chapters(
-            [10, 20, 40, 45, 50, 60, 70, 85, 90, 100, 110, 120],
-            ['c', '[SponsorBlock]: Sponsor', '[SponsorBlock]: Sponsor, Unpaid/Self Promotion',
-             '[SponsorBlock]: Sponsor',
-             'c', '[SponsorBlock]: Sponsor', '[SponsorBlock]: Sponsor, Unpaid/Self Promotion',
-             '[SponsorBlock]: Unpaid/Self Promotion',
-             'c', '[SponsorBlock]: Unpaid/Self Promotion', '[SponsorBlock]: Unpaid/Self Promotion, Sponsor',
-             '[SponsorBlock]: Unpaid/Self Promotion'])
-        self._remove_marked_arrange_sponsors_test_impl(chapters, expected, [])
-
-    def test_remove_marked_arrange_sponsors_ChapterWithCuts(self):
-        cuts = [self._chapter(10, 20, remove=True),
-                self._sponsor_chapter(30, 40, 'sponsor', remove=True),
-                self._chapter(50, 60, remove=True)]
-        chapters = self._chapters([70], ['c']) + cuts
-        self._remove_marked_arrange_sponsors_test_impl(
-            chapters, self._chapters([40], ['c']), cuts)
-
-    def test_remove_marked_arrange_sponsors_ChapterWithSponsorsAndCuts(self):
-        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')]
-        expected = self._chapters([10, 20, 40, 50, 60],
-                                  ['c', '[SponsorBlock]: Sponsor', 'c',
-                                   '[SponsorBlock]: Interaction Reminder', 'c'])
-        self._remove_marked_arrange_sponsors_test_impl(
-            chapters, expected, [self._chapter(30, 40, remove=True)])
-
-    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
-        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, 'selpromo', remove=True)]
-        chapters = self._chapters([60], ['c']) + [
-            self._sponsor_chapter(10, 20, 'intro'),
-            self._sponsor_chapter(30, 40, 'sponsor'),
-            self._sponsor_chapter(50, 60, 'outro'),
-        ] + 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']) + [
-            self._sponsor_chapter(10, 20, 'sponsor'),
-            self._sponsor_chapter(20, 30, 'selfpromo'),
-            self._sponsor_chapter(30, 40, 'interaction')]
-        expected = self._chapters(
-            [10, 20, 30, 40, 70],
-            ['c', '[SponsorBlock]: Sponsor', '[SponsorBlock]: Unpaid/Self Promotion',
-             '[SponsorBlock]: Interaction Reminder', 'c'])
-        self._remove_marked_arrange_sponsors_test_impl(chapters, expected, [])
-
-    def test_remove_marked_arrange_sponsors_ChapterWithAdjacentCuts(self):
-        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),
-            self._sponsor_chapter(40, 50, 'selpromo', remove=True),
-            self._sponsor_chapter(50, 60, 'interaction')]
-        expected = self._chapters([10, 20, 30, 40],
-                                  ['c', '[SponsorBlock]: Sponsor',
-                                   '[SponsorBlock]: Interaction Reminder', 'c'])
-        self._remove_marked_arrange_sponsors_test_impl(
-            chapters, expected, [self._chapter(20, 50, remove=True)])
-
-    def test_remove_marked_arrange_sponsors_ChapterWithOverlappingSponsors(self):
-        chapters = self._chapters([70], ['c']) + [
-            self._sponsor_chapter(10, 30, 'sponsor'),
-            self._sponsor_chapter(20, 50, 'selfpromo'),
-            self._sponsor_chapter(40, 60, 'interaction')]
-        expected = self._chapters(
-            [10, 20, 30, 40, 50, 60, 70],
-            ['c', '[SponsorBlock]: Sponsor', '[SponsorBlock]: Sponsor, Unpaid/Self Promotion',
-             '[SponsorBlock]: Unpaid/Self Promotion', '[SponsorBlock]: Unpaid/Self Promotion, Interaction Reminder',
-             '[SponsorBlock]: Interaction Reminder', 'c'])
-        self._remove_marked_arrange_sponsors_test_impl(chapters, expected, [])
-
-    def test_remove_marked_arrange_sponsors_ChapterWithOverlappingCuts(self):
-        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)]
-        self._remove_marked_arrange_sponsors_test_impl(
-            chapters, self._chapters([20], ['c']), [self._chapter(10, 60, remove=True)])
-
-    def test_remove_marked_arrange_sponsors_ChapterWithRunsOfOverlappingSponsors(self):
-        chapters = self._chapters([170], ['c']) + [
-            self._sponsor_chapter(0, 30, 'intro'),
-            self._sponsor_chapter(20, 50, 'sponsor'),
-            self._sponsor_chapter(40, 60, 'selfpromo'),
-            self._sponsor_chapter(70, 90, 'sponsor'),
-            self._sponsor_chapter(80, 100, 'sponsor'),
-            self._sponsor_chapter(90, 110, 'sponsor'),
-            self._sponsor_chapter(120, 140, 'selfpromo'),
-            self._sponsor_chapter(130, 160, 'interaction'),
-            self._sponsor_chapter(150, 170, 'outro')]
-        expected = self._chapters(
-            [20, 30, 40, 50, 60, 70, 110, 120, 130, 140, 150, 160, 170],
-            ['[SponsorBlock]: Intermission/Intro Animation', '[SponsorBlock]: Intermission/Intro Animation, Sponsor', '[SponsorBlock]: Sponsor',
-             '[SponsorBlock]: Sponsor, Unpaid/Self Promotion', '[SponsorBlock]: Unpaid/Self Promotion', 'c',
-             '[SponsorBlock]: Sponsor', 'c', '[SponsorBlock]: Unpaid/Self Promotion',
-             '[SponsorBlock]: Unpaid/Self Promotion, Interaction Reminder',
-             '[SponsorBlock]: Interaction Reminder',
-             '[SponsorBlock]: Interaction Reminder, Endcards/Credits', '[SponsorBlock]: Endcards/Credits'])
-        self._remove_marked_arrange_sponsors_test_impl(chapters, expected, [])
-
-    def test_remove_marked_arrange_sponsors_ChapterWithRunsOfOverlappingCuts(self):
-        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),
-            self._sponsor_chapter(70, 90, 'sponsor', remove=True),
-            self._chapter(80, 100, remove=True),
-            self._chapter(90, 110, remove=True),
-            self._sponsor_chapter(120, 140, 'sponsor', remove=True),
-            self._sponsor_chapter(130, 160, 'selfpromo', remove=True),
-            self._chapter(150, 170, remove=True)]
-        expected_cuts = [self._chapter(0, 60, remove=True),
-                         self._chapter(70, 110, remove=True),
-                         self._chapter(120, 170, remove=True)]
-        self._remove_marked_arrange_sponsors_test_impl(
-            chapters, self._chapters([20], ['c']), expected_cuts)
-
-    def test_remove_marked_arrange_sponsors_OverlappingSponsorsDifferentTitlesAfterCut(self):
-        chapters = self._chapters([60], ['c']) + [
-            self._sponsor_chapter(10, 60, 'sponsor'),
-            self._sponsor_chapter(10, 40, 'intro'),
-            self._sponsor_chapter(30, 50, 'interaction'),
-            self._sponsor_chapter(30, 50, 'selfpromo', remove=True),
-            self._sponsor_chapter(40, 50, 'interaction'),
-            self._sponsor_chapter(50, 60, 'outro')]
-        expected = self._chapters(
-            [10, 30, 40], ['c', '[SponsorBlock]: Sponsor, Intermission/Intro Animation', '[SponsorBlock]: Sponsor, Endcards/Credits'])
-        self._remove_marked_arrange_sponsors_test_impl(
-            chapters, expected, [self._chapter(30, 50, remove=True)])
-
-    def test_remove_marked_arrange_sponsors_SponsorsNoLongerOverlapAfterCut(self):
-        chapters = self._chapters([70], ['c']) + [
-            self._sponsor_chapter(10, 30, 'sponsor'),
-            self._sponsor_chapter(20, 50, 'interaction'),
-            self._sponsor_chapter(30, 50, 'selpromo', remove=True),
-            self._sponsor_chapter(40, 60, 'sponsor'),
-            self._sponsor_chapter(50, 60, 'interaction')]
-        expected = self._chapters(
-            [10, 20, 40, 50], ['c', '[SponsorBlock]: Sponsor',
-                               '[SponsorBlock]: Sponsor, Interaction Reminder', 'c'])
-        self._remove_marked_arrange_sponsors_test_impl(
-            chapters, expected, [self._chapter(30, 50, remove=True)])
-
-    def test_remove_marked_arrange_sponsors_SponsorsStillOverlapAfterCut(self):
-        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)]
-        expected = self._chapters(
-            [10, 20, 40, 50], ['c', '[SponsorBlock]: Sponsor',
-                               '[SponsorBlock]: Sponsor, Interaction Reminder', 'c'])
-        self._remove_marked_arrange_sponsors_test_impl(
-            chapters, expected, [self._chapter(30, 50, remove=True)])
-
-    def test_remove_marked_arrange_sponsors_ChapterWithRunsOfOverlappingSponsorsAndCuts(self):
-        chapters = self._chapters([200], ['c']) + [
-            self._sponsor_chapter(10, 40, 'sponsor'),
-            self._sponsor_chapter(10, 30, 'intro'),
-            self._chapter(20, 30, remove=True),
-            self._sponsor_chapter(30, 40, 'selfpromo'),
-            self._sponsor_chapter(50, 70, 'sponsor'),
-            self._sponsor_chapter(60, 80, 'interaction'),
-            self._chapter(70, 80, remove=True),
-            self._sponsor_chapter(70, 90, 'sponsor'),
-            self._sponsor_chapter(80, 100, 'interaction'),
-            self._sponsor_chapter(120, 170, 'selfpromo'),
-            self._sponsor_chapter(130, 180, 'outro'),
-            self._chapter(140, 150, remove=True),
-            self._chapter(150, 160, remove=True)]
-        expected = self._chapters(
-            [10, 20, 30, 40, 50, 70, 80, 100, 110, 130, 140, 160],
-            ['c', '[SponsorBlock]: Sponsor, Intermission/Intro Animation', '[SponsorBlock]: Sponsor, Unpaid/Self Promotion',
-             'c', '[SponsorBlock]: Sponsor', '[SponsorBlock]: Sponsor, Interaction Reminder',
-             '[SponsorBlock]: Interaction Reminder', 'c', '[SponsorBlock]: Unpaid/Self Promotion',
-             '[SponsorBlock]: Unpaid/Self Promotion, Endcards/Credits', '[SponsorBlock]: Endcards/Credits', 'c'])
-        expected_cuts = [self._chapter(20, 30, remove=True),
-                         self._chapter(70, 80, remove=True),
-                         self._chapter(140, 160, remove=True)]
-        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')])
-        expected = self._chapters([10, 90, 100], ['c1', '[SponsorBlock]: Sponsor', 'c5'])
-        self._remove_marked_arrange_sponsors_test_impl(chapters, expected, [])
-
-    def test_remove_marked_arrange_sponsors_CutOverlapsMultipleChapters(self):
-        cuts = [self._chapter(10, 90, remove=True)]
-        chapters = self._chapters([20, 40, 60, 80, 100], ['c1', 'c2', 'c3', 'c4', 'c5']) + cuts
-        expected = self._chapters([10, 20], ['c1', 'c5'])
-        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')])
-        expected = self._chapters([10, 20, 30, 40, 50, 70, 80],
-                                  ['c1', 'c2', '[SponsorBlock]: Sponsor', 'c2', 'c3',
-                                   '[SponsorBlock]: Unpaid/Self Promotion', 'c4'])
-        self._remove_marked_arrange_sponsors_test_impl(chapters, expected, [])
-
-    def test_remove_marked_arrange_sponsors_CutsWithinSomeChaptersAndOverlappingOthers(self):
-        cuts = [self._chapter(20, 30, remove=True), self._chapter(50, 70, remove=True)]
-        chapters = self._chapters([10, 40, 60, 80], ['c1', 'c2', 'c3', 'c4']) + cuts
-        expected = self._chapters([10, 30, 40, 50], ['c1', 'c2', 'c3', 'c4'])
-        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')])
-        expected = self._chapters(
-            [10, 30, 40, 50, 60],
-            ['c1', '[SponsorBlock]: Non-Music Section', 'c2', 'c3', 'c4'])
-        self._remove_marked_arrange_sponsors_test_impl(chapters, expected, [])
-
-    def test_remove_marked_arrange_sponsors_ChaptersAfterLastCut(self):
-        cuts = [self._chapter(10, 30, remove=True)]
-        chapters = self._chapters([20, 40, 50, 60], ['c1', 'c2', 'c3', 'c4']) + cuts
-        expected = self._chapters([10, 20, 30, 40], ['c1', 'c2', 'c3', 'c4'])
-        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')])
-        expected = self._chapters([10, 20, 30, 40], ['c1', 'c2', '[SponsorBlock]: Sponsor', 'c3'])
-        self._remove_marked_arrange_sponsors_test_impl(chapters, expected, [])
-
-    def test_remove_marked_arrange_sponsors_CutStartsAtChapterStart(self):
-        cuts = [self._chapter(20, 30, remove=True)]
-        chapters = self._chapters([10, 20, 40], ['c1', 'c2', 'c3']) + cuts
-        expected = self._chapters([10, 20, 30], ['c1', 'c2', 'c3'])
-        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')])
-        expected = self._chapters([10, 20, 30, 40], ['c1', 'c2', '[SponsorBlock]: Sponsor', 'c3'])
-        self._remove_marked_arrange_sponsors_test_impl(chapters, expected, [])
-
-    def test_remove_marked_arrange_sponsors_CutEndsAtChapterEnd(self):
-        cuts = [self._chapter(20, 30, remove=True)]
-        chapters = self._chapters([10, 30, 40], ['c1', 'c2', 'c3']) + cuts
-        expected = self._chapters([10, 20, 30], ['c1', 'c2', 'c3'])
-        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')])
-        expected = self._chapters([10, 30, 40], ['c1', '[SponsorBlock]: Sponsor', 'c4'])
-        self._remove_marked_arrange_sponsors_test_impl(chapters, expected, [])
-
-    def test_remove_marked_arrange_sponsors_CutCoincidesWithChapters(self):
-        cuts = [self._chapter(10, 30, remove=True)]
-        chapters = self._chapters([10, 20, 30, 40], ['c1', 'c2', 'c3', 'c4']) + cuts
-        expected = self._chapters([10, 20], ['c1', 'c4'])
-        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')])
-        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, [])
-
-    def test_remove_marked_arrange_sponsors_CutsAtVideoBoundaries(self):
-        cuts = [self._chapter(0, 10, remove=True), self._chapter(50, 60, remove=True)]
-        chapters = self._chapters([20, 40, 60], ['c1', 'c2', 'c3']) + cuts
-        expected = self._chapters([10, 30, 40], ['c1', 'c2', 'c3'])
-        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')])
-        expected = self._chapters(
-            [20, 30, 50], ['[SponsorBlock]: Intermission/Intro Animation', 'c2', '[SponsorBlock]: Endcards/Credits'])
-        self._remove_marked_arrange_sponsors_test_impl(chapters, expected, [])
-
-    def test_remove_marked_arrange_sponsors_CutsOverlapChaptersAtVideoBoundaries(self):
-        cuts = [self._chapter(0, 20, remove=True), self._chapter(30, 50, remove=True)]
-        chapters = self._chapters([10, 40, 50], ['c1', 'c2', 'c3']) + cuts
-        expected = self._chapters([10], ['c2'])
-        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')])
-        expected = self._chapters([20, 40], ['[SponsorBlock]: Intermission/Intro Animation', '[SponsorBlock]: Endcards/Credits'])
-        self._remove_marked_arrange_sponsors_test_impl(chapters, expected, [])
-
-    def test_remove_marked_arrange_sponsors_EverythingCut(self):
-        cuts = [self._chapter(0, 20, remove=True), self._chapter(20, 40, remove=True)]
-        chapters = self._chapters([10, 20, 30, 40], ['c1', 'c2', 'c3', 'c4']) + cuts
-        self._remove_marked_arrange_sponsors_test_impl(
-            chapters, [], [self._chapter(0, 40, remove=True)])
-
-    def test_remove_marked_arrange_sponsors_TinyChaptersInTheOriginalArePreserved(self):
-        chapters = self._chapters([0.1, 0.2, 0.3, 0.4], ['c1', 'c2', 'c3', 'c4'])
-        self._remove_marked_arrange_sponsors_test_impl(chapters, chapters, [])
-
-    def test_remove_marked_arrange_sponsors_TinySponsorsAreIgnored(self):
-        chapters = [self._sponsor_chapter(0, 0.1, 'intro'), self._chapter(0.1, 0.2, 'c1'),
-                    self._sponsor_chapter(0.2, 0.3, 'sponsor'), self._chapter(0.3, 0.4, 'c2'),
-                    self._sponsor_chapter(0.4, 0.5, 'outro')]
-        self._remove_marked_arrange_sponsors_test_impl(
-            chapters, self._chapters([0.3, 0.5], ['c1', 'c2']), [])
-
-    def test_remove_marked_arrange_sponsors_TinyChaptersResultingFromCutsAreIgnored(self):
-        cuts = [self._chapter(1.5, 2.5, remove=True)]
-        chapters = self._chapters([2, 3, 3.5], ['c1', 'c2', 'c3']) + cuts
-        self._remove_marked_arrange_sponsors_test_impl(
-            chapters, self._chapters([2, 2.5], ['c1', 'c3']), cuts)
-
-    def test_remove_marked_arrange_sponsors_TinyChaptersResultingFromSponsorOverlapAreIgnored(self):
-        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, 3, 4], ['c1', '[SponsorBlock]: Sponsor', 'c3']), [])
-
-    def test_remove_marked_arrange_sponsors_TinySponsorsOverlapsAreIgnored(self):
-        chapters = self._chapters([2, 3, 5], ['c1', 'c2', 'c3']) + [
-            self._sponsor_chapter(1, 3, 'sponsor'),
-            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_make_concat_opts_CommonCase(self):
-        sponsor_chapters = [self._chapter(1, 2, 's1'), self._chapter(10, 20, 's2')]
-        expected = '''ffconcat version 1.0
-file 'file:test'
-outpoint 1.000000
-file 'file:test'
-inpoint 2.000000
-outpoint 10.000000
-file 'file:test'
-inpoint 20.000000
-'''
-        opts = self._pp._make_concat_opts(sponsor_chapters, 30)
-        self.assertEqual(expected, ''.join(self._pp._concat_spec(['test'] * len(opts), opts)))
-
-    def test_make_concat_opts_NoZeroDurationChunkAtVideoStart(self):
-        sponsor_chapters = [self._chapter(0, 1, 's1'), self._chapter(10, 20, 's2')]
-        expected = '''ffconcat version 1.0
-file 'file:test'
-inpoint 1.000000
-outpoint 10.000000
-file 'file:test'
-inpoint 20.000000
-'''
-        opts = self._pp._make_concat_opts(sponsor_chapters, 30)
-        self.assertEqual(expected, ''.join(self._pp._concat_spec(['test'] * len(opts), opts)))
-
-    def test_make_concat_opts_NoZeroDurationChunkAtVideoEnd(self):
-        sponsor_chapters = [self._chapter(1, 2, 's1'), self._chapter(10, 20, 's2')]
-        expected = '''ffconcat version 1.0
-file 'file:test'
-outpoint 1.000000
-file 'file:test'
-inpoint 2.000000
-outpoint 10.000000
-'''
-        opts = self._pp._make_concat_opts(sponsor_chapters, 20)
-        self.assertEqual(expected, ''.join(self._pp._concat_spec(['test'] * len(opts), opts)))
-
-    def test_quote_for_concat_RunsOfQuotes(self):
-        self.assertEqual(
-            r"'special '\'' '\'\''characters'\'\'\''galore'",
-            self._pp._quote_for_ffmpeg("special ' ''characters'''galore"))
-
-    def test_quote_for_concat_QuotesAtStart(self):
-        self.assertEqual(
-            r"\'\'\''special '\'' characters '\'' galore'",
-            self._pp._quote_for_ffmpeg("'''special ' characters ' galore"))
-
-    def test_quote_for_concat_QuotesAtEnd(self):
-        self.assertEqual(
-            r"'special '\'' characters '\'' galore'\'\'\'",
-            self._pp._quote_for_ffmpeg("special ' characters ' galore'''"))

test/test_socks.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # coding: utf-8
 from __future__ import unicode_literals
 
@@ -14,7 +14,6 @@
 from test.helper import (
     FakeYDL,
     get_params,
-    is_download_test,
 )
 from yt_dlp.compat import (
     compat_str,
@@ -22,7 +21,6 @@
 )
 
 
-@is_download_test
 class TestMultipleSocks(unittest.TestCase):
     @staticmethod
     def _check_params(attrs):
@@ -78,7 +76,6 @@ def test_secondary_proxy_https(self):
             params['secondary_server_ip'])
 
 
-@is_download_test
 class TestSocks(unittest.TestCase):
     _SKIP_SOCKS_TEST = True
 

test/test_subtitles.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals
 
 # Allow direct execution
@@ -7,7 +7,7 @@
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from test.helper import FakeYDL, md5, is_download_test
+from test.helper import FakeYDL, md5
 
 
 from yt_dlp.extractor import (
@@ -30,7 +30,6 @@
 )
 
 
-@is_download_test
 class BaseTestSubtitles(unittest.TestCase):
     url = None
     IE = None
@@ -56,7 +55,6 @@ def getSubtitles(self):
         return dict((l, sub_info['data']) for l, sub_info in subtitles.items())
 
 
-@is_download_test
 class TestYoutubeSubtitles(BaseTestSubtitles):
     url = 'QRS8MkLhQmM'
     IE = YoutubeIE
@@ -113,7 +111,6 @@ def test_youtube_nosubtitles(self):
         self.assertFalse(subtitles)
 
 
-@is_download_test
 class TestDailymotionSubtitles(BaseTestSubtitles):
     url = 'http://www.dailymotion.com/video/xczg00'
     IE = DailymotionIE
@@ -137,7 +134,6 @@ def test_nosubtitles(self):
         self.assertFalse(subtitles)
 
 
-@is_download_test
 class TestTedSubtitles(BaseTestSubtitles):
     url = 'http://www.ted.com/talks/dan_dennett_on_our_consciousness.html'
     IE = TEDIE
@@ -153,7 +149,6 @@ def test_allsubtitles(self):
             self.assertTrue(subtitles.get(lang) is not None, 'Subtitles for \'%s\' not extracted' % lang)
 
 
-@is_download_test
 class TestVimeoSubtitles(BaseTestSubtitles):
     url = 'http://vimeo.com/76979871'
     IE = VimeoIE
@@ -175,7 +170,6 @@ def test_nosubtitles(self):
         self.assertFalse(subtitles)
 
 
-@is_download_test
 class TestWallaSubtitles(BaseTestSubtitles):
     url = 'http://vod.walla.co.il/movie/2705958/the-yes-men'
     IE = WallaIE
@@ -197,7 +191,6 @@ def test_nosubtitles(self):
         self.assertFalse(subtitles)
 
 
-@is_download_test
 class TestCeskaTelevizeSubtitles(BaseTestSubtitles):
     url = 'http://www.ceskatelevize.cz/ivysilani/10600540290-u6-uzasny-svet-techniky'
     IE = CeskaTelevizeIE
@@ -219,7 +212,6 @@ def test_nosubtitles(self):
         self.assertFalse(subtitles)
 
 
-@is_download_test
 class TestLyndaSubtitles(BaseTestSubtitles):
     url = 'http://www.lynda.com/Bootstrap-tutorials/Using-exercise-files/110885/114408-4.html'
     IE = LyndaIE
@@ -232,7 +224,6 @@ def test_allsubtitles(self):
         self.assertEqual(md5(subtitles['en']), '09bbe67222259bed60deaa26997d73a7')
 
 
-@is_download_test
 class TestNPOSubtitles(BaseTestSubtitles):
     url = 'http://www.npo.nl/nos-journaal/28-08-2014/POW_00722860'
     IE = NPOIE
@@ -245,7 +236,6 @@ def test_allsubtitles(self):
         self.assertEqual(md5(subtitles['nl']), 'fc6435027572b63fb4ab143abd5ad3f4')
 
 
-@is_download_test
 class TestMTVSubtitles(BaseTestSubtitles):
     url = 'http://www.cc.com/video-clips/p63lk0/adam-devine-s-house-party-chasing-white-swans'
     IE = ComedyCentralIE
@@ -261,7 +251,6 @@ def test_allsubtitles(self):
         self.assertEqual(md5(subtitles['en']), '78206b8d8a0cfa9da64dc026eea48961')
 
 
-@is_download_test
 class TestNRKSubtitles(BaseTestSubtitles):
     url = 'http://tv.nrk.no/serie/ikke-gjoer-dette-hjemme/DMPV73000411/sesong-2/episode-1'
     IE = NRKTVIE
@@ -274,7 +263,6 @@ def test_allsubtitles(self):
         self.assertEqual(md5(subtitles['no']), '544fa917d3197fcbee64634559221cc2')
 
 
-@is_download_test
 class TestRaiPlaySubtitles(BaseTestSubtitles):
     IE = RaiPlayIE
 
@@ -295,7 +283,6 @@ def test_subtitles_array_key(self):
         self.assertEqual(md5(subtitles['it']), '4b3264186fbb103508abe5311cfcb9cd')
 
 
-@is_download_test
 class TestVikiSubtitles(BaseTestSubtitles):
     url = 'http://www.viki.com/videos/1060846v-punch-episode-18'
     IE = VikiIE
@@ -308,7 +295,6 @@ def test_allsubtitles(self):
         self.assertEqual(md5(subtitles['en']), '53cb083a5914b2d84ef1ab67b880d18a')
 
 
-@is_download_test
 class TestThePlatformSubtitles(BaseTestSubtitles):
     # from http://www.3playmedia.com/services-features/tools/integrations/theplatform/
     # (see http://theplatform.com/about/partners/type/subtitles-closed-captioning/)
@@ -323,7 +309,6 @@ def test_allsubtitles(self):
         self.assertEqual(md5(subtitles['en']), '97e7670cbae3c4d26ae8bcc7fdd78d4b')
 
 
-@is_download_test
 class TestThePlatformFeedSubtitles(BaseTestSubtitles):
     url = 'http://feed.theplatform.com/f/7wvmTC/msnbc_video-p-test?form=json&pretty=true&range=-40&byGuid=n_hardball_5biden_140207'
     IE = ThePlatformFeedIE
@@ -336,7 +321,6 @@ def test_allsubtitles(self):
         self.assertEqual(md5(subtitles['en']), '48649a22e82b2da21c9a67a395eedade')
 
 
-@is_download_test
 class TestRtveSubtitles(BaseTestSubtitles):
     url = 'http://www.rtve.es/alacarta/videos/los-misterios-de-laura/misterios-laura-capitulo-32-misterio-del-numero-17-2-parte/2428621/'
     IE = RTVEALaCartaIE
@@ -351,7 +335,6 @@ def test_allsubtitles(self):
         self.assertEqual(md5(subtitles['es']), '69e70cae2d40574fb7316f31d6eb7fca')
 
 
-@is_download_test
 class TestDemocracynowSubtitles(BaseTestSubtitles):
     url = 'http://www.democracynow.org/shows/2015/7/3'
     IE = DemocracynowIE

test/test_swfinterp.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import unicode_literals
 
 # Allow direct execution