.github/ISSUE_TEMPLATE/1_broken_site.md

@@ -18,7 +18,7 @@ title: ''
 
 <!--
 Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:
-- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.12.17. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
+- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.03.31. If it's not, see https://yt-dl.org/update 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 http://yt-dl.org/escape.
 - Search the bugtracker for similar issues: http://yt-dl.org/search-issues. DO NOT post duplicates.
@@ -26,7 +26,7 @@ Carefully read and work through this check list in order to prevent the most com
 -->
 
 - [ ] I'm reporting a broken site support
-- [ ] I've verified that I'm running youtube-dl version **2021.12.17**
+- [ ] I've verified that I'm running youtube-dl version **2021.03.31**
 - [ ] 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
@@ -41,7 +41,7 @@ Add the `-v` flag to your command line you run youtube-dl with (`youtube-dl -v <
  [debug] User config: []
  [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] youtube-dl version 2021.12.17
+ [debug] youtube-dl version 2021.03.31
  [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

@@ -19,7 +19,7 @@ labels: 'site-support-request'
 
 <!--
 Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:
-- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.12.17. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
+- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.03.31. If it's not, see https://yt-dl.org/update 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://yt-dl.org/copyright-infringement. youtube-dl 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: http://yt-dl.org/search-issues. DO NOT post duplicates.
@@ -27,7 +27,7 @@ Carefully read and work through this check list in order to prevent the most com
 -->
 
 - [ ] I'm reporting a new site support request
-- [ ] I've verified that I'm running youtube-dl version **2021.12.17**
+- [ ] I've verified that I'm running youtube-dl version **2021.03.31**
 - [ ] 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
 - [ ] I've searched the bugtracker for similar site support requests including closed ones

.github/ISSUE_TEMPLATE/3_site_feature_request.md

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

.github/ISSUE_TEMPLATE/4_bug_report.md

@@ -18,7 +18,7 @@ title: ''
 
 <!--
 Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:
-- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.12.17. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
+- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.03.31. If it's not, see https://yt-dl.org/update 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 http://yt-dl.org/escape.
 - Search the bugtracker for similar issues: http://yt-dl.org/search-issues. DO NOT post duplicates.
@@ -27,7 +27,7 @@ Carefully read and work through this check list in order to prevent the most com
 -->
 
 - [ ] I'm reporting a broken site support issue
-- [ ] I've verified that I'm running youtube-dl version **2021.12.17**
+- [ ] I've verified that I'm running youtube-dl version **2021.03.31**
 - [ ] 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 bug reports including closed ones
@@ -43,7 +43,7 @@ Add the `-v` flag to your command line you run youtube-dl with (`youtube-dl -v <
  [debug] User config: []
  [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] youtube-dl version 2021.12.17
+ [debug] youtube-dl version 2021.03.31
  [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

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

.github/ISSUE_TEMPLATE/config.yml

@@ -1 +0,0 @@
-blank_issues_enabled: false

.github/workflows/ci.yml

@@ -1,479 +1,74 @@
 name: CI
-
+on: [push, pull_request]
-env:
-  all-cpython-versions: 2.6, 2.7, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 3.12
-  main-cpython-versions: 2.7, 3.2, 3.5, 3.9, 3.11
-  pypy-versions: pypy-2.7, pypy-3.6, pypy-3.7
-  cpython-versions: main
-  test-set: core
-  # Python beta version to be built using pyenv before setup-python support
-  # Must also be included in all-cpython-versions 
-  next: 3.13
-
-on:
-  push:
-    # push inputs aren't known to GitHub
-    inputs:
-      cpython-versions:
-        type: string
-        default: all
-      test-set:
-        type: string
-        default: core
-  pull_request:
-    # pull_request inputs aren't known to GitHub
-    inputs:
-      cpython-versions:
-        type: string
-        default: main
-      test-set:
-        type: string
-        default: both
-  workflow_dispatch:
-    inputs:
-      cpython-versions:
-        type: choice
-        description: CPython versions (main = 2.7, 3.2, 3.5, 3.9, 3.11)
-        options:
-          - all
-          - main
-        required: true
-        default: main
-      test-set:
-        type: choice
-        description: core, download
-        options:
-          - both
-          - core
-          - download
-        required: true
-        default: both
-
-permissions:
-  contents: read
-
 jobs:
-  select:
-    name: Select tests from inputs
-    runs-on: ubuntu-latest
-    outputs:
-      cpython-versions: ${{ steps.run.outputs.cpython-versions }}
-      test-set: ${{ steps.run.outputs.test-set }}
-      own-pip-versions: ${{ steps.run.outputs.own-pip-versions }}
-    steps:
-    # push and pull_request inputs aren't known to GitHub (pt3)
-    - name: Set push defaults
-      if: ${{ github.event_name == 'push' }}
-      env:
-        cpython-versions: all
-        test-set: core
-      run: |
-        echo "cpython-versions=${{env.cpython-versions}}" >> "$GITHUB_ENV"
-        echo "test_set=${{env.test_set}}" >> "$GITHUB_ENV"
-    - name: Get pull_request inputs
-      if: ${{ github.event_name == 'pull_request' }}
-      env:
-        cpython-versions: main
-        test-set: both
-      run: |
-        echo "cpython-versions=${{env.cpython-versions}}" >> "$GITHUB_ENV"
-        echo "test_set=${{env.test_set}}" >> "$GITHUB_ENV"
-    - name: Make version array
-      id: run
-      run: |
-        # Make a JSON Array from comma/space-separated string (no extra escaping)
-        json_list() { \
-          ret=""; IFS="${IFS},"; set -- $*; \
-          for a in "$@"; do \
-            ret=$(printf '%s"%s"' "${ret}${ret:+, }" "$a"); \
-          done; \
-          printf '[%s]' "$ret"; }
-        tests="${{ inputs.test-set || env.test-set }}"
-        [ $tests = both ] && tests="core download"
-        printf 'test-set=%s\n' "$(json_list $tests)" >> "$GITHUB_OUTPUT"
-        versions="${{ inputs.cpython-versions || env.cpython-versions }}"
-        if [ "$versions" = all ]; then \
-          versions="${{ env.all-cpython-versions }}"; else \
-          versions="${{ env.main-cpython-versions }}"; \
-        fi
-        printf 'cpython-versions=%s\n' \
-          "$(json_list ${versions}${versions:+, }${{ env.pypy-versions }})" >> "$GITHUB_OUTPUT"
-        # versions with a special get-pip.py in a per-version subdirectory
-        printf 'own-pip-versions=%s\n' \
-          "$(json_list 2.6, 2.7, 3.2, 3.3, 3.4, 3.5, 3.6)" >> "$GITHUB_OUTPUT"
-
   tests:
-    name: Run tests
+    name: Tests
-    needs: select
-    permissions:
-      contents: read
-      packages: write
     runs-on: ${{ matrix.os }}
-    env:
-      PIP: python -m pip
-      PIP_DISABLE_PIP_VERSION_CHECK: true
-      PIP_NO_PYTHON_VERSION_WARNING: true
     strategy:
       fail-fast: true
       matrix:
-        os: [ubuntu-20.04]
+        os: [ubuntu-18.04]
-        python-version: ${{ fromJSON(needs.select.outputs.cpython-versions) }}
+        # 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: ${{ fromJSON(needs.select.outputs.test-set) }}
+        ytdl-test-set: [core, download]
         run-tests-ext: [sh]
         include:
-        - os: windows-2019
+        # python 3.2 is only available on windows via setup-python
-          python-version: 3.4
+        - os: windows-latest
+          python-version: 3.2
           python-impl: cpython
-          ytdl-test-set: ${{ contains(needs.select.outputs.test-set, 'core') && 'core' || 'nocore' }}
+          ytdl-test-set: core
           run-tests-ext: bat
-        - os: windows-2019
+        - os: windows-latest
-          python-version: 3.4
+          python-version: 3.2
           python-impl: cpython
-          ytdl-test-set: ${{ contains(needs.select.outputs.test-set, 'download') && 'download'  || 'nodownload' }}
+          ytdl-test-set: download
           run-tests-ext: bat
         # jython
-        - os: ubuntu-20.04
+        - os: ubuntu-18.04
-          python-version: 2.7
           python-impl: jython
-          ytdl-test-set: ${{ contains(needs.select.outputs.test-set, 'core') && 'core' || 'nocore' }}
+          ytdl-test-set: core
           run-tests-ext: sh
-        - os: ubuntu-20.04
+        - os: ubuntu-18.04
-          python-version: 2.7
           python-impl: jython
-          ytdl-test-set: ${{ contains(needs.select.outputs.test-set, 'download') && 'download'  || 'nodownload' }}
+          ytdl-test-set: download
           run-tests-ext: sh
     steps:
-    - name: Prepare Linux
+    - uses: actions/checkout@v2
-      if: ${{ startswith(matrix.os, 'ubuntu') }}
+    - name: Set up Python ${{ matrix.python-version }}
-      shell: bash
+      uses: actions/setup-python@v2
-      run: |
+      if: ${{ matrix.python-impl == 'cpython' }}
-        # apt in runner, if needed, may not be up-to-date
-        sudo apt-get update
-    - name: Checkout
-      uses: actions/checkout@v3
-    #-------- Python 3 -----
-    - name: Set up supported Python ${{ matrix.python-version }}
-      id: setup-python
-      if: ${{ matrix.python-impl == 'cpython' && matrix.python-version != '2.6' && matrix.python-version != '2.7' && matrix.python-version != env.next }}
-      # wrap broken actions/setup-python@v4
-      # NB may run apt-get install in Linux
-      uses: ytdl-org/setup-python@v1
-      env:
-        # Temporary workaround for Python 3.5 failures - May 2024
-        PIP_TRUSTED_HOST: "pypi.python.org pypi.org files.pythonhosted.org"
       with:
         python-version: ${{ matrix.python-version }}
-        cache-build: true
-        allow-build: info
-    - name: Locate supported Python ${{ matrix.python-version }}
-      if: ${{ env.pythonLocation }}
-      shell: bash
-      run: |
-        echo "PYTHONHOME=${pythonLocation}" >> "$GITHUB_ENV"
-        export expected="${{ steps.setup-python.outputs.python-path }}"
-        dirname() { printf '%s\n' \
-            'import os, sys' \
-            'print(os.path.dirname(sys.argv[1]))' \
-            | ${expected} - "$1"; }
-        expd="$(dirname "$expected")"
-        export python="$(command -v python)"
-        [ "$expd" = "$(dirname "$python")" ] || echo "PATH=$expd:${PATH}" >> "$GITHUB_ENV"
-        [ -x "$python" ] || printf '%s\n' \
-            'import os' \
-            'exp = os.environ["expected"]' \
-            'python = os.environ["python"]' \
-            'exps = os.path.split(exp)' \
-            'if python and (os.path.dirname(python) == exp[0]):' \
-            '    exit(0)' \
-            'exps[1] = "python" + os.path.splitext(exps[1])[1]' \
-            'python = os.path.join(*exps)' \
-            'try:' \
-            '    os.symlink(exp, python)' \
-            'except AttributeError:' \
-            '    os.rename(exp, python)' \
-            | ${expected} -
-        printf '%s\n' \
-            'import sys' \
-            'print(sys.path)' \
-            | ${expected} -
-    #-------- Python next (was 3.12) -
-    - name: Set up CPython 3.next environment
-      if: ${{ matrix.python-impl == 'cpython' && matrix.python-version == env.next }}
-      shell: bash
-      run: |
-        PYENV_ROOT=$HOME/.local/share/pyenv
-        echo "PYENV_ROOT=${PYENV_ROOT}" >> "$GITHUB_ENV"
-    - name: Cache Python 3.next 
-      id: cachenext
-      if: ${{ matrix.python-impl == 'cpython' && matrix.python-version == env.next }}
-      uses: actions/cache@v3
-      with:
-        key: python-${{ env.next }}
-        path: |
-          ${{ env.PYENV_ROOT }}
-    - name: Build and set up Python 3.next
-      if: ${{ matrix.python-impl == 'cpython' && matrix.python-version == env.next && ! steps.cachenext.outputs.cache-hit }}
-      # dl and build locally
-      shell: bash
-      run: |
-        # Install build environment
-        sudo apt-get install -y build-essential llvm libssl-dev tk-dev  \
-                      libncursesw5-dev libreadline-dev libsqlite3-dev   \
-                      libffi-dev xz-utils zlib1g-dev libbz2-dev liblzma-dev
-        # Download PyEnv from its GitHub repository.
-        export PYENV_ROOT=${{ env.PYENV_ROOT }}
-        export PATH=$PYENV_ROOT/bin:$PATH
-        git clone "https://github.com/pyenv/pyenv.git" "$PYENV_ROOT"
-        pyenv install ${{ env.next }}
-    - name: Locate Python 3.next
-      if: ${{ matrix.python-impl == 'cpython' && matrix.python-version == env.next }}
-      shell: bash
-      run: |
-        PYTHONHOME="$(echo "${{ env.PYENV_ROOT }}/versions/${{ env.next }}."*)"
-        test -n "$PYTHONHOME"
-        echo "PYTHONHOME=$PYTHONHOME" >> "$GITHUB_ENV"
-        echo "PATH=${PYTHONHOME}/bin:$PATH" >> "$GITHUB_ENV"
-    #-------- Python 2.7 --
-    - name: Set up Python 2.7
-      if: ${{ matrix.python-impl == 'cpython' && matrix.python-version == '2.7' }}
-      # install 2.7
-      shell: bash
-      run: |
-        sudo apt-get install -y python2 python-is-python2
-        echo "PYTHONHOME=/usr" >> "$GITHUB_ENV"
-    #-------- Python 2.6 --
-    - name: Set up Python 2.6 environment
-      if: ${{ matrix.python-impl == 'cpython' && matrix.python-version == '2.6' }}
-      shell: bash
-      run: |
-        openssl_name=openssl-1.0.2u
-        echo "openssl_name=${openssl_name}" >> "$GITHUB_ENV"
-        openssl_dir=$HOME/.local/opt/$openssl_name
-        echo "openssl_dir=${openssl_dir}" >> "$GITHUB_ENV"
-        PYENV_ROOT=$HOME/.local/share/pyenv
-        echo "PYENV_ROOT=${PYENV_ROOT}" >> "$GITHUB_ENV"
-        sudo apt-get install -y openssl ca-certificates
-    - name: Cache Python 2.6
-      id: cache26
-      if: ${{ matrix.python-version == '2.6' }}
-      uses: actions/cache@v3
-      with:
-        key: python-2.6.9
-        path: |
-          ${{ env.openssl_dir }}
-          ${{ env.PYENV_ROOT }}
-    - name: Build and set up Python 2.6
-      if: ${{ matrix.python-impl == 'cpython' && matrix.python-version == '2.6' && ! steps.cache26.outputs.cache-hit }}
-      # dl and build locally
-      shell: bash
-      run: |
-        # Install build environment
-        sudo apt-get install -y build-essential llvm libssl-dev tk-dev  \
-                      libncursesw5-dev libreadline-dev libsqlite3-dev   \
-                      libffi-dev xz-utils zlib1g-dev libbz2-dev liblzma-dev
-        # Download and install OpenSSL 1.0.2, back in time
-        openssl_name=${{ env.openssl_name }}
-        openssl_targz=${openssl_name}.tar.gz
-        openssl_dir=${{ env.openssl_dir }}
-        openssl_inc=$openssl_dir/include
-        openssl_lib=$openssl_dir/lib
-        openssl_ssl=$openssl_dir/ssl
-        curl -L "https://www.openssl.org/source/$openssl_targz" -o $openssl_targz
-        tar -xf $openssl_targz
-        ( cd $openssl_name; \
-          ./config --prefix=$openssl_dir --openssldir=${openssl_dir}/ssl \
-            --libdir=lib -Wl,-rpath=${openssl_dir}/lib shared zlib-dynamic && \
-          make && \
-          make install )
-        rm -rf $openssl_name
-        rmdir $openssl_ssl/certs && ln -s /etc/ssl/certs $openssl_ssl/certs
-        # Download PyEnv from its GitHub repository.
-        export PYENV_ROOT=${{ env.PYENV_ROOT }}
-        export PATH=$PYENV_ROOT/bin:$PATH
-        git clone "https://github.com/pyenv/pyenv.git" "$PYENV_ROOT"
-        # Prevent pyenv build trying (and failing) to update pip
-        export GET_PIP=get-pip-2.6.py
-        echo 'import sys; sys.exit(0)' > ${GET_PIP}
-        GET_PIP=$(realpath $GET_PIP)
-        # Build and install Python
-        export CFLAGS="-I$openssl_inc"
-        export LDFLAGS="-L$openssl_lib"
-        export LD_LIBRARY_PATH="$openssl_lib"
-        pyenv install 2.6.9
-    - name: Locate Python 2.6
-      if: ${{ matrix.python-impl == 'cpython' && matrix.python-version == '2.6' }}
-      shell: bash
-      run: |
-        PYTHONHOME="${{ env.PYENV_ROOT }}/versions/2.6.9"
-        echo "PYTHONHOME=$PYTHONHOME" >> "$GITHUB_ENV"
-        echo "PATH=${PYTHONHOME}/bin:$PATH" >> "$GITHUB_ENV"
-        echo "LD_LIBRARY_PATH=${{ env.openssl_dir }}/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}" >> "$GITHUB_ENV"
-    #-------- Jython ------
     - name: Set up Java 8
       if: ${{ matrix.python-impl == 'jython' }}
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v1
       with:
         java-version: 8
-        distribution: 'zulu'
-    - name: Setup Jython environment
-      if: ${{ matrix.python-impl == 'jython' }}
-      shell: bash
-      run: |
-        echo "JYTHON_ROOT=${HOME}/jython" >> "$GITHUB_ENV"
-        echo "PIP=pip" >> "$GITHUB_ENV"
-    - name: Cache Jython
-      id: cachejy
-      if: ${{ matrix.python-impl == 'jython' && matrix.python-version == '2.7' }}
-      uses: actions/cache@v3
-      with:
-        # 2.7.3 now available, may solve SNI issue
-        key: jython-2.7.1
-        path: |
-          ${{ env.JYTHON_ROOT }}
     - name: Install Jython
-      if: ${{ matrix.python-impl == 'jython' && matrix.python-version == '2.7' && ! steps.cachejy.outputs.cache-hit }}
+      if: ${{ matrix.python-impl == 'jython' }}
-      shell: bash
       run: |
-        JYTHON_ROOT="${{ env.JYTHON_ROOT }}"
+        wget http://search.maven.org/remotecontent?filepath=org/python/jython-installer/2.7.1/jython-installer-2.7.1.jar -O jython-installer.jar
-        curl -L "https://repo1.maven.org/maven2/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"
-        java -jar jython-installer.jar -s -d "${JYTHON_ROOT}"
+        echo "$HOME/jython/bin" >> $GITHUB_PATH
-        echo "${JYTHON_ROOT}/bin" >> "$GITHUB_PATH"
+    - name: Install nose
-    - name: Set up cached Jython
+      run: pip install nose
-      if: ${{ steps.cachejy.outputs.cache-hit }}
-      shell: bash
-      run: |
-        JYTHON_ROOT="${{ env.JYTHON_ROOT }}"
-        echo "${JYTHON_ROOT}/bin" >> $GITHUB_PATH
-    - name: Install supporting Python 2.7 if possible
-      if: ${{ steps.cachejy.outputs.cache-hit }}
-      shell: bash
-      run: |
-        sudo apt-get install -y python2.7 || true
-    #-------- pip ---------
-    - name: Set up supported Python ${{ matrix.python-version }} pip
-      if: ${{ (matrix.python-version != '3.2' && steps.setup-python.outputs.python-path) || matrix.python-version == '2.7' }}
-      # This step may run in either Linux or Windows
-      shell: bash
-      run: |
-        echo "$PATH"
-        echo "$PYTHONHOME"
-        # curl is available on both Windows and Linux, -L follows redirects, -O gets name
-        python -m ensurepip || python -m pip --version || { \
-          get_pip="${{ contains(needs.select.outputs.own-pip-versions, matrix.python-version) && format('{0}/', matrix.python-version) || '' }}"; \
-          curl -L -O "https://bootstrap.pypa.io/pip/${get_pip}get-pip.py"; \
-          python get-pip.py; }
-    - name: Set up Python 2.6 pip
-      if: ${{ matrix.python-version == '2.6' }}
-      shell: bash
-      run: |
-        python -m pip --version || { \
-          curl -L -O "https://bootstrap.pypa.io/pip/2.6/get-pip.py"; \
-          curl -L -O "https://files.pythonhosted.org/packages/ac/95/a05b56bb975efa78d3557efa36acaf9cf5d2fd0ee0062060493687432e03/pip-9.0.3-py2.py3-none-any.whl"; \
-          python get-pip.py --no-setuptools --no-wheel pip-9.0.3-py2.py3-none-any.whl; }
-        # work-around to invoke pip module on 2.6: https://bugs.python.org/issue2751
-        echo "PIP=python -m pip.__main__" >> "$GITHUB_ENV"
-    - name: Set up other Python ${{ matrix.python-version }} pip
-      if: ${{ matrix.python-version == '3.2' && steps.setup-python.outputs.python-path }}
-      shell: bash
-      run: |
-        python -m pip --version || { \
-          curl -L -O "https://bootstrap.pypa.io/pip/3.2/get-pip.py"; \
-          curl -L -O "https://files.pythonhosted.org/packages/b2/d0/cd115fe345dd6f07ec1c780020a7dfe74966fceeb171e0f20d1d4905b0b7/pip-7.1.2-py2.py3-none-any.whl"; \
-          python get-pip.py --no-setuptools --no-wheel pip-7.1.2-py2.py3-none-any.whl; }
-    #-------- unittest ----
-    - name: Upgrade Unittest for Python 2.6
-      if: ${{ matrix.python-version == '2.6' }}
-      shell: bash
-      run: |
-        # Work around deprecation of support for non-SNI clients at PyPI CDN (see https://status.python.org/incidents/hzmjhqsdjqgb)
-        $PIP -qq show unittest2 || { \
-          for u in "65/26/32b8464df2a97e6dd1b656ed26b2c194606c16fe163c695a992b36c11cdf/six-1.13.0-py2.py3-none-any.whl" \
-              "f2/94/3af39d34be01a24a6e65433d19e107099374224905f1e0cc6bbe1fd22a2f/argparse-1.4.0-py2.py3-none-any.whl" \
-              "c7/a3/c5da2a44c85bfbb6eebcfc1dde24933f8704441b98fdde6528f4831757a6/linecache2-1.0.0-py2.py3-none-any.whl" \
-              "17/0a/6ac05a3723017a967193456a2efa0aa9ac4b51456891af1e2353bb9de21e/traceback2-1.4.0-py2.py3-none-any.whl" \
-              "72/20/7f0f433060a962200b7272b8c12ba90ef5b903e218174301d0abfd523813/unittest2-1.1.0-py2.py3-none-any.whl"; do \
-            curl -L -O "https://files.pythonhosted.org/packages/${u}"; \
-            $PIP install ${u##*/}; \
-          done; }
-        # make tests use unittest2
-        for test in ./test/test_*.py ./test/helper.py; do
-          sed -r -i -e '/^import unittest$/s/test/test2 as unittest/' "$test"
-        done
-    #-------- nose --------
-    - name: Install nose for Python ${{ matrix.python-version }}
-      if: ${{ (matrix.python-version != '3.2' && steps.setup-python.outputs.python-path) || (matrix.python-impl == 'cpython' && (matrix.python-version == '2.7' || matrix.python-version == env.next)) }}
-      shell: bash
-      run: |
-        echo "$PATH"
-        echo "$PYTHONHOME"
-        # Use PyNose for recent Pythons instead of Nose
-        py3ver="${{ matrix.python-version }}"
-        py3ver=${py3ver#3.}
-        [ "$py3ver" != "${{ matrix.python-version }}" ] && py3ver=${py3ver%.*} || py3ver=0
-        [ "$py3ver" -ge 9 ] && nose=pynose || nose=nose
-        $PIP -qq show $nose || $PIP install $nose
-    - name: Install nose for other Python 2
-      if: ${{ matrix.python-impl == 'jython' || (matrix.python-impl == 'cpython' && matrix.python-version == '2.6') }}
-      shell: bash
-      run: |
-        # Work around deprecation of support for non-SNI clients at PyPI CDN (see https://status.python.org/incidents/hzmjhqsdjqgb)
-        $PIP -qq show nose || { \
-          curl -L -O "https://files.pythonhosted.org/packages/99/4f/13fb671119e65c4dce97c60e67d3fd9e6f7f809f2b307e2611f4701205cb/nose-1.3.7-py2-none-any.whl"; \
-          $PIP install nose-1.3.7-py2-none-any.whl; }
-    - name: Install nose for other Python 3
-      if: ${{ matrix.python-version == '3.2' && steps.setup-python.outputs.python-path }}
-      shell: bash
-      run: |
-        $PIP -qq show nose || { \
-          curl -L -O "https://files.pythonhosted.org/packages/15/d8/dd071918c040f50fa1cf80da16423af51ff8ce4a0f2399b7bf8de45ac3d9/nose-1.3.7-py3-none-any.whl"; \
-          $PIP install nose-1.3.7-py3-none-any.whl; }
-    - name: Set up nosetest test
-      if: ${{ contains(needs.select.outputs.test-set, matrix.ytdl-test-set ) }}
-      shell: bash
-      run: |
-        # set PYTHON_VER
-        PYTHON_VER=${{ matrix.python-version }}
-        [ "${PYTHON_VER#*-}" != "$PYTHON_VER" ] || PYTHON_VER="${{ matrix.python-impl }}-${PYTHON_VER}"
-        echo "PYTHON_VER=$PYTHON_VER" >> "$GITHUB_ENV"
-        echo "PYTHON_IMPL=${{ matrix.python-impl }}" >> "$GITHUB_ENV"
-        # define a test to validate the Python version used by nosetests
-        printf '%s\n' \
-          'from __future__ import unicode_literals' \
-          'import sys, os, platform' \
-          'try:' \
-          '    import unittest2 as unittest' \
-          'except ImportError:' \
-          '    import unittest' \
-          'class TestPython(unittest.TestCase):' \
-          '    def setUp(self):' \
-          '        self.ver = os.environ["PYTHON_VER"].split("-")' \
-          '    def test_python_ver(self):' \
-          '        self.assertEqual(["%d" % v for v in sys.version_info[:2]], self.ver[-1].split(".")[:2])' \
-          '        self.assertTrue(sys.version.startswith(self.ver[-1]))' \
-          '        self.assertIn(self.ver[0], ",".join((sys.version, platform.python_implementation())).lower())' \
-          '    def test_python_impl(self):' \
-          '        self.assertIn(platform.python_implementation().lower(), (os.environ["PYTHON_IMPL"], self.ver[0]))' \
-          > test/test_python.py
-    #-------- TESTS -------
     - name: Run tests
-      if: ${{ contains(needs.select.outputs.test-set, matrix.ytdl-test-set ) }}
       continue-on-error: ${{ matrix.ytdl-test-set == 'download' || matrix.python-impl == 'jython' }}
       env:
         YTDL_TEST_SET: ${{ matrix.ytdl-test-set }}
-      run: |
+      run: ./devscripts/run_tests.${{ matrix.run-tests-ext }}
-        ./devscripts/run_tests.${{ matrix.run-tests-ext }}
   flake8:
     name: Linter
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v2
       with:
         python-version: 3.9
     - name: Install flake8
       run: pip install flake8
     - name: Run flake8
       run: flake8 .
-

CONTRIBUTING.md

@@ -150,7 +150,7 @@ After you have ensured this site is distributing its content legally, you can fo
                 # TODO more properties (see youtube_dl/extractor/common.py)
             }
     ```
-5. Add an import in [`youtube_dl/extractor/extractors.py`](https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/extractor/extractors.py). This makes the extractor available for use, as long as the class ends with `IE`.
+5. Add an import in [`youtube_dl/extractor/extractors.py`](https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/extractor/extractors.py).
 6. Run `python test/test_download.py TestDownload.test_YourExtractor`. This *should fail* at first, but you can continually re-run it until you're done. If you decide to add more than one test, then rename ``_TEST`` to ``_TESTS`` and make it into a list of dictionaries. The tests will then be named `TestDownload.test_YourExtractor`, `TestDownload.test_YourExtractor_1`, `TestDownload.test_YourExtractor_2`, etc. Note that tests with `only_matching` key in test's dict are not counted in.
 7. Have a look at [`youtube_dl/extractor/common.py`](https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/extractor/common.py) for possible helper methods and a [detailed description of what your extractor should and may return](https://github.com/ytdl-org/youtube-dl/blob/7f41a598b3fba1bcab2817de64a08941200aa3c8/youtube_dl/extractor/common.py#L94-L303). Add tests and code for as many as you want.
 8. Make sure your code follows [youtube-dl coding conventions](#youtube-dl-coding-conventions) and check the code with [flake8](https://flake8.pycqa.org/en/latest/index.html#quickstart):

ChangeLog

@@ -1,145 +1,3 @@
-version 2021.12.17
-
-Core
-* [postprocessor/ffmpeg] Show ffmpeg output on error (#22680, #29336)
-
-Extractors
-* [youtube] Update signature function patterns (#30363, #30366)
-* [peertube] Only call description endpoint if necessary (#29383)
-* [periscope] Pass referer to HLS requests (#29419)
-- [liveleak] Remove extractor (#17625, #24222, #29331)
-+ [pornhub] Add support for pornhubthbh7ap3u.onion
-* [pornhub] Detect geo restriction
-* [pornhub] Dismiss tbr extracted from download URLs (#28927)
-* [curiositystream:collection] Extend _VALID_URL (#26326, #29117)
-* [youtube] Make get_video_info processing more robust (#29333)
-* [youtube] Workaround for get_video_info request (#29333)
-* [bilibili] Strip uploader name (#29202)
-* [youtube] Update invidious instance list (#29281)
-* [umg:de] Update GraphQL API URL (#29304)
-* [nrk] Switch psapi URL to https (#29344)
-+ [egghead] Add support for app.egghead.io (#28404, #29303)
-* [appleconnect] Fix extraction (#29208)
-+ [orf:tvthek] Add support for MPD formats (#28672, #29236)
-
-
-version 2021.06.06
-
-Extractors
-* [facebook] Improve login required detection
-* [youporn] Fix formats and view count extraction (#29216)
-* [orf:tvthek] Fix thumbnails extraction (#29217)
-* [formula1] Fix extraction (#29206)
-* [ard] Relax URL regular expression and fix video ids (#22724, #29091)
-+ [ustream] Detect https embeds (#29133)
-* [ted] Prefer own formats over external sources (#29142)
-* [twitch:clips] Improve extraction (#29149)
-+ [twitch:clips] Add access token query to download URLs (#29136)
-* [youtube] Fix get_video_info request (#29086, #29165)
-* [vimeo] Fix vimeo pro embed extraction (#29126)
-* [redbulltv] Fix embed data extraction (#28770)
-* [shahid] Relax URL regular expression (#28772, #28930)
-
-
-version 2021.05.16
-
-Core
-* [options] Fix thumbnail option group name (#29042)
-* [YoutubeDL] Improve extract_info doc (#28946)
-
-Extractors
-+ [playstuff] Add support for play.stuff.co.nz (#28901, #28931)
-* [eroprofile] Fix extraction (#23200, #23626, #29008)
-+ [vivo] Add support for vivo.st (#29009)
-+ [generic] Add support for og:audio (#28311, #29015)
-* [phoenix] Fix extraction (#29057)
-+ [generic] Add support for sibnet embeds
-+ [vk] Add support for sibnet embeds (#9500)
-+ [generic] Add Referer header for direct videojs download URLs (#2879,
-  #20217, #29053)
-* [orf:radio] Switch download URLs to HTTPS (#29012, #29046)
-- [blinkx] Remove extractor (#28941)
-* [medaltv] Relax URL regular expression (#28884)
-+ [funimation] Add support for optional lang code in URLs (#28950)
-+ [gdcvault] Add support for HTML5 videos
-* [dispeak] Improve FLV extraction (#13513, #28970)
-* [kaltura] Improve iframe extraction (#28969)
-* [kaltura] Make embed code alternatives actually work
-* [cda] Improve extraction (#28709, #28937)
-* [twitter] Improve formats extraction from vmap URL (#28909)
-* [xtube] Fix formats extraction (#28870)
-* [svtplay] Improve extraction (#28507, #28876)
-* [tv2dk] Fix extraction (#28888)
-
-
-version 2021.04.26
-
-Extractors
-+ [xfileshare] Add support for wolfstream.tv (#28858)
-* [francetvinfo] Improve video id extraction (#28792)
-* [medaltv] Fix extraction (#28807)
-* [tver] Redirect all downloads to Brightcove (#28849)
-* [go] Improve video id extraction (#25207, #25216, #26058)
-* [youtube] Fix lazy extractors (#28780)
-+ [bbc] Extract description and timestamp from __INITIAL_DATA__ (#28774)
-* [cbsnews] Fix extraction for python <3.6 (#23359)
-
-
-version 2021.04.17
-
-Core
-+ [utils] Add support for experimental HTTP response status code
-  308 Permanent Redirect (#27877, #28768)
-
-Extractors
-+ [lbry] Add support for HLS videos (#27877, #28768)
-* [youtube] Fix stretched ratio calculation
-* [youtube] Improve stretch extraction (#28769)
-* [youtube:tab] Improve grid extraction (#28725)
-+ [youtube:tab] Detect series playlist on playlists page (#28723)
-+ [youtube] Add more invidious instances (#28706)
-* [pluralsight] Extend anti-throttling timeout (#28712)
-* [youtube] Improve URL to extractor routing (#27572, #28335, #28742)
-+ [maoritv] Add support for maoritelevision.com (#24552)
-+ [youtube:tab] Pass innertube context and x-goog-visitor-id header along with
-  continuation requests (#28702)
-* [mtv] Fix Viacom A/B Testing Video Player extraction (#28703)
-+ [pornhub] Extract DASH and HLS formats from get_media end point (#28698)
-* [cbssports] Fix extraction (#28682)
-* [jamendo] Fix track extraction (#28686)
-* [curiositystream] Fix format extraction (#26845, #28668)
-
-
-version 2021.04.07
-
-Core
-* [extractor/common] Use compat_cookies_SimpleCookie for _get_cookies
-+ [compat] Introduce compat_cookies_SimpleCookie
-* [extractor/common] Improve JSON-LD author extraction
-* [extractor/common] Fix _get_cookies on python 2 (#20673, #23256, #20326,
-  #28640)
-
-Extractors
-* [youtube] Fix extraction of videos with restricted location (#28685)
-+ [line] Add support for live.line.me (#17205, #28658)
-* [vimeo] Improve extraction (#28591)
-* [youku] Update ccode (#17852, #28447, #28460, #28648)
-* [youtube] Prefer direct entry metadata over entry metadata from playlist
-  (#28619, #28636)
-* [screencastomatic] Fix extraction (#11976, #24489)
-+ [palcomp3] Add support for palcomp3.com (#13120)
-+ [arnes] Add support for video.arnes.si (#28483)
-+ [youtube:tab] Add support for hashtags (#28308)
-
-
-version 2021.04.01
-
-Extractors
-* [youtube] Setup CONSENT cookie when needed (#28604)
-* [vimeo] Fix password protected review extraction (#27591)
-* [youtube] Improve age-restricted video extraction (#28578)
-
-
 version 2021.03.31
 
 Extractors

README.md

@@ -33,7 +33,7 @@ Windows users can [download an .exe file](https://yt-dl.org/latest/youtube-dl.ex
 You can also use pip:
 
     sudo -H pip install --upgrade youtube-dl
-
+    
 This command will update youtube-dl if you have already installed it. See the [pypi page](https://pypi.python.org/pypi/youtube_dl) for more information.
 
 macOS users can install youtube-dl with [Homebrew](https://brew.sh/):
@@ -287,7 +287,7 @@ Alternatively, refer to the [developer instructions](#developer-instructions) fo
     --no-cache-dir                       Disable filesystem caching
     --rm-cache-dir                       Delete all filesystem cache files
 
-## Thumbnail Options:
+## Thumbnail images:
     --write-thumbnail                    Write thumbnail image to disk
     --write-all-thumbnails               Write all thumbnail image formats to
                                          disk
@@ -563,7 +563,7 @@ The basic usage is not to set any template arguments when downloading a single f
  - `is_live` (boolean): Whether this video is a live stream or a fixed-length video
  - `start_time` (numeric): Time in seconds where the reproduction should start, as specified in the URL
  - `end_time` (numeric): Time in seconds where the reproduction should end, as specified in the URL
- - `format` (string): A human-readable description of the format
+ - `format` (string): A human-readable description of the format 
  - `format_id` (string): Format code specified by `--format`
  - `format_note` (string): Additional info about the format
  - `width` (numeric): Width of the video
@@ -632,7 +632,7 @@ To use percent literals in an output template use `%%`. To output to stdout use
 
 The current default template is `%(title)s-%(id)s.%(ext)s`.
 
-In some cases, you don't want special characters such as 中, spaces, or &, such as when transferring the downloaded filename to a Windows system or the filename through an 8bit-unsafe channel. In these cases, add the `--restrict-filenames` flag to get a shorter title.
+In some cases, you don't want special characters such as 中, spaces, or &, such as when transferring the downloaded filename to a Windows system or the filename through an 8bit-unsafe channel. In these cases, add the `--restrict-filenames` flag to get a shorter title:
 
 #### Output template and Windows batch files
 
@@ -675,7 +675,7 @@ The general syntax for format selection is `--format FORMAT` or shorter `-f FORM
 
 **tl;dr:** [navigate me to examples](#format-selection-examples).
 
-The simplest case is requesting a specific format, for example with `-f 22` you can download the format with format code equal to 22. You can get the list of available format codes for particular video using `--list-formats` or `-F`. Note that these format codes are extractor specific.
+The simplest case is requesting a specific format, for example with `-f 22` you can download the format with format code equal to 22. You can get the list of available format codes for particular video using `--list-formats` or `-F`. Note that these format codes are extractor specific. 
 
 You can also use a file extension (currently `3gp`, `aac`, `flv`, `m4a`, `mp3`, `mp4`, `ogg`, `wav`, `webm` are supported) to download the best quality format of a particular file extension served as a single file, e.g. `-f webm` will download the best quality format with the `webm` extension served as a single file.
 
@@ -760,7 +760,7 @@ Videos can be filtered by their upload date using the options `--date`, `--dateb
 
  - Absolute dates: Dates in the format `YYYYMMDD`.
  - Relative dates: Dates in the format `(now|today)[+-][0-9](day|week|month|year)(s)?`
-
+ 
 Examples:
 
 ```bash
@@ -893,7 +893,7 @@ Since June 2012 ([#342](https://github.com/ytdl-org/youtube-dl/issues/342)) yout
 
 ### The exe throws an error due to missing `MSVCR100.dll`
 
-To run the exe you need to install first the [Microsoft Visual C++ 2010 Service Pack 1 Redistributable Package (x86)](https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x86.exe).
+To run the exe you need to install first the [Microsoft Visual C++ 2010 Redistributable Package (x86)](https://www.microsoft.com/en-US/download/details.aspx?id=5555).
 
 ### On Windows, how should I set up ffmpeg and youtube-dl? Where should I put the exe files?
 
@@ -918,7 +918,7 @@ Either prepend `https://www.youtube.com/watch?v=` or separate the ID from the op
 
 Use the `--cookies` option, for example `--cookies /path/to/cookies/file.txt`.
 
-In order to extract cookies from browser use any conforming browser extension for exporting cookies. For example, [Get cookies.txt LOCALLY](https://chrome.google.com/webstore/detail/get-cookiestxt-locally/cclelndahbckbenkjhflpdbgdldlbecc) (for Chrome) or [cookies.txt](https://addons.mozilla.org/en-US/firefox/addon/cookies-txt/) (for Firefox).
+In order to extract cookies from browser use any conforming browser extension for exporting cookies. For example, [Get cookies.txt](https://chrome.google.com/webstore/detail/get-cookiestxt/bgaddhkoddajcdgocldbbfleckgcbcid/) (for Chrome) or [cookies.txt](https://addons.mozilla.org/en-US/firefox/addon/cookies-txt/) (for Firefox).
 
 Note that the cookies file must be in Mozilla/Netscape format and the first line of the cookies file must be either `# HTTP Cookie File` or `# Netscape HTTP Cookie File`. Make sure you have correct [newline format](https://en.wikipedia.org/wiki/Newline) in the cookies file and convert newlines if necessary to correspond with your OS, namely `CRLF` (`\r\n`) for Windows and `LF` (`\n`) for Unix and Unix-like systems (Linux, macOS, etc.). `HTTP Error 400: Bad Request` when using `--cookies` is a good sign of invalid newline format.
 
@@ -1000,8 +1000,6 @@ To run the test, simply invoke your favorite test runner, or execute a test file
     python test/test_download.py
     nosetests
 
-For Python versions 3.6 and later, you can use [pynose](https://pypi.org/project/pynose/) to implement `nosetests`. The original [nose](https://pypi.org/project/nose/) has not been upgraded for 3.10 and later.
-
 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
@@ -1071,11 +1069,9 @@ After you have ensured this site is distributing its content legally, you can fo
             }
     ```
 5. Add an import in [`youtube_dl/extractor/extractors.py`](https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/extractor/extractors.py).
-6. Run `python test/test_download.py TestDownload.test_YourExtractor`. This *should fail* at first, but you can continually re-run it until you're done. If you decide to add more than one test (actually, test case) then rename ``_TEST`` to ``_TESTS`` and make it into a list of dictionaries. The tests will then be named `TestDownload.test_YourExtractor`, `TestDownload.test_YourExtractor_1`, `TestDownload.test_YourExtractor_2`, etc. Note:
+6. Run `python test/test_download.py TestDownload.test_YourExtractor`. This *should fail* at first, but you can continually re-run it until you're done. If you decide to add more than one test, then rename ``_TEST`` to ``_TESTS`` and make it into a list of dictionaries. The tests will then be named `TestDownload.test_YourExtractor`, `TestDownload.test_YourExtractor_1`, `TestDownload.test_YourExtractor_2`, etc. Note that tests with `only_matching` key in test's dict are not counted in.
-    * the test names use the extractor class name **without the trailing `IE`**
+7. Have a look at [`youtube_dl/extractor/common.py`](https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/extractor/common.py) for possible helper methods and a [detailed description of what your extractor should and may return](https://github.com/ytdl-org/youtube-dl/blob/7f41a598b3fba1bcab2817de64a08941200aa3c8/youtube_dl/extractor/common.py#L94-L303). Add tests and code for as many as you want.
-    * tests with `only_matching` key in test's dict are not counted.
+8. Make sure your code follows [youtube-dl coding conventions](#youtube-dl-coding-conventions) and check the code with [flake8](https://flake8.pycqa.org/en/latest/index.html#quickstart):
-8. Have a look at [`youtube_dl/extractor/common.py`](https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/extractor/common.py) for possible helper methods and a [detailed description of what your extractor should and may return](https://github.com/ytdl-org/youtube-dl/blob/7f41a598b3fba1bcab2817de64a08941200aa3c8/youtube_dl/extractor/common.py#L94-L303). Add tests and code for as many as you want.
-9. Make sure your code follows [youtube-dl coding conventions](#youtube-dl-coding-conventions) and check the code with [flake8](https://flake8.pycqa.org/en/latest/index.html#quickstart):
 
         $ flake8 youtube_dl/extractor/yourextractor.py
 
@@ -1093,7 +1089,7 @@ In any case, thank you very much for your contributions!
 
 ## youtube-dl coding conventions
 
-This section introduces guidelines for writing idiomatic, robust and future-proof extractor code.
+This section introduces a guide lines for writing idiomatic, robust and future-proof extractor code.
 
 Extractors are very fragile by nature since they depend on the layout of the source data provided by 3rd party media hosters out of your control and this layout tends to change. As an extractor implementer your task is not only to write code that will extract media links and metadata correctly but also to minimize dependency on the source's layout and even to make the code foresee potential future changes and be ready for that. This is important because it will allow the extractor not to break on minor layout changes thus keeping old youtube-dl versions working. Even though this breakage issue is easily fixed by emitting a new version of youtube-dl with a fix incorporated, all the previous versions become broken in all repositories and distros' packages that may not be so prompt in fetching the update from us. Needless to say, some non rolling release distros may never receive an update at all.
 
@@ -1116,7 +1112,7 @@ Say you have some source dictionary `meta` that you've fetched as JSON with HTTP
 ```python
 meta = self._download_json(url, video_id)
 ```
-
+    
 Assume at this point `meta`'s layout is:
 
 ```python
@@ -1160,7 +1156,7 @@ description = self._search_regex(
 ```
 
 On failure this code will silently continue the extraction with `description` set to `None`. That is useful for metafields that may or may not be present.
-
+ 
 ### Provide fallbacks
 
 When extracting metadata try to do so from multiple sources. For example if `title` is present in several places, try extracting from at least some of them. This makes it more future-proof in case some of the sources become unavailable.
@@ -1208,7 +1204,7 @@ r'(id|ID)=(?P<id>\d+)'
 #### Make regular expressions relaxed and flexible
 
 When using regular expressions try to write them fuzzy, relaxed and flexible, skipping insignificant parts that are more likely to change, allowing both single and double quotes for quoted values and so on.
-
+ 
 ##### Example
 
 Say you need to extract `title` from the following HTML code:
@@ -1232,7 +1228,7 @@ title = self._search_regex(
     webpage, 'title', group='title')
 ```
 
-Note how you tolerate potential changes in the `style` attribute's value or switch from using double quotes to single for `class` attribute:
+Note how you tolerate potential changes in the `style` attribute's value or switch from using double quotes to single for `class` attribute: 
 
 The code definitely should not look like:
 
@@ -1333,114 +1329,27 @@ Wrap all extracted numeric data into safe functions from [`youtube_dl/utils.py`]
 
 Use `url_or_none` for safe URL processing.
 
-Use `traverse_obj` for safe metadata extraction from parsed JSON.
+Use `try_get` for safe metadata extraction from parsed JSON.
 
-Use `unified_strdate` for uniform `upload_date` or any `YYYYMMDD` meta field extraction, `unified_timestamp` for uniform `timestamp` extraction, `parse_filesize` for `filesize` extraction, `parse_count` for count meta fields extraction, `parse_resolution`, `parse_duration` for `duration` extraction, `parse_age_limit` for `age_limit` extraction.
+Use `unified_strdate` for uniform `upload_date` or any `YYYYMMDD` meta field extraction, `unified_timestamp` for uniform `timestamp` extraction, `parse_filesize` for `filesize` extraction, `parse_count` for count meta fields extraction, `parse_resolution`, `parse_duration` for `duration` extraction, `parse_age_limit` for `age_limit` extraction. 
 
 Explore [`youtube_dl/utils.py`](https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/utils.py) for more useful convenience functions.
 
 #### More examples
 
 ##### Safely extract optional description from parsed JSON
-
-When processing complex JSON, as often returned by site API requests or stashed in web pages for "hydration", you can use the `traverse_obj()` utility function to handle multiple fallback values and to ensure the expected type of metadata items. The function's docstring defines how the function works: also review usage in the codebase for more examples.
-
-In this example, a text `description`, or `None`, is pulled from the `.result.video[0].summary` member of the parsed JSON `response`, if available.
-
-```python
-description = traverse_obj(response, ('result', 'video', 0, 'summary', T(compat_str)))
-```
-`T(...)` is a shorthand for a set literal; if you hate people who still run Python 2.6, `T(type_or_transformation)` could be written as a set literal `{type_or_transformation}`.
-
-Some extractors use the older and less capable `try_get()` function in the same way.
-
 ```python
 description = try_get(response, lambda x: x['result']['video'][0]['summary'], compat_str)
 ```
 
 ##### Safely extract more optional metadata
-
-In this example, various optional metadata values are extracted from the `.result.video[0]` member of the parsed JSON `response`, which is expected to be a JS object, parsed into a `dict`, with no crash if that isn't so, or if any of the target values are missing or invalid.
-
 ```python
-video = traverse_obj(response, ('result', 'video', 0, T(dict))) or {}
+video = try_get(response, lambda x: x['result']['video'][0], dict) or {}
-# formerly:
-# video = try_get(response, lambda x: x['result']['video'][0], dict) or {}
 description = video.get('summary')
 duration = float_or_none(video.get('durationMs'), scale=1000)
 view_count = int_or_none(video.get('views'))
 ```
 
-#### Safely extract nested lists
-
-Suppose you've extracted JSON like this into a Python data structure named `media_json` using, say, the `_download_json()` or `_parse_json()` methods of `InfoExtractor`:
-```json
-{
-    "title": "Example video",
-    "comment": "try extracting this",
-    "media": [{
-        "type": "bad",
-        "size": 320,
-        "url": "https://some.cdn.site/bad.mp4"
-    }, {
-        "type": "streaming",
-        "url": "https://some.cdn.site/hls.m3u8"
-    }, {
-        "type": "super",
-        "size": 1280,
-        "url": "https://some.cdn.site/good.webm"
-    }],
-    "moreStuff": "more values",
-    ...
-}
-```
-
-Then extractor code like this can collect the various fields of the JSON:
-```python
-...
-from ..utils import (
-    determine_ext,
-    int_or_none,
-    T,
-    traverse_obj,
-    txt_or_none,
-    url_or_none,
-)
-...
-        ...
-        info_dict = {}
-        # extract title and description if valid and not empty
-        info_dict.update(traverse_obj(media_json, {
-            'title': ('title', T(txt_or_none)),
-            'description': ('comment', T(txt_or_none)),
-        }))
-
-        # extract any recognisable media formats
-        fmts = []
-        # traverse into "media" list, extract `dict`s with desired keys
-        for fmt in traverse_obj(media_json, ('media', Ellipsis, {
-                'format_id': ('type', T(txt_or_none)),
-                'url': ('url', T(url_or_none)),
-                'width': ('size', T(int_or_none)), })):
-            # bad `fmt` values were `None` and removed
-            if 'url' not in fmt:
-                continue
-            fmt_url = fmt['url']  # known to be valid URL
-            ext = determine_ext(fmt_url)
-            if ext == 'm3u8':
-                fmts.extend(self._extract_m3u8_formats(fmt_url, video_id, 'mp4', fatal=False))
-            else:
-                fmt['ext'] = ext
-                fmts.append(fmt)
-
-        # sort, raise if no formats
-        self._sort_formats(fmts)
-
-        info_dict['formats'] = fmts
-        ...
-```
-The extractor raises an exception rather than random crashes if the JSON structure changes so that no formats are found.
-
 # EMBEDDING YOUTUBE-DL
 
 youtube-dl makes the best effort to be a good command-line program, and thus should be callable from any programming language. If you encounter any problems parsing its output, feel free to [create a report](https://github.com/ytdl-org/youtube-dl/issues/new).
@@ -1497,11 +1406,7 @@ with youtube_dl.YoutubeDL(ydl_opts) as ydl:
 
 # BUGS
 
-Bugs and suggestions should be reported in the issue tracker: <https://github.com/ytdl-org/youtube-dl/issues> (<https://yt-dl.org/bug> is an alias for this). Unless you were prompted to or there is another pertinent reason (e.g. GitHub fails to accept the bug report), please do not send bug reports via personal email. For discussions, join us in the IRC channel [#youtube-dl](irc://chat.freenode.net/#youtube-dl) on freenode ([webchat](https://webchat.freenode.net/?randomnick=1&channels=youtube-dl)).
+Bugs and suggestions should be reported at: <https://github.com/ytdl-org/youtube-dl/issues>. Unless you were prompted to or there is another pertinent reason (e.g. GitHub fails to accept the bug report), please do not send bug reports via personal email. For discussions, join us in the IRC channel [#youtube-dl](irc://chat.freenode.net/#youtube-dl) on freenode ([webchat](https://webchat.freenode.net/?randomnick=1&channels=youtube-dl)).
-
-## Opening a bug report or suggestion
-
-Be sure to follow instructions provided **below** and **in the issue tracker**. Complete the appropriate issue template fully. Consider whether your problem is covered by an existing issue: if so, follow the discussion there. Avoid commenting on existing duplicate issues as such comments do not add to the discussion of the issue and are liable to be treated as spam.
 
 **Please include the full output of youtube-dl when run with `-v`**, i.e. **add** `-v` flag to **your command line**, copy the **whole** output and post it in the issue body wrapped in \`\`\` for better formatting. It should look similar to this:
 ```
@@ -1521,17 +1426,17 @@ $ youtube-dl -v <your command line>
 
 The output (including the first lines) contains important debugging information. Issues without the full output are often not reproducible and therefore do not get solved in short order, if ever.
 
-Finally please review your issue to avoid various common mistakes (you can and should use this as a checklist) listed below.
+Please re-read your issue once again to avoid a couple of common mistakes (you can and should use this as a checklist):
 
 ### Is the description of the issue itself sufficient?
 
-We often get issue reports that are hard to understand. To avoid subsequent clarifications, and to assist participants who are not native English speakers, please elaborate on what feature you are requesting, or what bug you want to be fixed.
+We often get issue reports that we cannot really decipher. While in most cases we eventually get the required information after asking back multiple times, this poses an unnecessary drain on our resources. Many contributors, including myself, are also not native speakers, so we may misread some parts.
 
-Make sure that it's obvious
+So please elaborate on what feature you are requesting, or what bug you want to be fixed. Make sure that it's obvious
 
 - What the problem is
 - How it could be fixed
-- How your proposed solution would look
+- How your proposed solution would look like
 
 If your report is shorter than two lines, it is almost certainly missing some of these, which makes it hard for us to respond to it. We're often too polite to close the issue outright, but the missing info makes misinterpretation likely. As a committer myself, I often get frustrated by these issues, since the only possible way for me to move forward on them is to ask for clarification over and over.
 
@@ -1541,14 +1446,14 @@ If your server has multiple IPs or you suspect censorship, adding `--call-home`
 
 **Site support requests must contain an example URL**. An example URL is a URL you might want to download, like `https://www.youtube.com/watch?v=BaW_jenozKc`. There should be an obvious video present. Except under very special circumstances, the main page of a video service (e.g. `https://www.youtube.com/`) is *not* an example URL.
 
-###  Is the issue already documented?
-
-Make sure that someone has not already opened the issue you're trying to open. Search at the top of the window or browse the [GitHub Issues](https://github.com/ytdl-org/youtube-dl/search?type=Issues) of this repository. Initially, at least, use the search term `-label:duplicate` to focus on active issues. If there is an issue, feel free to write something along the lines of "This affects me as well, with version 2015.01.01. Here is some more information on the issue: ...". While some issues may be old, a new post into them often spurs rapid activity.
-
 ###  Are you using the latest version?
 
 Before reporting any issue, type `youtube-dl -U`. This should report that you're up-to-date. About 20% of the reports we receive are already fixed, but people are using outdated versions. This goes for feature requests as well.
 
+###  Is the issue already documented?
+
+Make sure that someone has not already opened the issue you're trying to open. Search at the top of the window or browse the [GitHub Issues](https://github.com/ytdl-org/youtube-dl/search?type=Issues) of this repository. If there is an issue, feel free to write something along the lines of "This affects me as well, with version 2015.01.01. Here is some more information on the issue: ...". While some issues may be old, a new post into them often spurs rapid activity.
+
 ###  Why are existing options not enough?
 
 Before requesting a new feature, please have a quick peek at [the list of supported options](https://github.com/ytdl-org/youtube-dl/blob/master/README.md#options). Many feature requests are for features that actually exist already! Please, absolutely do show off your work in the issue report and detail how the existing similar options do *not* solve your problem.

devscripts/__init__.py

@@ -1 +0,0 @@
-# Empty file needed to make devscripts.utils properly importable from outside

devscripts/bash-completion.py

@@ -5,12 +5,8 @@ import os
 from os.path import dirname as dirn
 import sys
 
-sys.path.insert(0, dirn(dirn(os.path.abspath(__file__))))
+sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
-
 import youtube_dl
-from youtube_dl.compat import compat_open as open
-
-from utils import read_file
 
 BASH_COMPLETION_FILE = "youtube-dl.bash-completion"
 BASH_COMPLETION_TEMPLATE = "devscripts/bash-completion.in"
@@ -22,8 +18,9 @@ def build_completion(opt_parser):
         for option in group.option_list:
             # for every long flag
             opts_flag.append(option.get_opt_string())
-    template = read_file(BASH_COMPLETION_TEMPLATE)
+    with open(BASH_COMPLETION_TEMPLATE) as f:
-    with open(BASH_COMPLETION_FILE, "w", encoding='utf-8') as f:
+        template = f.read()
+    with open(BASH_COMPLETION_FILE, "w") as f:
         # just using the special char
         filled_template = template.replace("{{flags}}", " ".join(opts_flag))
         f.write(filled_template)

devscripts/cli_to_api.py

@@ -1,83 +0,0 @@
-#!/usr/bin/env python
-# coding: utf-8
-
-from __future__ import unicode_literals
-
-"""
-This script displays the API parameters corresponding to a yt-dl command line
-
-Example:
-$ ./cli_to_api.py -f best
-{u'format': 'best'}
-$
-"""
-
-# Allow direct execution
-import os
-import sys
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-import youtube_dl
-from types import MethodType
-
-
-def cli_to_api(*opts):
-    YDL = youtube_dl.YoutubeDL
-
-    # to extract the parsed options, break out of YoutubeDL instantiation
-
-    # return options via this Exception
-    class ParseYTDLResult(Exception):
-        def __init__(self, result):
-            super(ParseYTDLResult, self).__init__('result')
-            self.opts = result
-
-    # replacement constructor that raises ParseYTDLResult
-    def ytdl_init(ydl, ydl_opts):
-        super(YDL, ydl).__init__(ydl_opts)
-        raise ParseYTDLResult(ydl_opts)
-
-    # patch in the constructor
-    YDL.__init__ = MethodType(ytdl_init, YDL)
-
-    # core parser
-    def parsed_options(argv):
-        try:
-            youtube_dl._real_main(list(argv))
-        except ParseYTDLResult as result:
-            return result.opts
-
-    # from https://github.com/yt-dlp/yt-dlp/issues/5859#issuecomment-1363938900
-    default = parsed_options([])
-
-    def neq_opt(a, b):
-        if a == b:
-            return False
-        if a is None and repr(type(object)).endswith(".utils.DateRange'>"):
-            return '0001-01-01 - 9999-12-31' != '{0}'.format(b)
-        return a != b
-
-    diff = dict((k, v) for k, v in parsed_options(opts).items() if neq_opt(default[k], v))
-    if 'postprocessors' in diff:
-        diff['postprocessors'] = [pp for pp in diff['postprocessors'] if pp not in default['postprocessors']]
-    return diff
-
-
-def main():
-    from pprint import PrettyPrinter
-
-    pprint = PrettyPrinter()
-    super_format = pprint.format
-
-    def format(object, context, maxlevels, level):
-        if repr(type(object)).endswith(".utils.DateRange'>"):
-            return '{0}: {1}>'.format(repr(object)[:-2], object), True, False
-        return super_format(object, context, maxlevels, level)
-
-    pprint.format = format
-
-    pprint.pprint(cli_to_api(*sys.argv))
-
-
-if __name__ == '__main__':
-    main()

devscripts/create-github-release.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 from __future__ import unicode_literals
 
+import io
 import json
 import mimetypes
 import netrc
@@ -9,9 +10,7 @@ import os
 import re
 import sys
 
-dirn = os.path.dirname
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-sys.path.insert(0, dirn(dirn(os.path.abspath(__file__))))
 
 from youtube_dl.compat import (
     compat_basestring,
@@ -23,7 +22,6 @@ from youtube_dl.utils import (
     make_HTTPS_handler,
     sanitized_Request,
 )
-from utils import read_file
 
 
 class GitHubReleaser(object):
@@ -91,7 +89,8 @@ def main():
 
     changelog_file, version, build_path = args
 
-    changelog = read_file(changelog_file)
+    with io.open(changelog_file, encoding='utf-8') as inf:
+        changelog = inf.read()
 
     mobj = re.search(r'(?s)version %s\n{2}(.+?)\n{3}' % version, changelog)
     body = mobj.group(1) if mobj else ''

devscripts/fish-completion.py

@@ -6,13 +6,10 @@ import os
 from os.path import dirname as dirn
 import sys
 
-sys.path.insert(0, dirn(dirn(os.path.abspath(__file__))))
+sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
-
 import youtube_dl
 from youtube_dl.utils import shell_quote
 
-from utils import read_file, write_file
-
 FISH_COMPLETION_FILE = 'youtube-dl.fish'
 FISH_COMPLETION_TEMPLATE = 'devscripts/fish-completion.in'
 
@@ -41,9 +38,11 @@ def build_completion(opt_parser):
             complete_cmd.extend(EXTRA_ARGS.get(long_option, []))
             commands.append(shell_quote(complete_cmd))
 
-    template = read_file(FISH_COMPLETION_TEMPLATE)
+    with open(FISH_COMPLETION_TEMPLATE) as f:
+        template = f.read()
     filled_template = template.replace('{{commands}}', '\n'.join(commands))
-    write_file(FISH_COMPLETION_FILE, filled_template)
+    with open(FISH_COMPLETION_FILE, 'w') as f:
+        f.write(filled_template)
 
 
 parser = youtube_dl.parseOpts()[0]

devscripts/gh-pages/add-version.py

@@ -6,21 +6,16 @@ import sys
 import hashlib
 import os.path
 
-dirn = os.path.dirname
-
-sys.path.insert(0, dirn(dirn(dirn(os.path.abspath(__file__)))))
-
-from devscripts.utils import read_file, write_file
-from youtube_dl.compat import compat_open as open
 
 if len(sys.argv) <= 1:
     print('Specify the version number as parameter')
     sys.exit()
 version = sys.argv[1]
 
-write_file('update/LATEST_VERSION', version)
+with open('update/LATEST_VERSION', 'w') as f:
+    f.write(version)
 
-versions_info = json.loads(read_file('update/versions.json'))
+versions_info = json.load(open('update/versions.json'))
 if 'signature' in versions_info:
     del versions_info['signature']
 
@@ -44,5 +39,5 @@ for key, filename in filenames.items():
 versions_info['versions'][version] = new_version
 versions_info['latest'] = version
 
-with open('update/versions.json', 'w', encoding='utf-8') as jsonf:
+with open('update/versions.json', 'w') as jsonf:
-    json.dumps(versions_info, jsonf, indent=4, sort_keys=True)
+    json.dump(versions_info, jsonf, indent=4, sort_keys=True)

devscripts/gh-pages/generate-download.py

@@ -2,21 +2,14 @@
 from __future__ import unicode_literals
 
 import json
-import os.path
-import sys
 
-dirn = os.path.dirname
+versions_info = json.load(open('update/versions.json'))
-
-sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
-
-from utils import read_file, write_file
-
-versions_info = json.loads(read_file('update/versions.json'))
 version = versions_info['latest']
 version_dict = versions_info['versions'][version]
 
 # Read template page
-template = read_file('download.html.in')
+with open('download.html.in', 'r', encoding='utf-8') as tmplf:
+    template = tmplf.read()
 
 template = template.replace('@PROGRAM_VERSION@', version)
 template = template.replace('@PROGRAM_URL@', version_dict['bin'][0])
@@ -25,5 +18,5 @@ template = template.replace('@EXE_URL@', version_dict['exe'][0])
 template = template.replace('@EXE_SHA256SUM@', version_dict['exe'][1])
 template = template.replace('@TAR_URL@', version_dict['tar'][0])
 template = template.replace('@TAR_SHA256SUM@', version_dict['tar'][1])
-
+with open('download.html', 'w', encoding='utf-8') as dlf:
-write_file('download.html', template)
+    dlf.write(template)

devscripts/gh-pages/update-copyright.py

@@ -5,22 +5,17 @@ from __future__ import with_statement, unicode_literals
 
 import datetime
 import glob
+import io  # For Python 2 compatibility
 import os
 import re
-import sys
 
-dirn = os.path.dirname
+year = str(datetime.datetime.now().year)
-
-sys.path.insert(0, dirn(dirn(dirn(os.path.abspath(__file__)))))
-
-from devscripts.utils import read_file, write_file
-from youtube_dl import compat_str
-
-year = compat_str(datetime.datetime.now().year)
 for fn in glob.glob('*.html*'):
-    content = read_file(fn)
+    with io.open(fn, encoding='utf-8') as f:
+        content = f.read()
     newc = re.sub(r'(?P<copyright>Copyright © 2011-)(?P<year>[0-9]{4})', 'Copyright © 2011-' + year, content)
     if content != newc:
         tmpFn = fn + '.part'
-        write_file(tmpFn, newc)
+        with io.open(tmpFn, 'wt', encoding='utf-8') as outf:
+            outf.write(newc)
         os.rename(tmpFn, fn)

devscripts/gh-pages/update-feed.py

@@ -2,16 +2,10 @@
 from __future__ import unicode_literals
 
 import datetime
+import io
 import json
-import os.path
 import textwrap
-import sys
 
-dirn = os.path.dirname
-
-sys.path.insert(0, dirn(dirn(os.path.abspath(__file__))))
-
-from utils import write_file
 
 atom_template = textwrap.dedent("""\
     <?xml version="1.0" encoding="utf-8"?>
@@ -78,4 +72,5 @@ for v in versions:
 entries_str = textwrap.indent(''.join(entries), '\t')
 atom_template = atom_template.replace('@ENTRIES@', entries_str)
 
-write_file('update/releases.atom', atom_template)
+with io.open('update/releases.atom', 'w', encoding='utf-8') as atom_file:
+    atom_file.write(atom_template)

devscripts/gh-pages/update-sites.py

@@ -5,17 +5,15 @@ import sys
 import os
 import textwrap
 
-dirn = os.path.dirname
-
 # We must be able to import youtube_dl
-sys.path.insert(0, dirn(dirn(dirn(os.path.abspath(__file__)))))
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
 
 import youtube_dl
-from devscripts.utils import read_file, write_file
 
 
 def main():
-    template = read_file('supportedsites.html.in')
+    with open('supportedsites.html.in', 'r', encoding='utf-8') as tmplf:
+        template = tmplf.read()
 
     ie_htmls = []
     for ie in youtube_dl.list_extractors(age_limit=None):
@@ -31,7 +29,8 @@ def main():
 
     template = template.replace('@SITES@', textwrap.indent('\n'.join(ie_htmls), '\t'))
 
-    write_file('supportedsites.html', template)
+    with open('supportedsites.html', 'w', encoding='utf-8') as sitesf:
+        sitesf.write(template)
 
 
 if __name__ == '__main__':

devscripts/make_contributing.py

@@ -1,11 +1,10 @@
 #!/usr/bin/env python
 from __future__ import unicode_literals
 
+import io
 import optparse
 import re
 
-from utils import read_file, write_file
-
 
 def main():
     parser = optparse.OptionParser(usage='%prog INFILE OUTFILE')
@@ -15,7 +14,8 @@ def main():
 
     infile, outfile = args
 
-    readme = read_file(infile)
+    with io.open(infile, encoding='utf-8') as inf:
+        readme = inf.read()
 
     bug_text = re.search(
         r'(?s)#\s*BUGS\s*[^\n]*\s*(.*?)#\s*COPYRIGHT', readme).group(1)
@@ -25,7 +25,8 @@ def main():
 
     out = bug_text + dev_text
 
-    write_file(outfile, out)
+    with io.open(outfile, 'w', encoding='utf-8') as outf:
+        outf.write(out)
 
 
 if __name__ == '__main__':

devscripts/make_issue_template.py

@@ -1,11 +1,8 @@
 #!/usr/bin/env python
 from __future__ import unicode_literals
 
+import io
 import optparse
-import os.path
-import sys
-
-from utils import read_file, read_version, write_file
 
 
 def main():
@@ -16,11 +13,17 @@ def main():
 
     infile, outfile = args
 
-    issue_template_tmpl = read_file(infile)
+    with io.open(infile, encoding='utf-8') as inf:
+        issue_template_tmpl = inf.read()
 
-    out = issue_template_tmpl % {'version': read_version()}
+    # Get the version from youtube_dl/version.py without importing the package
+    exec(compile(open('youtube_dl/version.py').read(),
+                 'youtube_dl/version.py', 'exec'))
 
-    write_file(outfile, out)
+    out = issue_template_tmpl % {'version': locals()['__version__']}
+
+    with io.open(outfile, 'w', encoding='utf-8') as outf:
+        outf.write(out)
 
 if __name__ == '__main__':
     main()

devscripts/make_lazy_extractors.py

@@ -1,49 +1,28 @@
 from __future__ import unicode_literals, print_function
 
 from inspect import getsource
+import io
 import os
 from os.path import dirname as dirn
-import re
 import sys
 
 print('WARNING: Lazy loading extractors is an experimental feature that may not always work', file=sys.stderr)
 
-sys.path.insert(0, dirn(dirn(os.path.abspath(__file__))))
+sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
 
 lazy_extractors_filename = sys.argv[1]
 if os.path.exists(lazy_extractors_filename):
     os.remove(lazy_extractors_filename)
-# Py2: may be confused by leftover lazy_extractors.pyc
-if sys.version_info[0] < 3:
-    for c in ('c', 'o'):
-        try:
-            os.remove(lazy_extractors_filename + 'c')
-        except OSError:
-            pass
-
-from devscripts.utils import read_file, write_file
-from youtube_dl.compat import compat_register_utf8
-
-compat_register_utf8()
 
 from youtube_dl.extractor import _ALL_CLASSES
 from youtube_dl.extractor.common import InfoExtractor, SearchInfoExtractor
 
-module_template = read_file('devscripts/lazy_load_template.py')
+with open('devscripts/lazy_load_template.py', 'rt') as f:
-
+    module_template = f.read()
-
-def get_source(m):
-    return re.sub(r'(?m)^\s*#.*\n', '', getsource(m))
-
 
 module_contents = [
-    module_template,
+    module_template + '\n' + getsource(InfoExtractor.suitable) + '\n',
-    get_source(InfoExtractor.suitable),
+    'class LazyLoadSearchExtractor(LazyLoadExtractor):\n    pass\n']
-    get_source(InfoExtractor._match_valid_url) + '\n',
-    'class LazyLoadSearchExtractor(LazyLoadExtractor):\n    pass\n',
-    # needed for suitable() methods of Youtube extractor (see #28780)
-    'from youtube_dl.utils import parse_qs, variadic\n',
-]
 
 ie_template = '''
 class {name}({bases}):
@@ -75,7 +54,7 @@ def build_lazy_ie(ie, name):
         valid_url=valid_url,
         module=ie.__module__)
     if ie.suitable.__func__ is not InfoExtractor.suitable.__func__:
-        s += '\n' + get_source(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())
@@ -115,17 +94,7 @@ for ie in ordered_cls:
 module_contents.append(
     '_ALL_CLASSES = [{0}]'.format(', '.join(names)))
 
-module_src = '\n'.join(module_contents)
+module_src = '\n'.join(module_contents) + '\n'
 
-write_file(lazy_extractors_filename, module_src + '\n')
+with io.open(lazy_extractors_filename, 'wt', encoding='utf-8') as f:
-
+    f.write(module_src)
-# work around JVM byte code module limit in Jython
-if sys.platform.startswith('java') and sys.version_info[:2] == (2, 7):
-    import subprocess
-    from youtube_dl.compat import compat_subprocess_get_DEVNULL
-    # if Python 2.7 is available, use it to compile the module for Jython
-    try:
-        # if Python 2.7 is available, use it to compile the module for Jython
-        subprocess.check_call(['python2.7', '-m', 'py_compile', lazy_extractors_filename], stdout=compat_subprocess_get_DEVNULL())
-    except Exception:
-        pass

devscripts/make_readme.py

@@ -1,14 +1,8 @@
 from __future__ import unicode_literals
 
-import os.path
+import io
-import re
 import sys
-dirn = os.path.dirname
+import re
-
-sys.path.insert(0, dirn(dirn(os.path.abspath(__file__))))
-
-from utils import read_file
-from youtube_dl.compat import compat_open as open
 
 README_FILE = 'README.md'
 helptext = sys.stdin.read()
@@ -16,7 +10,8 @@ helptext = sys.stdin.read()
 if isinstance(helptext, bytes):
     helptext = helptext.decode('utf-8')
 
-oldreadme = read_file(README_FILE)
+with io.open(README_FILE, encoding='utf-8') as f:
+    oldreadme = f.read()
 
 header = oldreadme[:oldreadme.index('# OPTIONS')]
 footer = oldreadme[oldreadme.index('# CONFIGURATION'):]
@@ -25,7 +20,7 @@ options = helptext[helptext.index('  General Options:') + 19:]
 options = re.sub(r'(?m)^  (\w.+)$', r'## \1', options)
 options = '# OPTIONS\n' + options + '\n'
 
-with open(README_FILE, 'w', encoding='utf-8') as f:
+with io.open(README_FILE, 'w', encoding='utf-8') as f:
     f.write(header)
     f.write(options)
     f.write(footer)

devscripts/make_supportedsites.py

@@ -1,19 +1,17 @@
 #!/usr/bin/env python
 from __future__ import unicode_literals
 
+import io
 import optparse
-import os.path
+import os
 import sys
 
+
 # Import youtube_dl
-dirn = os.path.dirname
+ROOT_DIR = os.path.join(os.path.dirname(__file__), '..')
-
+sys.path.insert(0, ROOT_DIR)
-sys.path.insert(0, dirn(dirn(os.path.abspath(__file__))))
-
 import youtube_dl
 
-from utils import write_file
-
 
 def main():
     parser = optparse.OptionParser(usage='%prog OUTFILE.md')
@@ -40,7 +38,8 @@ def main():
         ' - ' + md + '\n'
         for md in gen_ies_md(ies))
 
-    write_file(outfile, out)
+    with io.open(outfile, 'w', encoding='utf-8') as outf:
+        outf.write(out)
 
 
 if __name__ == '__main__':

devscripts/prepare_manpage.py

@@ -1,13 +1,13 @@
 from __future__ import unicode_literals
 
+import io
 import optparse
 import os.path
 import re
 
-from utils import read_file, write_file
-
 ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 README_FILE = os.path.join(ROOT_DIR, 'README.md')
+
 PREFIX = r'''%YOUTUBE-DL(1)
 
 # NAME
@@ -29,7 +29,8 @@ def main():
 
     outfile, = args
 
-    readme = read_file(README_FILE)
+    with io.open(README_FILE, encoding='utf-8') as f:
+        readme = f.read()
 
     readme = re.sub(r'(?s)^.*?(?=# DESCRIPTION)', '', readme)
     readme = re.sub(r'\s+youtube-dl \[OPTIONS\] URL \[URL\.\.\.\]', '', readme)
@@ -37,7 +38,8 @@ def main():
 
     readme = filter_options(readme)
 
-    write_file(outfile, readme)
+    with io.open(outfile, 'w', encoding='utf-8') as outf:
+        outf.write(readme)
 
 
 def filter_options(readme):

devscripts/utils.py

@@ -1,62 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-import argparse
-import functools
-import os.path
-import subprocess
-import sys
-
-dirn = os.path.dirname
-
-sys.path.insert(0, dirn(dirn(os.path.abspath(__file__))))
-
-from youtube_dl.compat import (
-    compat_kwargs,
-    compat_open as open,
-)
-
-
-def read_file(fname):
-    with open(fname, encoding='utf-8') as f:
-        return f.read()
-
-
-def write_file(fname, content, mode='w'):
-    with open(fname, mode, encoding='utf-8') as f:
-        return f.write(content)
-
-
-def read_version(fname='youtube_dl/version.py'):
-    """Get the version without importing the package"""
-    exec(compile(read_file(fname), fname, 'exec'))
-    return locals()['__version__']
-
-
-def get_filename_args(has_infile=False, default_outfile=None):
-    parser = argparse.ArgumentParser()
-    if has_infile:
-        parser.add_argument('infile', help='Input file')
-    kwargs = {'nargs': '?', 'default': default_outfile} if default_outfile else {}
-    kwargs['help'] = 'Output file'
-    parser.add_argument('outfile', **compat_kwargs(kwargs))
-
-    opts = parser.parse_args()
-    if has_infile:
-        return opts.infile, opts.outfile
-    return opts.outfile
-
-
-def compose_functions(*functions):
-    return lambda x: functools.reduce(lambda y, f: f(y), functions, x)
-
-
-def run_process(*args, **kwargs):
-    kwargs.setdefault('text', True)
-    kwargs.setdefault('check', True)
-    kwargs.setdefault('capture_output', True)
-    if kwargs['text']:
-        kwargs.setdefault('encoding', 'utf-8')
-        kwargs.setdefault('errors', 'replace')
-        kwargs = compat_kwargs(kwargs)
-    return subprocess.run(args, **kwargs)

devscripts/zsh-completion.py

@@ -7,8 +7,6 @@ import sys
 
 sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
 import youtube_dl
-from utils import read_file, write_file
-
 
 ZSH_COMPLETION_FILE = "youtube-dl.zsh"
 ZSH_COMPLETION_TEMPLATE = "devscripts/zsh-completion.in"
@@ -36,13 +34,15 @@ def build_completion(opt_parser):
 
     flags = [opt.get_opt_string() for opt in opts]
 
-    template = read_file(ZSH_COMPLETION_TEMPLATE)
+    with open(ZSH_COMPLETION_TEMPLATE) as f:
+        template = f.read()
 
     template = template.replace("{{fileopts}}", "|".join(fileopts))
     template = template.replace("{{diropts}}", "|".join(diropts))
     template = template.replace("{{flags}}", " ".join(flags))
 
-    write_file(ZSH_COMPLETION_FILE, template)
+    with open(ZSH_COMPLETION_FILE, "w") as f:
+        f.write(template)
 
 
 parser = youtube_dl.parseOpts()[0]

docs/supportedsites.md

@@ -3,7 +3,6 @@
  - **20min**
  - **220.ro**
  - **23video**
- - **247sports**
  - **24video**
  - **3qsdn**: 3Q SDN
  - **3sat**
@@ -119,6 +118,7 @@
  - **BitChuteChannel**
  - **BleacherReport**
  - **BleacherReportCMS**
+ - **blinkx**
  - **Bloomberg**
  - **BokeCC**
  - **BongaCams**
@@ -160,8 +160,7 @@
  - **cbsnews**: CBS News
  - **cbsnews:embed**
  - **cbsnews:livevideo**: CBS News Live Videos
- - **cbssports**
+ - **CBSSports**
- - **cbssports:embed**
  - **CCMA**
  - **CCTV**: 央视网
  - **CDA**
@@ -464,14 +463,14 @@
  - **limelight**
  - **limelight:channel**
  - **limelight:channel_list**
- - **LineLive**
- - **LineLiveChannel**
  - **LineTV**
  - **linkedin:learning**
  - **linkedin:learning:course**
  - **LinuxAcademy**
  - **LiTV**
  - **LiveJournal**
+ - **LiveLeak**
+ - **LiveLeakEmbed**
  - **livestream**
  - **livestream:original**
  - **LnkGo**
@@ -489,7 +488,6 @@
  - **mangomolo:live**
  - **mangomolo:video**
  - **ManyVids**
- - **MaoriTV**
  - **Markiza**
  - **MarkizaPage**
  - **massengeschmack.tv**
@@ -681,9 +679,6 @@
  - **OutsideTV**
  - **PacktPub**
  - **PacktPubCourse**
- - **PalcoMP3:artist**
- - **PalcoMP3:song**
- - **PalcoMP3:video**
  - **pandora.tv**: 판도라TV
  - **ParamountNetwork**
  - **parliamentlive.tv**: UK parliament videos
@@ -710,7 +705,6 @@
  - **play.fm**
  - **player.sky.it**
  - **PlayPlusTV**
- - **PlayStuff**
  - **PlaysTV**
  - **Playtvak**: Playtvak.cz, iDNES.cz and Lidovky.cz
  - **Playvid**
@@ -1065,7 +1059,6 @@
  - **Vidbit**
  - **Viddler**
  - **Videa**
- - **video.arnes.si**: Arnes Video
  - **video.google:search**: Google Video search
  - **video.sky.it**
  - **video.sky.it:live**
@@ -1160,7 +1153,7 @@
  - **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**

test/helper.py

@@ -1,24 +1,22 @@
 from __future__ import unicode_literals
 
 import errno
+import io
 import hashlib
 import json
 import os.path
 import re
+import types
 import ssl
 import sys
-import types
-import unittest
 
 import youtube_dl.extractor
 from youtube_dl import YoutubeDL
 from youtube_dl.compat import (
-    compat_open as open,
     compat_os_name,
     compat_str,
 )
 from youtube_dl.utils import (
-    IDENTITY,
     preferredencoding,
     write_string,
 )
@@ -29,10 +27,10 @@ def get_params(override=None):
                                    "parameters.json")
     LOCAL_PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)),
                                          "local_parameters.json")
-    with open(PARAMETERS_FILE, encoding='utf-8') as pf:
+    with io.open(PARAMETERS_FILE, encoding='utf-8') as pf:
         parameters = json.load(pf)
     if os.path.exists(LOCAL_PARAMETERS_FILE):
-        with open(LOCAL_PARAMETERS_FILE, encoding='utf-8') as pf:
+        with io.open(LOCAL_PARAMETERS_FILE, encoding='utf-8') as pf:
             parameters.update(json.load(pf))
     if override:
         parameters.update(override)
@@ -74,8 +72,7 @@ class FakeYDL(YoutubeDL):
     def to_screen(self, s, skip_eol=None):
         print(s)
 
-    def trouble(self, *args, **kwargs):
+    def trouble(self, s, tb=None):
-        s = args[0] if len(args) > 0 else kwargs.get('message', 'Missing message')
         raise Exception(s)
 
     def download(self, x):
@@ -92,17 +89,6 @@ class FakeYDL(YoutubeDL):
         self.report_warning = types.MethodType(report_warning, self)
 
 
-class FakeLogger(object):
-    def debug(self, msg):
-        pass
-
-    def warning(self, msg):
-        pass
-
-    def error(self, msg):
-        pass
-
-
 def gettestcases(include_onlymatching=False):
     for ie in youtube_dl.extractor.gen_extractors():
         for tc in ie.get_testcases(include_onlymatching):
@@ -142,12 +128,6 @@ def expect_value(self, got, expected, field):
         self.assertTrue(
             contains_str in got,
             'field %s (value: %r) should contain %r' % (field, got, contains_str))
-    elif isinstance(expected, compat_str) and re.match(r'lambda \w+:', expected):
-        fn = eval(expected)
-        suite = expected.split(':', 1)[1].strip()
-        self.assertTrue(
-            fn(got),
-            'Expected field %s to meet condition %s, but value %r failed ' % (field, suite, got))
     elif isinstance(expected, type):
         self.assertTrue(
             isinstance(got, expected),
@@ -157,7 +137,7 @@ def expect_value(self, got, expected, field):
     elif isinstance(expected, list) and isinstance(got, list):
         self.assertEqual(
             len(expected), len(got),
-            'Expected a list of length %d, but got a list of length %d for field %s' % (
+            'Expect a list of length %d, but got a list of length %d for field %s' % (
                 len(expected), len(got), field))
         for index, (item_got, item_expected) in enumerate(zip(got, expected)):
             type_got = type(item_got)
@@ -181,18 +161,18 @@ def expect_value(self, got, expected, field):
             op, _, expected_num = expected.partition(':')
             expected_num = int(expected_num)
             if op == 'mincount':
-                assert_func = self.assertGreaterEqual
+                assert_func = assertGreaterEqual
                 msg_tmpl = 'Expected %d items in field %s, but only got %d'
             elif op == 'maxcount':
-                assert_func = self.assertLessEqual
+                assert_func = assertLessEqual
                 msg_tmpl = 'Expected maximum %d items in field %s, but got %d'
             elif op == 'count':
-                assert_func = self.assertEqual
+                assert_func = assertEqual
                 msg_tmpl = 'Expected exactly %d items in field %s, but got %d'
             else:
                 assert False
             assert_func(
-                len(got), expected_num,
+                self, len(got), expected_num,
                 msg_tmpl % (expected_num, field, len(got)))
             return
         self.assertEqual(
@@ -262,6 +242,27 @@ def assertRegexpMatches(self, text, regexp, msg=None):
             self.assertTrue(m, msg)
 
 
+def assertGreaterEqual(self, got, expected, msg=None):
+    if not (got >= expected):
+        if msg is None:
+            msg = '%r not greater than or equal to %r' % (got, expected)
+        self.assertTrue(got >= expected, msg)
+
+
+def assertLessEqual(self, got, expected, msg=None):
+    if not (got <= expected):
+        if msg is None:
+            msg = '%r not less than or equal to %r' % (got, expected)
+        self.assertTrue(got <= expected, msg)
+
+
+def assertEqual(self, got, expected, msg=None):
+    if not (got == expected):
+        if msg is None:
+            msg = '%r not equal to %r' % (got, expected)
+        self.assertTrue(got == expected, msg)
+
+
 def expect_warnings(ydl, warnings_re):
     real_warning = ydl.report_warning
 
@@ -279,7 +280,3 @@ def http_server_port(httpd):
     else:
         sock = httpd.socket
     return sock.getsockname()[1]
-
-
-def expectedFailureIf(cond):
-    return unittest.expectedFailure if cond else IDENTITY

test/parameters.json

@@ -18,6 +18,7 @@
     "noprogress": false, 
     "outtmpl": "%(id)s.%(ext)s", 
     "password": null, 
+    "playlistend": -1, 
     "playliststart": 1, 
     "prefer_free_formats": false, 
     "quiet": false, 

test/test_InfoExtractor.py

@@ -3,36 +3,18 @@
 from __future__ import unicode_literals
 
 # Allow direct execution
+import io
 import os
 import sys
 import unittest
-
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-import threading
+from test.helper import FakeYDL, expect_dict, expect_value, http_server_port
-
+from youtube_dl.compat import compat_etree_fromstring, compat_http_server
-from test.helper import (
-    expect_dict,
-    expect_value,
-    FakeYDL,
-    http_server_port,
-)
-from youtube_dl.compat import (
-    compat_etree_fromstring,
-    compat_http_server,
-    compat_open as open,
-)
 from youtube_dl.extractor.common import InfoExtractor
-from youtube_dl.extractor import (
+from youtube_dl.extractor import YoutubeIE, get_info_extractor
-    get_info_extractor,
+from youtube_dl.utils import encode_data_uri, strip_jsonp, ExtractorError, RegexNotFoundError
-    YoutubeIE,
+import threading
-)
-from youtube_dl.utils import (
-    encode_data_uri,
-    ExtractorError,
-    RegexNotFoundError,
-    strip_jsonp,
-)
 
 
 TEAPOT_RESPONSE_STATUS = 418
@@ -53,13 +35,13 @@ class InfoExtractorTestRequestHandler(compat_http_server.BaseHTTPRequestHandler)
             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)
@@ -80,7 +62,6 @@ class TestInfoExtractor(unittest.TestCase):
             <meta name="og:test1" content='foo > < bar'/>
             <meta name="og:test2" content="foo >//< bar"/>
             <meta property=og-test3 content='Ill-formatted opengraph'/>
-            <meta property=og:test4 content=unquoted-value/>
             '''
         self.assertEqual(ie._og_search_title(html), 'Foo')
         self.assertEqual(ie._og_search_description(html), 'Some video\'s description ')
@@ -93,7 +74,6 @@ class TestInfoExtractor(unittest.TestCase):
         self.assertEqual(ie._og_search_property(('test0', 'test1'), html), 'foo > < bar')
         self.assertRaises(RegexNotFoundError, ie._og_search_property, 'test0', html, None, fatal=True)
         self.assertRaises(RegexNotFoundError, ie._og_search_property, ('test0', 'test00'), html, None, fatal=True)
-        self.assertEqual(ie._og_search_property('test4', html), 'unquoted-value')
 
     def test_html_search_meta(self):
         ie = self.ie
@@ -118,74 +98,6 @@ class TestInfoExtractor(unittest.TestCase):
         self.assertRaises(RegexNotFoundError, ie._html_search_meta, 'z', html, None, fatal=True)
         self.assertRaises(RegexNotFoundError, ie._html_search_meta, ('z', 'x'), html, None, fatal=True)
 
-    def test_search_nextjs_data(self):
-        html = '''
-<!DOCTYPE html>
-<html>
-<head>
-  <meta http-equiv="content-type" content=
-  "text/html; charset=utf-8">
-  <meta name="viewport" content="width=device-width">
-  <title>Test _search_nextjs_data()</title>
-</head>
-<body>
-  <div id="__next">
-    <div style="background-color:#17171E" class="FU" dir="ltr">
-      <div class="sc-93de261d-0 dyzzYE">
-        <div>
-          <header class="HD"></header>
-          <main class="MN">
-            <div style="height:0" class="HT0">
-              <div style="width:NaN%" data-testid=
-              "stream-container" class="WDN"></div>
-            </div>
-          </main>
-        </div>
-        <footer class="sc-6e5faf91-0 dEGaHS"></footer>
-      </div>
-    </div>
-  </div>
-  <script id="__NEXT_DATA__" type="application/json">
-  {"props":{"pageProps":{"video":{"id":"testid"}}}}
-  </script>
-</body>
-</html>
-'''
-        search = self.ie._search_nextjs_data(html, 'testID')
-        self.assertEqual(search['props']['pageProps']['video']['id'], 'testid')
-        search = self.ie._search_nextjs_data(
-            'no next.js data here, move along', 'testID', default={'status': 0})
-        self.assertEqual(search['status'], 0)
-
-    def test_search_nuxt_data(self):
-        html = '''
-<!DOCTYPE html>
-<html>
-<head>
-  <meta http-equiv="content-type" content=
-  "text/html; charset=utf-8">
-  <title>Nuxt.js Test Page</title>
-  <meta name="viewport" content=
-  "width=device-width, initial-scale=1">
-  <meta data-hid="robots" name="robots" content="all">
-</head>
-<body class="BD">
-  <div id="__layout">
-    <h1 class="H1">Example heading</h1>
-    <div class="IN">
-      <p>Decoy text</p>
-    </div>
-  </div>
-  <script>
-  window.__NUXT__=(function(a,b,c,d,e,f,g,h){return {decoy:" default",data:[{track:{id:f,title:g}}]}}(null,null,"c",null,null,"testid","Nuxt.js title",null));
-  </script>
-  <script src="/_nuxt/a12345b.js" defer="defer"></script>
-</body>
-</html>
-'''
-        search = self.ie._search_nuxt_data(html, 'testID')
-        self.assertEqual(search['track']['id'], 'testid')
-
     def test_search_json_ld_realworld(self):
         # https://github.com/ytdl-org/youtube-dl/issues/23306
         expect_dict(
@@ -434,24 +346,6 @@ class TestInfoExtractor(unittest.TestCase):
                 }],
             })
 
-        # from https://0000.studio/
-        # with type attribute but without extension in URL
-        expect_dict(
-            self,
-            self.ie._parse_html5_media_entries(
-                'https://0000.studio',
-                r'''
-                <video src="https://d1ggyt9m8pwf3g.cloudfront.net/protected/ap-northeast-1:1864af40-28d5-492b-b739-b32314b1a527/archive/clip/838db6a7-8973-4cd6-840d-8517e4093c92"
-                    controls="controls" type="video/mp4" preload="metadata" autoplay="autoplay" playsinline class="object-contain">
-                </video>
-                ''', None)[0],
-            {
-                'formats': [{
-                    'url': 'https://d1ggyt9m8pwf3g.cloudfront.net/protected/ap-northeast-1:1864af40-28d5-492b-b739-b32314b1a527/archive/clip/838db6a7-8973-4cd6-840d-8517e4093c92',
-                    'ext': 'mp4',
-                }],
-            })
-
     def test_extract_jwplayer_data_realworld(self):
         # from http://www.suffolk.edu/sjc/
         expect_dict(
@@ -905,8 +799,8 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
         ]
 
         for m3u8_file, m3u8_url, expected_formats in _TEST_CASES:
-            with open('./test/testdata/m3u8/%s.m3u8' % m3u8_file,
+            with io.open('./test/testdata/m3u8/%s.m3u8' % m3u8_file,
-                      mode='r', encoding='utf-8') as f:
+                         mode='r', encoding='utf-8') as f:
                 formats = self.ie._parse_m3u8_formats(
                     f.read(), m3u8_url, ext='mp4')
                 self.ie._sort_formats(formats)
@@ -996,8 +890,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'tbr': 5997.485,
                     'width': 1920,
                     'height': 1080,
-                }],
+                }]
-                {},
             ), (
                 # https://github.com/ytdl-org/youtube-dl/pull/14844
                 'urls_only',
@@ -1080,8 +973,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'tbr': 4400,
                     'width': 1920,
                     'height': 1080,
-                }],
+                }]
-                {},
             ), (
                 # https://github.com/ytdl-org/youtube-dl/issues/20346
                 # Media considered unfragmented even though it contains
@@ -1127,185 +1019,18 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'width': 360,
                     'height': 360,
                     'fps': 30,
-                }],
+                }]
-                {},
-            ), (
-                # https://github.com/ytdl-org/youtube-dl/issues/30235
-                # Bento4 generated test mpd
-                # mp4dash --mpd-name=manifest.mpd --no-split --use-segment-list mediafiles
-                'url_and_range',
-                'http://unknown/manifest.mpd',  # mpd_url
-                'http://unknown/',  # mpd_base_url
-                [{
-                    'manifest_url': 'http://unknown/manifest.mpd',
-                    'fragment_base_url': 'http://unknown/',
-                    'ext': 'm4a',
-                    'format_id': 'audio-und-mp4a.40.2',
-                    'format_note': 'DASH audio',
-                    'container': 'm4a_dash',
-                    'protocol': 'http_dash_segments',
-                    'acodec': 'mp4a.40.2',
-                    'vcodec': 'none',
-                    'tbr': 98.808,
-                }, {
-                    'manifest_url': 'http://unknown/manifest.mpd',
-                    'fragment_base_url': 'http://unknown/',
-                    'ext': 'mp4',
-                    'format_id': 'video-avc1',
-                    'format_note': 'DASH video',
-                    'container': 'mp4_dash',
-                    'protocol': 'http_dash_segments',
-                    'acodec': 'none',
-                    'vcodec': 'avc1.4D401E',
-                    'tbr': 699.597,
-                    'width': 768,
-                    'height': 432
-                }],
-                {},
-            ), (
-                # https://github.com/ytdl-org/youtube-dl/issues/27575
-                # GPAC generated test mpd
-                # MP4Box -dash 10000 -single-file -out manifest.mpd mediafiles
-                'range_only',
-                'http://unknown/manifest.mpd',  # mpd_url
-                'http://unknown/',  # mpd_base_url
-                [{
-                    'manifest_url': 'http://unknown/manifest.mpd',
-                    'fragment_base_url': 'http://unknown/audio_dashinit.mp4',
-                    'ext': 'm4a',
-                    'format_id': '2',
-                    'format_note': 'DASH audio',
-                    'container': 'm4a_dash',
-                    'protocol': 'http_dash_segments',
-                    'acodec': 'mp4a.40.2',
-                    'vcodec': 'none',
-                    'tbr': 98.096,
-                }, {
-                    'manifest_url': 'http://unknown/manifest.mpd',
-                    'fragment_base_url': 'http://unknown/video_dashinit.mp4',
-                    'ext': 'mp4',
-                    'format_id': '1',
-                    'format_note': 'DASH video',
-                    'container': 'mp4_dash',
-                    'protocol': 'http_dash_segments',
-                    'acodec': 'none',
-                    'vcodec': 'avc1.4D401E',
-                    'tbr': 526.987,
-                    'width': 768,
-                    'height': 432
-                }],
-                {},
-            ), (
-                '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',
-                }, {
-                    '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',
-                }, {
-                    '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',
-                }, {
-                    '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',
-                }, {
-                    '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',
-                }, {
-                    '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',
-                }],
-                {
-                    '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 open('./test/testdata/mpd/%s.mpd' % mpd_file,
+            with io.open('./test/testdata/mpd/%s.mpd' % mpd_file,
-                      mode='r', encoding='utf-8') as f:
+                         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_f4m_formats(self):
         _TEST_CASES = [
@@ -1326,8 +1051,8 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
         ]
 
         for f4m_file, f4m_url, expected_formats in _TEST_CASES:
-            with open('./test/testdata/f4m/%s.f4m' % f4m_file,
+            with io.open('./test/testdata/f4m/%s.f4m' % f4m_file,
-                      mode='r', encoding='utf-8') as f:
+                         mode='r', encoding='utf-8') as f:
                 formats = self.ie._parse_f4m_formats(
                     compat_etree_fromstring(f.read().encode('utf-8')),
                     f4m_url, None)
@@ -1374,8 +1099,8 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
         ]
 
         for xspf_file, xspf_url, expected_entries in _TEST_CASES:
-            with open('./test/testdata/xspf/%s.xspf' % xspf_file,
+            with io.open('./test/testdata/xspf/%s.xspf' % xspf_file,
-                      mode='r', encoding='utf-8') as f:
+                         mode='r', encoding='utf-8') as f:
                 entries = self.ie._parse_xspf(
                     compat_etree_fromstring(f.read().encode('utf-8')),
                     xspf_file, xspf_url=xspf_url, xspf_base_url=xspf_url)

test/test_YoutubeDL.py

@@ -10,31 +10,14 @@ import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 import copy
-import json
 
-from test.helper import (
+from test.helper import FakeYDL, assertRegexpMatches
-    FakeYDL,
-    assertRegexpMatches,
-    try_rm,
-)
 from youtube_dl import YoutubeDL
-from youtube_dl.compat import (
+from youtube_dl.compat import compat_str, compat_urllib_error
-    compat_http_cookiejar_Cookie,
-    compat_http_cookies_SimpleCookie,
-    compat_kwargs,
-    compat_open as open,
-    compat_str,
-    compat_urllib_error,
-)
-
 from youtube_dl.extractor import YoutubeIE
 from youtube_dl.extractor.common import InfoExtractor
 from youtube_dl.postprocessor.common import PostProcessor
-from youtube_dl.utils import (
+from youtube_dl.utils import ExtractorError, match_filter_func
-    ExtractorError,
-    match_filter_func,
-    traverse_obj,
-)
 
 TEST_URL = 'http://localhost/sample.mp4'
 
@@ -46,14 +29,11 @@ class YDL(FakeYDL):
         self.msgs = []
 
     def process_info(self, info_dict):
-        self.downloaded_info_dicts.append(info_dict.copy())
+        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 = {
@@ -62,9 +42,8 @@ def _make_result(formats, **kwargs):
         'title': 'testttitle',
         'extractor': 'testex',
         'extractor_key': 'TestEx',
-        'webpage_url': 'http://example.com/watch?v=shenanigans',
     }
-    res.update(**compat_kwargs(kwargs))
+    res.update(**kwargs)
     return res
 
 
@@ -702,12 +681,12 @@ class TestYoutubeDL(unittest.TestCase):
 
         class SimplePP(PostProcessor):
             def run(self, info):
-                with open(audiofile, 'w') as f:
+                with open(audiofile, 'wt') as f:
                     f.write('EXAMPLE')
                 return [info['filepath']], info
 
         def run_pp(params, PP):
-            with open(filename, 'w') as f:
+            with open(filename, 'wt') as f:
                 f.write('EXAMPLE')
             ydl = YoutubeDL(params)
             ydl.add_post_processor(PP())
@@ -726,7 +705,7 @@ class TestYoutubeDL(unittest.TestCase):
 
         class ModifierPP(PostProcessor):
             def run(self, info):
-                with open(info['filepath'], 'w') as f:
+                with open(info['filepath'], 'wt') as f:
                     f.write('MODIFIED')
                 return [], info
 
@@ -951,11 +930,17 @@ class TestYoutubeDL(unittest.TestCase):
     # Test case for https://github.com/ytdl-org/youtube-dl/issues/27064
     def test_ignoreerrors_for_playlist_with_url_transparent_iterable_entries(self):
 
-        ydl = YDL({
+        class _YDL(YDL):
+            def __init__(self, *args, **kwargs):
+                super(_YDL, self).__init__(*args, **kwargs)
+
+            def trouble(self, s, tb=None):
+                pass
+
+        ydl = _YDL({
             'format': 'extra',
             'ignoreerrors': True,
         })
-        ydl.trouble = lambda *_, **__: None
 
         class VideoIE(InfoExtractor):
             _VALID_URL = r'video:(?P<id>\d+)'
@@ -1012,180 +997,6 @@ class TestYoutubeDL(unittest.TestCase):
         self.assertEqual(downloaded['extractor'], 'Video')
         self.assertEqual(downloaded['extractor_key'], 'Video')
 
-    def test_default_times(self):
-        """Test addition of missing upload/release/_date from /release_/timestamp"""
-        info = {
-            'id': '1234',
-            'url': TEST_URL,
-            'title': 'Title',
-            'ext': 'mp4',
-            'timestamp': 1631352900,
-            'release_timestamp': 1632995931,
-        }
-
-        params = {'simulate': True, }
-        ydl = FakeYDL(params)
-        out_info = ydl.process_ie_result(info)
-        self.assertTrue(isinstance(out_info['upload_date'], compat_str))
-        self.assertEqual(out_info['upload_date'], '20210911')
-        self.assertTrue(isinstance(out_info['release_date'], compat_str))
-        self.assertEqual(out_info['release_date'], '20210930')
-
-
-class TestYoutubeDLCookies(unittest.TestCase):
-
-    @staticmethod
-    def encode_cookie(cookie):
-        if not isinstance(cookie, dict):
-            cookie = vars(cookie)
-        for name, value in cookie.items():
-            yield name, compat_str(value)
-
-    @classmethod
-    def comparable_cookies(cls, cookies):
-        # Work around cookiejar cookies not being unicode strings
-        return sorted(map(tuple, map(sorted, map(cls.encode_cookie, cookies))))
-
-    def assertSameCookies(self, c1, c2, msg=None):
-        return self.assertEqual(
-            *map(self.comparable_cookies, (c1, c2)),
-            msg=msg)
-
-    def assertSameCookieStrings(self, c1, c2, msg=None):
-        return self.assertSameCookies(
-            *map(lambda c: compat_http_cookies_SimpleCookie(c).values(), (c1, c2)),
-            msg=msg)
-
-    def test_header_cookies(self):
-
-        ydl = FakeYDL()
-        ydl.report_warning = lambda *_, **__: None
-
-        def cookie(name, value, version=None, domain='', path='', secure=False, expires=None):
-            return compat_http_cookiejar_Cookie(
-                version or 0, name, value, None, False,
-                domain, bool(domain), bool(domain), path, bool(path),
-                secure, expires, False, None, None, rest={})
-
-        test_url, test_domain = (t % ('yt.dl',) for t in ('https://%s/test', '.%s'))
-
-        def test(encoded_cookies, cookies, headers=False, round_trip=None, error_re=None):
-            def _test():
-                ydl.cookiejar.clear()
-                ydl._load_cookies(encoded_cookies, autoscope=headers)
-                if headers:
-                    ydl._apply_header_cookies(test_url)
-                data = {'url': test_url}
-                ydl._calc_headers(data)
-                self.assertSameCookies(
-                    cookies, ydl.cookiejar,
-                    'Extracted cookiejar.Cookie is not the same')
-                if not headers:
-                    self.assertSameCookieStrings(
-                        data.get('cookies'), round_trip or encoded_cookies,
-                        msg='Cookie is not the same as round trip')
-                ydl.__dict__['_YoutubeDL__header_cookies'] = []
-
-            try:
-                _test()
-            except AssertionError:
-                raise
-            except Exception as e:
-                if not error_re:
-                    raise
-                assertRegexpMatches(self, e.args[0], error_re.join(('.*',) * 2))
-
-        test('test=value; Domain=' + test_domain, [cookie('test', 'value', domain=test_domain)])
-        test('test=value', [cookie('test', 'value')], error_re='Unscoped cookies are not allowed')
-        test('cookie1=value1; Domain={0}; Path=/test; cookie2=value2; Domain={0}; Path=/'.format(test_domain), [
-            cookie('cookie1', 'value1', domain=test_domain, path='/test'),
-            cookie('cookie2', 'value2', domain=test_domain, path='/')])
-        cookie_kw = compat_kwargs(
-            {'domain': test_domain, 'path': '/test', 'secure': True, 'expires': '9999999999', })
-        test('test=value; Domain={domain}; Path={path}; Secure; Expires={expires}'.format(**cookie_kw), [
-            cookie('test', 'value', **cookie_kw)])
-        test('test="value; "; path=/test; domain=' + test_domain, [
-            cookie('test', 'value; ', domain=test_domain, path='/test')],
-            round_trip='test="value\\073 "; Domain={0}; Path=/test'.format(test_domain))
-        test('name=; Domain=' + test_domain, [cookie('name', '', domain=test_domain)],
-             round_trip='name=""; Domain=' + test_domain)
-        test('test=value', [cookie('test', 'value', domain=test_domain)], headers=True)
-        test('cookie1=value; Domain={0}; cookie2=value'.format(test_domain), [],
-             headers=True, error_re='Invalid syntax')
-        ydl.report_warning = ydl.report_error
-        test('test=value', [], headers=True, error_re='Passing cookies as a header is a potential security risk')
-
-    def test_infojson_cookies(self):
-        TEST_FILE = 'test_infojson_cookies.info.json'
-        TEST_URL = 'https://example.com/example.mp4'
-        COOKIES = 'a=b; Domain=.example.com; c=d; Domain=.example.com'
-        COOKIE_HEADER = {'Cookie': 'a=b; c=d'}
-
-        ydl = FakeYDL()
-        ydl.process_info = lambda x: ydl._write_info_json('test', x, TEST_FILE)
-
-        def make_info(info_header_cookies=False, fmts_header_cookies=False, cookies_field=False):
-            fmt = {'url': TEST_URL}
-            if fmts_header_cookies:
-                fmt['http_headers'] = COOKIE_HEADER
-            if cookies_field:
-                fmt['cookies'] = COOKIES
-            return _make_result([fmt], http_headers=COOKIE_HEADER if info_header_cookies else None)
-
-        def test(initial_info, note):
-
-            def failure_msg(why):
-                return ' when '.join((why, note))
-
-            result = {}
-            result['processed'] = ydl.process_ie_result(initial_info)
-            self.assertTrue(ydl.cookiejar.get_cookies_for_url(TEST_URL),
-                            msg=failure_msg('No cookies set in cookiejar after initial process'))
-            ydl.cookiejar.clear()
-            with open(TEST_FILE) as infojson:
-                result['loaded'] = ydl.sanitize_info(json.load(infojson), True)
-            result['final'] = ydl.process_ie_result(result['loaded'].copy(), download=False)
-            self.assertTrue(ydl.cookiejar.get_cookies_for_url(TEST_URL),
-                            msg=failure_msg('No cookies set in cookiejar after final process'))
-            ydl.cookiejar.clear()
-            for key in ('processed', 'loaded', 'final'):
-                info = result[key]
-                self.assertIsNone(
-                    traverse_obj(info, ((None, ('formats', 0)), 'http_headers', 'Cookie'), casesense=False, get_all=False),
-                    msg=failure_msg('Cookie header not removed in {0} result'.format(key)))
-                self.assertSameCookieStrings(
-                    traverse_obj(info, ((None, ('formats', 0)), 'cookies'), get_all=False), COOKIES,
-                    msg=failure_msg('No cookies field found in {0} result'.format(key)))
-
-        test({'url': TEST_URL, 'http_headers': COOKIE_HEADER, 'id': '1', 'title': 'x'}, 'no formats field')
-        test(make_info(info_header_cookies=True), 'info_dict header cokies')
-        test(make_info(fmts_header_cookies=True), 'format header cookies')
-        test(make_info(info_header_cookies=True, fmts_header_cookies=True), 'info_dict and format header cookies')
-        test(make_info(info_header_cookies=True, fmts_header_cookies=True, cookies_field=True), 'all cookies fields')
-        test(make_info(cookies_field=True), 'cookies format field')
-        test({'url': TEST_URL, 'cookies': COOKIES, 'id': '1', 'title': 'x'}, 'info_dict cookies field only')
-
-        try_rm(TEST_FILE)
-
-    def test_add_headers_cookie(self):
-        def check_for_cookie_header(result):
-            return traverse_obj(result, ((None, ('formats', 0)), 'http_headers', 'Cookie'), casesense=False, get_all=False)
-
-        ydl = FakeYDL({'http_headers': {'Cookie': 'a=b'}})
-        ydl._apply_header_cookies(_make_result([])['webpage_url'])  # Scope to input webpage URL: .example.com
-
-        fmt = {'url': 'https://example.com/video.mp4'}
-        result = ydl.process_ie_result(_make_result([fmt]), download=False)
-        self.assertIsNone(check_for_cookie_header(result), msg='http_headers cookies in result info_dict')
-        self.assertEqual(result.get('cookies'), 'a=b; Domain=.example.com', msg='No cookies were set in cookies field')
-        self.assertIn('a=b', ydl.cookiejar.get_cookie_header(fmt['url']), msg='No cookies were set in cookiejar')
-
-        fmt = {'url': 'https://wrong.com/video.mp4'}
-        result = ydl.process_ie_result(_make_result([fmt]), download=False)
-        self.assertIsNone(check_for_cookie_header(result), msg='http_headers cookies for wrong domain')
-        self.assertFalse(result.get('cookies'), msg='Cookies set in cookies field for wrong domain')
-        self.assertFalse(ydl.cookiejar.get_cookie_header(fmt['url']), msg='Cookies set in cookiejar for wrong domain')
-
 
 if __name__ == '__main__':
     unittest.main()

test/test_YoutubeDLCookieJar.py

@@ -46,20 +46,6 @@ class TestYoutubeDLCookieJar(unittest.TestCase):
         # will be ignored
         self.assertFalse(cookiejar._cookies)
 
-    def test_get_cookie_header(self):
-        cookiejar = YoutubeDLCookieJar('./test/testdata/cookies/httponly_cookies.txt')
-        cookiejar.load(ignore_discard=True, ignore_expires=True)
-        header = cookiejar.get_cookie_header('https://www.foobar.foobar')
-        self.assertIn('HTTPONLY_COOKIE', header)
-
-    def test_get_cookies_for_url(self):
-        cookiejar = YoutubeDLCookieJar('./test/testdata/cookies/session_cookies.txt')
-        cookiejar.load(ignore_discard=True, ignore_expires=True)
-        cookies = cookiejar.get_cookies_for_url('https://www.foobar.foobar/')
-        self.assertEqual(len(cookies), 2)
-        cookies = cookiejar.get_cookies_for_url('https://foobar.foobar/')
-        self.assertFalse(cookies)
-
 
 if __name__ == '__main__':
     unittest.main()

test/test_aes.py

@@ -8,7 +8,7 @@ import sys
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from youtube_dl.aes import aes_decrypt, aes_encrypt, aes_cbc_decrypt, aes_cbc_encrypt, aes_decrypt_text, aes_ecb_encrypt
+from youtube_dl.aes import aes_decrypt, aes_encrypt, aes_cbc_decrypt, aes_cbc_encrypt, aes_decrypt_text
 from youtube_dl.utils import bytes_to_intlist, intlist_to_bytes
 import base64
 
@@ -58,13 +58,6 @@ class TestAES(unittest.TestCase):
         decrypted = (aes_decrypt_text(encrypted, password, 32))
         self.assertEqual(decrypted, self.secret_msg)
 
-    def test_ecb_encrypt(self):
-        data = bytes_to_intlist(self.secret_msg)
-        encrypted = intlist_to_bytes(aes_ecb_encrypt(data, self.key))
-        self.assertEqual(
-            encrypted,
-            b'\xaa\x86]\x81\x97>\x02\x92\x9d\x1bR[[L/u\xd3&\xd1(h\xde{\x81\x94\xba\x02\xae\xbd\xa6\xd0:')
-
 
 if __name__ == '__main__':
     unittest.main()

test/test_age_restriction.py

@@ -11,7 +11,6 @@ from test.helper import try_rm
 
 
 from youtube_dl import YoutubeDL
-from youtube_dl.utils import DownloadError
 
 
 def _download_restricted(url, filename, age):
@@ -27,10 +26,7 @@ def _download_restricted(url, filename, age):
     ydl.add_default_info_extractors()
     json_filename = os.path.splitext(filename)[0] + '.info.json'
     try_rm(json_filename)
-    try:
+    ydl.download([url])
-        ydl.download([url])
-    except DownloadError:
-        try_rm(json_filename)
     res = os.path.exists(json_filename)
     try_rm(json_filename)
     return res
@@ -42,12 +38,12 @@ class TestAgeRestriction(unittest.TestCase):
         self.assertFalse(_download_restricted(url, filename, age))
 
     def test_youtube(self):
-        self._assert_restricted('HtVdAasjOgU', 'HtVdAasjOgU.mp4', 10)
+        self._assert_restricted('07FYdnEawAQ', '07FYdnEawAQ.mp4', 10)
 
     def test_youporn(self):
         self._assert_restricted(
-            'https://www.youporn.com/watch/16715086/sex-ed-in-detention-18-asmr/',
+            'http://www.youporn.com/watch/505835/sex-ed-is-it-safe-to-masturbate-daily/',
-            '16715086.mp4', 2, old_age=25)
+            '505835.mp4', 2, old_age=25)
 
 
 if __name__ == '__main__':

test/test_all_urls.py

@@ -66,9 +66,18 @@ class TestAllURLsMatching(unittest.TestCase):
         self.assertMatch('https://www.youtube.com/feed/watch_later', ['youtube:tab'])
         self.assertMatch('https://www.youtube.com/feed/subscriptions', ['youtube:tab'])
 
-    def test_youtube_search_matching(self):
+    # def test_youtube_search_matching(self):
-        self.assertMatch('http://www.youtube.com/results?search_query=making+mustard', ['youtube:search_url'])
+    #     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'])
+    #     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'))

test/test_cache.py

@@ -3,18 +3,17 @@
 
 from __future__ import unicode_literals
 
+import shutil
+
 # Allow direct execution
 import os
 import sys
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-import shutil
 
 from test.helper import FakeYDL
 from youtube_dl.cache import Cache
-from youtube_dl.utils import version_tuple
-from youtube_dl.version import __version__
 
 
 def _is_empty(d):
@@ -55,17 +54,6 @@ class TestCache(unittest.TestCase):
         self.assertFalse(os.path.exists(self.test_dir))
         self.assertEqual(c.load('test_cache', 'k.'), None)
 
-    def test_cache_validation(self):
-        ydl = FakeYDL({
-            'cachedir': self.test_dir,
-        })
-        c = Cache(ydl)
-        obj = {'x': 1, 'y': ['ä', '\\a', True]}
-        c.store('test_cache', 'k.', obj)
-        self.assertEqual(c.load('test_cache', 'k.', min_ver='1970.01.01'), obj)
-        new_version = '.'.join(('%d' % ((v + 1) if i == 0 else v, )) for i, v in enumerate(version_tuple(__version__)))
-        self.assertIs(c.load('test_cache', 'k.', min_ver=new_version), None)
-
 
 if __name__ == '__main__':
     unittest.main()

test/test_compat.py

@@ -11,7 +11,6 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
 from youtube_dl.compat import (
-    compat_casefold,
     compat_getenv,
     compat_setenv,
     compat_etree_Element,
@@ -23,7 +22,6 @@ from youtube_dl.compat import (
     compat_urllib_parse_unquote,
     compat_urllib_parse_unquote_plus,
     compat_urllib_parse_urlencode,
-    compat_urllib_request,
 )
 
 
@@ -49,11 +47,10 @@ class TestCompat(unittest.TestCase):
 
     def test_all_present(self):
         import youtube_dl.compat
-        all_names = sorted(
+        all_names = youtube_dl.compat.__all__
-            youtube_dl.compat.__all__ + youtube_dl.compat.legacy)
+        present_names = set(filter(
-        present_names = set(map(compat_str, filter(
             lambda c: '_' in c and not c.startswith('_'),
-            dir(youtube_dl.compat)))) - set(['unicode_literals'])
+            dir(youtube_dl.compat))) - set(['unicode_literals'])
         self.assertEqual(all_names, sorted(present_names))
 
     def test_compat_urllib_parse_unquote(self):
@@ -121,34 +118,9 @@ class TestCompat(unittest.TestCase):
 <smil xmlns="http://www.w3.org/2001/SMIL20/Language"></smil>'''
         compat_etree_fromstring(xml)
 
-    def test_compat_struct_unpack(self):
+    def test_struct_unpack(self):
         self.assertEqual(compat_struct_unpack('!B', b'\x00'), (0,))
 
-    def test_compat_casefold(self):
-        if hasattr(compat_str, 'casefold'):
-            # don't bother to test str.casefold() (again)
-            return
-        # thanks https://bugs.python.org/file24232/casefolding.patch
-        self.assertEqual(compat_casefold('hello'), 'hello')
-        self.assertEqual(compat_casefold('hELlo'), 'hello')
-        self.assertEqual(compat_casefold('ß'), 'ss')
-        self.assertEqual(compat_casefold('fi'), 'fi')
-        self.assertEqual(compat_casefold('\u03a3'), '\u03c3')
-        self.assertEqual(compat_casefold('A\u0345\u03a3'), 'a\u03b9\u03c3')
-
-    def test_compat_urllib_request_Request(self):
-        self.assertEqual(
-            compat_urllib_request.Request('http://127.0.0.1', method='PUT').get_method(),
-            'PUT')
-
-        class PUTrequest(compat_urllib_request.Request):
-            def get_method(self):
-                return 'PUT'
-
-        self.assertEqual(
-            PUTrequest('http://127.0.0.1').get_method(),
-            'PUT')
-
 
 if __name__ == '__main__':
     unittest.main()

test/test_download.py

@@ -9,6 +9,7 @@ import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from test.helper import (
+    assertGreaterEqual,
     expect_warnings,
     get_params,
     gettestcases,
@@ -19,35 +20,26 @@ from test.helper import (
 
 
 import hashlib
+import io
 import json
 import socket
 
 import youtube_dl.YoutubeDL
 from youtube_dl.compat import (
     compat_http_client,
-    compat_HTTPError,
-    compat_open as open,
     compat_urllib_error,
+    compat_HTTPError,
 )
 from youtube_dl.utils import (
     DownloadError,
     ExtractorError,
-    error_to_compat_str,
     format_bytes,
-    IDENTITY,
-    preferredencoding,
     UnavailableVideoError,
 )
 from youtube_dl.extractor import get_info_extractor
 
 RETRIES = 3
 
-# Some unittest APIs require actual str
-if not isinstance('TEST', str):
-    _encode_str = lambda s: s.encode(preferredencoding())
-else:
-    _encode_str = IDENTITY
-
 
 class YoutubeDL(youtube_dl.YoutubeDL):
     def __init__(self, *args, **kwargs):
@@ -108,31 +100,27 @@ def generator(test_case, tname):
 
         def print_skipping(reason):
             print('Skipping %s: %s' % (test_case['name'], reason))
-            self.skipTest(_encode_str(reason))
-
         if not ie.working():
             print_skipping('IE marked as not _WORKING')
+            return
 
         for tc in test_cases:
             info_dict = tc.get('info_dict', {})
             if not (info_dict.get('id') and info_dict.get('ext')):
-                raise Exception('Test definition (%s) requires both \'id\' and \'ext\' keys present to define the output file' % (tname, ))
+                raise Exception('Test definition incorrect. The output file cannot be known. Are both \'id\' and \'ext\' keys present?')
 
         if 'skip' in test_case:
             print_skipping(test_case['skip'])
-
+            return
         for other_ie in other_ies:
             if not other_ie.working():
                 print_skipping('test depends on %sIE, marked as not WORKING' % other_ie.ie_key())
+                return
 
         params = get_params(test_case.get('params', {}))
         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['playlist_maxcount'] + 1
-                              if test_case.get('playlist_maxcount')
-                              else test_case.get('playlist_mincount'))
             params.setdefault('skip_download', True)
 
         ydl = YoutubeDL(params, auto_init=False)
@@ -158,7 +146,6 @@ def generator(test_case, tname):
                 try_rm(tc_filename)
                 try_rm(tc_filename + '.part')
                 try_rm(os.path.splitext(tc_filename)[0] + '.info.json')
-
         try_rm_tcs_files()
         try:
             try_num = 1
@@ -173,9 +160,7 @@ def generator(test_case, tname):
                 except (DownloadError, ExtractorError) as err:
                     # Check if the exception is not a network related one
                     if not err.exc_info[0] in (compat_urllib_error.URLError, socket.timeout, UnavailableVideoError, compat_http_client.BadStatusLine) or (err.exc_info[0] == compat_HTTPError and err.exc_info[1].code == 503):
-                        msg = getattr(err, 'msg', error_to_compat_str(err))
+                        raise
-                        err.msg = '%s (%s)' % (msg, tname, )
-                        raise err
 
                     if try_num == RETRIES:
                         report_warning('%s failed due to network errors, skipping...' % tname)
@@ -193,19 +178,13 @@ def generator(test_case, tname):
                 expect_info_dict(self, res_dict, test_case.get('info_dict', {}))
 
             if 'playlist_mincount' in test_case:
-                self.assertGreaterEqual(
+                assertGreaterEqual(
+                    self,
                     len(res_dict['entries']),
                     test_case['playlist_mincount'],
                     'Expected at least %d in playlist %s, but got only %d' % (
                         test_case['playlist_mincount'], test_case['url'],
                         len(res_dict['entries'])))
-            if 'playlist_maxcount' in test_case:
-                self.assertLessEqual(
-                    len(res_dict['entries']),
-                    test_case['playlist_maxcount'],
-                    'Expected at most %d in playlist %s, but got %d' % (
-                        test_case['playlist_maxcount'], test_case['url'],
-                        len(res_dict['entries'])))
             if 'playlist_count' in test_case:
                 self.assertEqual(
                     len(res_dict['entries']),
@@ -230,15 +209,7 @@ def generator(test_case, tname):
                 # First, check test cases' data against extracted data alone
                 expect_info_dict(self, tc_res_dict, tc.get('info_dict', {}))
                 # Now, check downloaded file consistency
-                # support test-case with volatile ID, signalled by regexp value
-                if tc.get('info_dict', {}).get('id', '').startswith('re:'):
-                    test_id = tc['info_dict']['id']
-                    tc['info_dict']['id'] = tc_res_dict['id']
-                else:
-                    test_id = None
                 tc_filename = get_tc_filename(tc)
-                if test_id:
-                    tc['info_dict']['id'] = test_id
                 if not test_case.get('params', {}).get('skip_download', False):
                     self.assertTrue(os.path.exists(tc_filename), msg='Missing file ' + tc_filename)
                     self.assertTrue(tc_filename in finished_hook_called)
@@ -247,8 +218,8 @@ def generator(test_case, tname):
                         if params.get('test'):
                             expected_minsize = max(expected_minsize, 10000)
                         got_fsize = os.path.getsize(tc_filename)
-                        self.assertGreaterEqual(
+                        assertGreaterEqual(
-                            got_fsize, expected_minsize,
+                            self, got_fsize, expected_minsize,
                             'Expected %s to be at least %s, but it\'s only %s ' %
                             (tc_filename, format_bytes(expected_minsize),
                                 format_bytes(got_fsize)))
@@ -261,7 +232,7 @@ def generator(test_case, tname):
                 self.assertTrue(
                     os.path.exists(info_json_fn),
                     'Missing info file %s' % info_json_fn)
-                with open(info_json_fn, encoding='utf-8') as infof:
+                with io.open(info_json_fn, encoding='utf-8') as infof:
                     info_dict = json.load(infof)
                 expect_info_dict(self, info_dict, tc.get('info_dict', {}))
         finally:

test/test_downloader_external.py

@@ -1,272 +0,0 @@
-#!/usr/bin/env python
-# coding: utf-8
-from __future__ import unicode_literals
-
-# Allow direct execution
-import os
-import re
-import sys
-import subprocess
-import unittest
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-from test.helper import (
-    FakeLogger,
-    FakeYDL,
-    http_server_port,
-    try_rm,
-)
-from youtube_dl import YoutubeDL
-from youtube_dl.compat import (
-    compat_contextlib_suppress,
-    compat_http_cookiejar_Cookie,
-    compat_http_server,
-    compat_kwargs,
-)
-from youtube_dl.utils import (
-    encodeFilename,
-    join_nonempty,
-)
-from youtube_dl.downloader.external import (
-    Aria2cFD,
-    Aria2pFD,
-    AxelFD,
-    CurlFD,
-    FFmpegFD,
-    HttpieFD,
-    WgetFD,
-)
-from youtube_dl.postprocessor import (
-    FFmpegPostProcessor,
-)
-import threading
-
-TEST_SIZE = 10 * 1024
-
-TEST_COOKIE = {
-    'version': 0,
-    'name': 'test',
-    'value': 'ytdlp',
-    'port': None,
-    'port_specified': False,
-    'domain': '.example.com',
-    'domain_specified': True,
-    'domain_initial_dot': False,
-    'path': '/',
-    'path_specified': True,
-    'secure': False,
-    'expires': None,
-    'discard': False,
-    'comment': None,
-    'comment_url': None,
-    'rest': {},
-}
-
-TEST_COOKIE_VALUE = join_nonempty('name', 'value', delim='=', from_dict=TEST_COOKIE)
-
-TEST_INFO = {'url': 'http://www.example.com/'}
-
-
-def cookiejar_Cookie(**cookie_args):
-    return compat_http_cookiejar_Cookie(**compat_kwargs(cookie_args))
-
-
-def ifExternalFDAvailable(externalFD):
-    return unittest.skipUnless(externalFD.available(),
-                               externalFD.get_basename() + ' not found')
-
-
-class HTTPTestRequestHandler(compat_http_server.BaseHTTPRequestHandler):
-    def log_message(self, format, *args):
-        pass
-
-    def send_content_range(self, total=None):
-        range_header = self.headers.get('Range')
-        start = end = None
-        if range_header:
-            mobj = re.match(r'bytes=(\d+)-(\d+)', range_header)
-            if mobj:
-                start, end = (int(mobj.group(i)) for i in (1, 2))
-        valid_range = start is not None and end is not None
-        if valid_range:
-            content_range = 'bytes %d-%d' % (start, end)
-            if total:
-                content_range += '/%d' % total
-            self.send_header('Content-Range', content_range)
-        return (end - start + 1) if valid_range else total
-
-    def serve(self, range=True, content_length=True):
-        self.send_response(200)
-        self.send_header('Content-Type', 'video/mp4')
-        size = TEST_SIZE
-        if range:
-            size = self.send_content_range(TEST_SIZE)
-        if content_length:
-            self.send_header('Content-Length', size)
-        self.end_headers()
-        self.wfile.write(b'#' * size)
-
-    def do_GET(self):
-        if self.path == '/regular':
-            self.serve()
-        elif self.path == '/no-content-length':
-            self.serve(content_length=False)
-        elif self.path == '/no-range':
-            self.serve(range=False)
-        elif self.path == '/no-range-no-content-length':
-            self.serve(range=False, content_length=False)
-        else:
-            assert False, 'unrecognised server path'
-
-
-@ifExternalFDAvailable(Aria2pFD)
-class TestAria2pFD(unittest.TestCase):
-    def setUp(self):
-        self.httpd = compat_http_server.HTTPServer(
-            ('127.0.0.1', 0), HTTPTestRequestHandler)
-        self.port = http_server_port(self.httpd)
-        self.server_thread = threading.Thread(target=self.httpd.serve_forever)
-        self.server_thread.daemon = True
-        self.server_thread.start()
-
-    def download(self, params, ep):
-        with subprocess.Popen(
-            ['aria2c', '--enable-rpc'],
-            stdout=subprocess.DEVNULL,
-            stderr=subprocess.DEVNULL
-        ) as process:
-            if not process.poll():
-                filename = 'testfile.mp4'
-                params['logger'] = FakeLogger()
-                params['outtmpl'] = filename
-                ydl = YoutubeDL(params)
-                try_rm(encodeFilename(filename))
-                self.assertEqual(ydl.download(['http://127.0.0.1:%d/%s' % (self.port, ep)]), 0)
-                self.assertEqual(os.path.getsize(encodeFilename(filename)), TEST_SIZE)
-                try_rm(encodeFilename(filename))
-            process.kill()
-
-    def download_all(self, params):
-        for ep in ('regular', 'no-content-length', 'no-range', 'no-range-no-content-length'):
-            self.download(params, ep)
-
-    def test_regular(self):
-        self.download_all({'external_downloader': 'aria2p'})
-
-    def test_chunked(self):
-        self.download_all({
-            'external_downloader': 'aria2p',
-            'http_chunk_size': 1000,
-        })
-
-
-@ifExternalFDAvailable(HttpieFD)
-class TestHttpieFD(unittest.TestCase):
-    def test_make_cmd(self):
-        with FakeYDL() as ydl:
-            downloader = HttpieFD(ydl, {})
-            self.assertEqual(
-                downloader._make_cmd('test', TEST_INFO),
-                ['http', '--download', '--output', 'test', 'http://www.example.com/'])
-
-            # Test cookie header is added
-            ydl.cookiejar.set_cookie(cookiejar_Cookie(**TEST_COOKIE))
-            self.assertEqual(
-                downloader._make_cmd('test', TEST_INFO),
-                ['http', '--download', '--output', 'test',
-                 'http://www.example.com/', 'Cookie:' + TEST_COOKIE_VALUE])
-
-
-@ifExternalFDAvailable(AxelFD)
-class TestAxelFD(unittest.TestCase):
-    def test_make_cmd(self):
-        with FakeYDL() as ydl:
-            downloader = AxelFD(ydl, {})
-            self.assertEqual(
-                downloader._make_cmd('test', TEST_INFO),
-                ['axel', '-o', 'test', '--', 'http://www.example.com/'])
-
-            # Test cookie header is added
-            ydl.cookiejar.set_cookie(cookiejar_Cookie(**TEST_COOKIE))
-            self.assertEqual(
-                downloader._make_cmd('test', TEST_INFO),
-                ['axel', '-o', 'test', '-H', 'Cookie: ' + TEST_COOKIE_VALUE,
-                 '--max-redirect=0', '--', 'http://www.example.com/'])
-
-
-@ifExternalFDAvailable(WgetFD)
-class TestWgetFD(unittest.TestCase):
-    def test_make_cmd(self):
-        with FakeYDL() as ydl:
-            downloader = WgetFD(ydl, {})
-            self.assertNotIn('--load-cookies', downloader._make_cmd('test', TEST_INFO))
-            # Test cookiejar tempfile arg is added
-            ydl.cookiejar.set_cookie(cookiejar_Cookie(**TEST_COOKIE))
-            self.assertIn('--load-cookies', downloader._make_cmd('test', TEST_INFO))
-
-
-@ifExternalFDAvailable(CurlFD)
-class TestCurlFD(unittest.TestCase):
-    def test_make_cmd(self):
-        with FakeYDL() as ydl:
-            downloader = CurlFD(ydl, {})
-            self.assertNotIn('--cookie', downloader._make_cmd('test', TEST_INFO))
-            # Test cookie header is added
-            ydl.cookiejar.set_cookie(cookiejar_Cookie(**TEST_COOKIE))
-            self.assertIn('--cookie', downloader._make_cmd('test', TEST_INFO))
-            self.assertIn(TEST_COOKIE_VALUE, downloader._make_cmd('test', TEST_INFO))
-
-
-@ifExternalFDAvailable(Aria2cFD)
-class TestAria2cFD(unittest.TestCase):
-    def test_make_cmd(self):
-        with FakeYDL() as ydl:
-            downloader = Aria2cFD(ydl, {})
-            downloader._make_cmd('test', TEST_INFO)
-            self.assertFalse(hasattr(downloader, '_cookies_tempfile'))
-
-            # Test cookiejar tempfile arg is added
-            ydl.cookiejar.set_cookie(cookiejar_Cookie(**TEST_COOKIE))
-            cmd = downloader._make_cmd('test', TEST_INFO)
-            self.assertIn('--load-cookies=%s' % downloader._cookies_tempfile, cmd)
-
-
-# Handle delegated availability
-def ifFFmpegFDAvailable(externalFD):
-    # raise SkipTest, or set False!
-    avail = ifExternalFDAvailable(externalFD) and False
-    with compat_contextlib_suppress(Exception):
-        avail = FFmpegPostProcessor(downloader=None).available
-    return unittest.skipUnless(
-        avail, externalFD.get_basename() + ' not found')
-
-
-@ifFFmpegFDAvailable(FFmpegFD)
-class TestFFmpegFD(unittest.TestCase):
-    _args = []
-
-    def _test_cmd(self, args):
-        self._args = args
-
-    def test_make_cmd(self):
-        with FakeYDL() as ydl:
-            downloader = FFmpegFD(ydl, {})
-            downloader._debug_cmd = self._test_cmd
-            info_dict = TEST_INFO.copy()
-            info_dict['ext'] = 'mp4'
-
-            downloader._call_downloader('test', info_dict)
-            self.assertEqual(self._args, [
-                'ffmpeg', '-y', '-i', 'http://www.example.com/',
-                '-c', 'copy', '-f', 'mp4', 'file:test'])
-
-            # Test cookies arg is added
-            ydl.cookiejar.set_cookie(cookiejar_Cookie(**TEST_COOKIE))
-            downloader._call_downloader('test', info_dict)
-            self.assertEqual(self._args, [
-                'ffmpeg', '-y', '-cookies', TEST_COOKIE_VALUE + '; path=/; domain=.example.com;\r\n',
-                '-i', 'http://www.example.com/', '-c', 'copy', '-f', 'mp4', 'file:test'])
-
-
-if __name__ == '__main__':
-    unittest.main()

test/test_downloader_http.py

@@ -9,11 +9,7 @@ import sys
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from test.helper import (
+from test.helper import http_server_port, try_rm
-    FakeLogger,
-    http_server_port,
-    try_rm,
-)
 from youtube_dl import YoutubeDL
 from youtube_dl.compat import compat_http_server
 from youtube_dl.downloader.http import HttpFD
@@ -70,6 +66,17 @@ class HTTPTestRequestHandler(compat_http_server.BaseHTTPRequestHandler):
             assert False
 
 
+class FakeLogger(object):
+    def debug(self, msg):
+        pass
+
+    def warning(self, msg):
+        pass
+
+    def error(self, msg):
+        pass
+
+
 class TestHttpFD(unittest.TestCase):
     def setUp(self):
         self.httpd = compat_http_server.HTTPServer(
@@ -88,7 +95,7 @@ class TestHttpFD(unittest.TestCase):
         self.assertTrue(downloader.real_download(filename, {
             'url': 'http://127.0.0.1:%d/%s' % (self.port, ep),
         }))
-        self.assertEqual(os.path.getsize(encodeFilename(filename)), TEST_SIZE, ep)
+        self.assertEqual(os.path.getsize(encodeFilename(filename)), TEST_SIZE)
         try_rm(encodeFilename(filename))
 
     def download_all(self, params):

test/test_execution.py

@@ -8,55 +8,37 @@ import unittest
 import sys
 import os
 import subprocess
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+from youtube_dl.utils import encodeArgument
 
 rootDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
-sys.path.insert(0, rootDir)
 
-from youtube_dl.compat import compat_register_utf8, compat_subprocess_get_DEVNULL
+try:
-from youtube_dl.utils import encodeArgument
+    _DEV_NULL = subprocess.DEVNULL
-
+except AttributeError:
-compat_register_utf8()
+    _DEV_NULL = open(os.devnull, 'wb')
-
-
-_DEV_NULL = compat_subprocess_get_DEVNULL()
 
 
 class TestExecution(unittest.TestCase):
-    def setUp(self):
-        self.module = 'youtube_dl'
-        if sys.version_info < (2, 7):
-            self.module += '.__main__'
-
     def test_import(self):
         subprocess.check_call([sys.executable, '-c', 'import youtube_dl'], cwd=rootDir)
 
     def test_module_exec(self):
-        subprocess.check_call([sys.executable, '-m', self.module, '--version'], cwd=rootDir, stdout=_DEV_NULL)
+        if sys.version_info >= (2, 7):  # Python 2.6 doesn't support package execution
+            subprocess.check_call([sys.executable, '-m', 'youtube_dl', '--version'], cwd=rootDir, stdout=_DEV_NULL)
 
     def test_main_exec(self):
-        subprocess.check_call([sys.executable, os.path.normpath('youtube_dl/__main__.py'), '--version'], cwd=rootDir, stdout=_DEV_NULL)
+        subprocess.check_call([sys.executable, 'youtube_dl/__main__.py', '--version'], cwd=rootDir, stdout=_DEV_NULL)
 
     def test_cmdline_umlauts(self):
-        os.environ['PYTHONIOENCODING'] = 'utf-8'
         p = subprocess.Popen(
-            [sys.executable, '-m', self.module, encodeArgument('ä'), '--version'],
+            [sys.executable, 'youtube_dl/__main__.py', encodeArgument('ä'), '--version'],
             cwd=rootDir, stdout=_DEV_NULL, stderr=subprocess.PIPE)
         _, stderr = p.communicate()
         self.assertFalse(stderr)
 
-    def test_lazy_extractors(self):
-        lazy_extractors = os.path.normpath('youtube_dl/extractor/lazy_extractors.py')
-        try:
-            subprocess.check_call([sys.executable, os.path.normpath('devscripts/make_lazy_extractors.py'), lazy_extractors], cwd=rootDir, stdout=_DEV_NULL)
-            subprocess.check_call([sys.executable, os.path.normpath('test/test_all_urls.py')], cwd=rootDir, stdout=_DEV_NULL)
-        finally:
-            for x in ('', 'c') if sys.version_info[0] < 3 else ('',):
-                try:
-                    os.remove(lazy_extractors + x)
-                except OSError:
-                    pass
-
 
 if __name__ == '__main__':
     unittest.main()

test/test_http.py

@@ -8,163 +8,30 @@ import sys
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-import contextlib
+from test.helper import http_server_port
-import gzip
-import io
-import ssl
-import tempfile
-import threading
-import zlib
-
-# avoid deprecated alias assertRaisesRegexp
-if hasattr(unittest.TestCase, 'assertRaisesRegex'):
-    unittest.TestCase.assertRaisesRegexp = unittest.TestCase.assertRaisesRegex
-
-try:
-    import brotli
-except ImportError:
-    brotli = None
-try:
-    from urllib.request import pathname2url
-except ImportError:
-    from urllib import pathname2url
-
-from youtube_dl.compat import (
-    compat_http_cookiejar_Cookie,
-    compat_http_server,
-    compat_str as str,
-    compat_urllib_error,
-    compat_urllib_HTTPError,
-    compat_urllib_parse,
-    compat_urllib_request,
-)
-
-from youtube_dl.utils import (
-    sanitized_Request,
-    update_Request,
-    urlencode_postdata,
-)
-
-from test.helper import (
-    expectedFailureIf,
-    FakeYDL,
-    FakeLogger,
-    http_server_port,
-)
 from youtube_dl import YoutubeDL
+from youtube_dl.compat import compat_http_server, compat_urllib_request
+import ssl
+import threading
 
 TEST_DIR = os.path.dirname(os.path.abspath(__file__))
 
 
 class HTTPTestRequestHandler(compat_http_server.BaseHTTPRequestHandler):
-    protocol_version = 'HTTP/1.1'
-
-    # work-around old/new -style class inheritance
-    def super(self, meth_name, *args, **kwargs):
-        from types import MethodType
-        try:
-            super()
-            fn = lambda s, m, *a, **k: getattr(super(), m)(*a, **k)
-        except TypeError:
-            fn = lambda s, m, *a, **k: getattr(compat_http_server.BaseHTTPRequestHandler, m)(s, *a, **k)
-        self.super = MethodType(fn, self)
-        return self.super(meth_name, *args, **kwargs)
-
     def log_message(self, format, *args):
         pass
 
-    def _headers(self):
-        payload = str(self.headers).encode('utf-8')
-        self.send_response(200)
-        self.send_header('Content-Type', 'application/json')
-        self.send_header('Content-Length', str(len(payload)))
-        self.end_headers()
-        self.wfile.write(payload)
-
-    def _redirect(self):
-        self.send_response(int(self.path[len('/redirect_'):]))
-        self.send_header('Location', '/method')
-        self.send_header('Content-Length', '0')
-        self.end_headers()
-
-    def _method(self, method, payload=None):
-        self.send_response(200)
-        self.send_header('Content-Length', str(len(payload or '')))
-        self.send_header('Method', method)
-        self.end_headers()
-        if payload:
-            self.wfile.write(payload)
-
-    def _status(self, status):
-        payload = '<html>{0} NOT FOUND</html>'.format(status).encode('utf-8')
-        self.send_response(int(status))
-        self.send_header('Content-Type', 'text/html; charset=utf-8')
-        self.send_header('Content-Length', str(len(payload)))
-        self.end_headers()
-        self.wfile.write(payload)
-
-    def _read_data(self):
-        if 'Content-Length' in self.headers:
-            return self.rfile.read(int(self.headers['Content-Length']))
-
-    def _test_url(self, path, host='127.0.0.1', scheme='http', port=None):
-        return '{0}://{1}:{2}/{3}'.format(
-            scheme, host,
-            port if port is not None
-            else http_server_port(self.server), path)
-
-    def do_POST(self):
-        data = self._read_data()
-        if self.path.startswith('/redirect_'):
-            self._redirect()
-        elif self.path.startswith('/method'):
-            self._method('POST', data)
-        elif self.path.startswith('/headers'):
-            self._headers()
-        else:
-            self._status(404)
-
-    def do_HEAD(self):
-        if self.path.startswith('/redirect_'):
-            self._redirect()
-        elif self.path.startswith('/method'):
-            self._method('HEAD')
-        else:
-            self._status(404)
-
-    def do_PUT(self):
-        data = self._read_data()
-        if self.path.startswith('/redirect_'):
-            self._redirect()
-        elif self.path.startswith('/method'):
-            self._method('PUT', data)
-        else:
-            self._status(404)
-
     def do_GET(self):
-
-        def respond(payload=b'<html><video src="/vid.mp4" /></html>',
-                    payload_type='text/html; charset=utf-8',
-                    payload_encoding=None,
-                    resp_code=200):
-            self.send_response(resp_code)
-            self.send_header('Content-Type', payload_type)
-            if payload_encoding:
-                self.send_header('Content-Encoding', payload_encoding)
-            self.send_header('Content-Length', str(len(payload)))  # required for persistent connections
-            self.end_headers()
-            self.wfile.write(payload)
-
-        def gzip_compress(p):
-            buf = io.BytesIO()
-            with contextlib.closing(gzip.GzipFile(fileobj=buf, mode='wb')) as f:
-                f.write(p)
-            return buf.getvalue()
-
         if self.path == '/video.html':
-            respond()
+            self.send_response(200)
+            self.send_header('Content-Type', 'text/html; charset=utf-8')
+            self.end_headers()
+            self.wfile.write(b'<html><video src="/vid.mp4" /></html>')
         elif self.path == '/vid.mp4':
-            respond(b'\x00\x00\x00\x00\x20\x66\x74[video]', 'video/mp4')
+            self.send_response(200)
+            self.send_header('Content-Type', 'video/mp4')
+            self.end_headers()
+            self.wfile.write(b'\x00\x00\x00\x00\x20\x66\x74[video]')
         elif self.path == '/302':
             if sys.version_info[0] == 3:
                 # XXX: Python 3 http server does not allow non-ASCII header values
@@ -172,336 +39,71 @@ class HTTPTestRequestHandler(compat_http_server.BaseHTTPRequestHandler):
                 self.end_headers()
                 return
 
-            new_url = self._test_url('中文.html')
+            new_url = 'http://127.0.0.1:%d/中文.html' % http_server_port(self.server)
             self.send_response(302)
             self.send_header(b'Location', new_url.encode('utf-8'))
             self.end_headers()
         elif self.path == '/%E4%B8%AD%E6%96%87.html':
-            respond()
+            self.send_response(200)
-        elif self.path == '/%c7%9f':
+            self.send_header('Content-Type', 'text/html; charset=utf-8')
-            respond()
-        elif self.path == '/redirect_dotsegments':
-            self.send_response(301)
-            # redirect to /headers but with dot segments before
-            self.send_header('Location', '/a/b/./../../headers')
-            self.send_header('Content-Length', '0')
             self.end_headers()
-        elif self.path.startswith('/redirect_'):
+            self.wfile.write(b'<html><video src="/vid.mp4" /></html>')
-            self._redirect()
-        elif self.path.startswith('/method'):
-            self._method('GET')
-        elif self.path.startswith('/headers'):
-            self._headers()
-        elif self.path.startswith('/308-to-headers'):
-            self.send_response(308)
-            self.send_header('Location', '/headers')
-            self.send_header('Content-Length', '0')
-            self.end_headers()
-        elif self.path == '/trailing_garbage':
-            payload = b'<html><video src="/vid.mp4" /></html>'
-            compressed = gzip_compress(payload) + b'trailing garbage'
-            respond(compressed, payload_encoding='gzip')
-        elif self.path == '/302-non-ascii-redirect':
-            new_url = self._test_url('中文.html')
-            # actually respond with permanent redirect
-            self.send_response(301)
-            self.send_header('Location', new_url)
-            self.send_header('Content-Length', '0')
-            self.end_headers()
-        elif self.path == '/content-encoding':
-            encodings = self.headers.get('ytdl-encoding', '')
-            payload = b'<html><video src="/vid.mp4" /></html>'
-            for encoding in filter(None, (e.strip() for e in encodings.split(','))):
-                if encoding == 'br' and brotli:
-                    payload = brotli.compress(payload)
-                elif encoding == 'gzip':
-                    payload = gzip_compress(payload)
-                elif encoding == 'deflate':
-                    payload = zlib.compress(payload)
-                elif encoding == 'unsupported':
-                    payload = b'raw'
-                    break
-                else:
-                    self._status(415)
-                    return
-            respond(payload, payload_encoding=encodings)
-
         else:
-            self._status(404)
+            assert False
 
-    def send_header(self, keyword, value):
-        """
-        Forcibly allow HTTP server to send non percent-encoded non-ASCII characters in headers.
-        This is against what is defined in RFC 3986: but we need to test that we support this
-        since some sites incorrectly do this.
-        """
-        if keyword.lower() == 'connection':
-            return self.super('send_header', keyword, value)
 
-        if not hasattr(self, '_headers_buffer'):
+class FakeLogger(object):
-            self._headers_buffer = []
+    def debug(self, msg):
+        pass
 
-        self._headers_buffer.append('{0}: {1}\r\n'.format(keyword, value).encode('utf-8'))
+    def warning(self, msg):
+        pass
 
-    def end_headers(self):
+    def error(self, msg):
-        if hasattr(self, '_headers_buffer'):
+        pass
-            self.wfile.write(b''.join(self._headers_buffer))
-            self._headers_buffer = []
-        self.super('end_headers')
 
 
 class TestHTTP(unittest.TestCase):
-    # when does it make sense to check the SSL certificate?
-    _check_cert = (
-        sys.version_info >= (3, 2)
-        or (sys.version_info[0] == 2 and sys.version_info[1:] >= (7, 19)))
-
     def setUp(self):
-        # HTTP server
+        self.httpd = compat_http_server.HTTPServer(
-        self.http_httpd = compat_http_server.HTTPServer(
             ('127.0.0.1', 0), HTTPTestRequestHandler)
-        self.http_port = http_server_port(self.http_httpd)
+        self.port = http_server_port(self.httpd)
-
+        self.server_thread = threading.Thread(target=self.httpd.serve_forever)
-        self.http_server_thread = threading.Thread(target=self.http_httpd.serve_forever)
+        self.server_thread.daemon = True
-        self.http_server_thread.daemon = True
+        self.server_thread.start()
-        self.http_server_thread.start()
-
-        try:
-            from http.server import ThreadingHTTPServer
-        except ImportError:
-            try:
-                from socketserver import ThreadingMixIn
-            except ImportError:
-                from SocketServer import ThreadingMixIn
-
-            class ThreadingHTTPServer(ThreadingMixIn, compat_http_server.HTTPServer):
-                pass
-
-        # HTTPS server
-        certfn = os.path.join(TEST_DIR, 'testcert.pem')
-        self.https_httpd = ThreadingHTTPServer(
-            ('127.0.0.1', 0), HTTPTestRequestHandler)
-        try:
-            sslctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
-            sslctx.verify_mode = ssl.CERT_NONE
-            sslctx.check_hostname = False
-            sslctx.load_cert_chain(certfn, None)
-            self.https_httpd.socket = sslctx.wrap_socket(
-                self.https_httpd.socket, server_side=True)
-        except AttributeError:
-            self.https_httpd.socket = ssl.wrap_socket(
-                self.https_httpd.socket, certfile=certfn, server_side=True)
-
-        self.https_port = http_server_port(self.https_httpd)
-        self.https_server_thread = threading.Thread(target=self.https_httpd.serve_forever)
-        self.https_server_thread.daemon = True
-        self.https_server_thread.start()
-
-    def tearDown(self):
-
-        def closer(svr):
-            def _closer():
-                svr.shutdown()
-                svr.server_close()
-            return _closer
-
-        shutdown_thread = threading.Thread(target=closer(self.http_httpd))
-        shutdown_thread.start()
-        self.http_server_thread.join(2.0)
-
-        shutdown_thread = threading.Thread(target=closer(self.https_httpd))
-        shutdown_thread.start()
-        self.https_server_thread.join(2.0)
-
-    def _test_url(self, path, host='127.0.0.1', scheme='http', port=None):
-        return '{0}://{1}:{2}/{3}'.format(
-            scheme, host,
-            port if port is not None
-            else self.https_port if scheme == 'https'
-            else self.http_port, path)
-
-    @unittest.skipUnless(_check_cert, 'No support for certificate check in SSL')
-    def test_nocheckcertificate(self):
-        with FakeYDL({'logger': FakeLogger()}) as ydl:
-            with self.assertRaises(compat_urllib_error.URLError):
-                ydl.urlopen(sanitized_Request(self._test_url('headers', scheme='https')))
-
-        with FakeYDL({'logger': FakeLogger(), 'nocheckcertificate': True}) as ydl:
-            r = ydl.urlopen(sanitized_Request(self._test_url('headers', scheme='https')))
-            self.assertEqual(r.getcode(), 200)
-            r.close()
-
-    def test_percent_encode(self):
-        with FakeYDL() as ydl:
-            # Unicode characters should be encoded with uppercase percent-encoding
-            res = ydl.urlopen(sanitized_Request(self._test_url('中文.html')))
-            self.assertEqual(res.getcode(), 200)
-            res.close()
-            # don't normalize existing percent encodings
-            res = ydl.urlopen(sanitized_Request(self._test_url('%c7%9f')))
-            self.assertEqual(res.getcode(), 200)
-            res.close()
 
     def test_unicode_path_redirection(self):
-        with FakeYDL() as ydl:
+        # XXX: Python 3 http server does not allow non-ASCII header values
-            r = ydl.urlopen(sanitized_Request(self._test_url('302-non-ascii-redirect')))
+        if sys.version_info[0] == 3:
-            self.assertEqual(r.url, self._test_url('%E4%B8%AD%E6%96%87.html'))
+            return
-            r.close()
 
-    def test_redirect(self):
+        ydl = YoutubeDL({'logger': FakeLogger()})
-        with FakeYDL() as ydl:
+        r = ydl.extract_info('http://127.0.0.1:%d/302' % self.port)
-            def do_req(redirect_status, method, check_no_content=False):
+        self.assertEqual(r['entries'][0]['url'], 'http://127.0.0.1:%d/vid.mp4' % self.port)
-                data = b'testdata' if method in ('POST', 'PUT') else None
-                res = ydl.urlopen(sanitized_Request(
-                    self._test_url('redirect_{0}'.format(redirect_status)),
-                    method=method, data=data))
-                if check_no_content:
-                    self.assertNotIn('Content-Type', res.headers)
-                return res.read().decode('utf-8'), res.headers.get('method', '')
-            # A 303 must either use GET or HEAD for subsequent request
-            self.assertEqual(do_req(303, 'POST'), ('', 'GET'))
-            self.assertEqual(do_req(303, 'HEAD'), ('', 'HEAD'))
 
-            self.assertEqual(do_req(303, 'PUT'), ('', 'GET'))
 
-            # 301 and 302 turn POST only into a GET, with no Content-Type
+class TestHTTPS(unittest.TestCase):
-            self.assertEqual(do_req(301, 'POST', True), ('', 'GET'))
+    def setUp(self):
-            self.assertEqual(do_req(301, 'HEAD'), ('', 'HEAD'))
+        certfn = os.path.join(TEST_DIR, 'testcert.pem')
-            self.assertEqual(do_req(302, 'POST', True), ('', 'GET'))
+        self.httpd = compat_http_server.HTTPServer(
-            self.assertEqual(do_req(302, 'HEAD'), ('', 'HEAD'))
+            ('127.0.0.1', 0), HTTPTestRequestHandler)
+        self.httpd.socket = ssl.wrap_socket(
+            self.httpd.socket, certfile=certfn, server_side=True)
+        self.port = http_server_port(self.httpd)
+        self.server_thread = threading.Thread(target=self.httpd.serve_forever)
+        self.server_thread.daemon = True
+        self.server_thread.start()
 
-            self.assertEqual(do_req(301, 'PUT'), ('testdata', 'PUT'))
+    def test_nocheckcertificate(self):
-            self.assertEqual(do_req(302, 'PUT'), ('testdata', 'PUT'))
+        if sys.version_info >= (2, 7, 9):  # No certificate checking anyways
+            ydl = YoutubeDL({'logger': FakeLogger()})
+            self.assertRaises(
+                Exception,
+                ydl.extract_info, 'https://127.0.0.1:%d/video.html' % self.port)
 
-            # 307 and 308 should not change method
+        ydl = YoutubeDL({'logger': FakeLogger(), 'nocheckcertificate': True})
-            for m in ('POST', 'PUT'):
+        r = ydl.extract_info('https://127.0.0.1:%d/video.html' % self.port)
-                self.assertEqual(do_req(307, m), ('testdata', m))
+        self.assertEqual(r['entries'][0]['url'], 'https://127.0.0.1:%d/vid.mp4' % self.port)
-                self.assertEqual(do_req(308, m), ('testdata', m))
-
-            self.assertEqual(do_req(307, 'HEAD'), ('', 'HEAD'))
-            self.assertEqual(do_req(308, 'HEAD'), ('', 'HEAD'))
-
-            # These should not redirect and instead raise an HTTPError
-            for code in (300, 304, 305, 306):
-                with self.assertRaises(compat_urllib_HTTPError):
-                    do_req(code, 'GET')
-
-    # Jython 2.7.1 times out for some reason
-    @expectedFailureIf(sys.platform.startswith('java') and sys.version_info < (2, 7, 2))
-    def test_content_type(self):
-        # https://github.com/yt-dlp/yt-dlp/commit/379a4f161d4ad3e40932dcf5aca6e6fb9715ab28
-        with FakeYDL({'nocheckcertificate': True}) as ydl:
-            # method should be auto-detected as POST
-            r = sanitized_Request(self._test_url('headers', scheme='https'), data=urlencode_postdata({'test': 'test'}))
-
-            headers = ydl.urlopen(r).read().decode('utf-8')
-            self.assertIn('Content-Type: application/x-www-form-urlencoded', headers)
-
-            # test http
-            r = sanitized_Request(self._test_url('headers'), data=urlencode_postdata({'test': 'test'}))
-            headers = ydl.urlopen(r).read().decode('utf-8')
-            self.assertIn('Content-Type: application/x-www-form-urlencoded', headers)
-
-    def test_update_req(self):
-        req = sanitized_Request('http://example.com')
-        assert req.data is None
-        assert req.get_method() == 'GET'
-        assert not req.has_header('Content-Type')
-        # Test that zero-byte payloads will be sent
-        req = update_Request(req, data=b'')
-        assert req.data == b''
-        assert req.get_method() == 'POST'
-        # yt-dl expects data to be encoded and Content-Type to be added by sender
-        # assert req.get_header('Content-Type') == 'application/x-www-form-urlencoded'
-
-    def test_cookiejar(self):
-        with FakeYDL() as ydl:
-            ydl.cookiejar.set_cookie(compat_http_cookiejar_Cookie(
-                0, 'test', 'ytdl', None, False, '127.0.0.1', True,
-                False, '/headers', True, False, None, False, None, None, {}))
-            data = ydl.urlopen(sanitized_Request(
-                self._test_url('headers'))).read().decode('utf-8')
-            self.assertIn('Cookie: test=ytdl', data)
-
-    def test_passed_cookie_header(self):
-        # We should accept a Cookie header being passed as in normal headers and handle it appropriately.
-        with FakeYDL() as ydl:
-            # Specified Cookie header should be used
-            res = ydl.urlopen(sanitized_Request(
-                self._test_url('headers'), headers={'Cookie': 'test=test'})).read().decode('utf-8')
-            self.assertIn('Cookie: test=test', res)
-
-            # Specified Cookie header should be removed on any redirect
-            res = ydl.urlopen(sanitized_Request(
-                self._test_url('308-to-headers'), headers={'Cookie': 'test=test'})).read().decode('utf-8')
-            self.assertNotIn('Cookie: test=test', res)
-
-            # Specified Cookie header should override global cookiejar for that request
-            ydl.cookiejar.set_cookie(compat_http_cookiejar_Cookie(
-                0, 'test', 'ytdlp', None, False, '127.0.0.1', True,
-                False, '/headers', True, False, None, False, None, None, {}))
-            data = ydl.urlopen(sanitized_Request(
-                self._test_url('headers'), headers={'Cookie': 'test=test'})).read().decode('utf-8')
-            self.assertNotIn('Cookie: test=ytdlp', data)
-            self.assertIn('Cookie: test=test', data)
-
-    def test_no_compression_compat_header(self):
-        with FakeYDL() as ydl:
-            data = ydl.urlopen(
-                sanitized_Request(
-                    self._test_url('headers'),
-                    headers={'Youtubedl-no-compression': True})).read()
-            self.assertIn(b'Accept-Encoding: identity', data)
-            self.assertNotIn(b'youtubedl-no-compression', data.lower())
-
-    def test_gzip_trailing_garbage(self):
-        # https://github.com/ytdl-org/youtube-dl/commit/aa3e950764337ef9800c936f4de89b31c00dfcf5
-        # https://github.com/ytdl-org/youtube-dl/commit/6f2ec15cee79d35dba065677cad9da7491ec6e6f
-        with FakeYDL() as ydl:
-            data = ydl.urlopen(sanitized_Request(self._test_url('trailing_garbage'))).read().decode('utf-8')
-            self.assertEqual(data, '<html><video src="/vid.mp4" /></html>')
-
-    def __test_compression(self, encoding):
-        with FakeYDL() as ydl:
-            res = ydl.urlopen(
-                sanitized_Request(
-                    self._test_url('content-encoding'),
-                    headers={'ytdl-encoding': encoding}))
-            # decoded encodings are removed: only check for valid decompressed data
-            self.assertEqual(res.read(), b'<html><video src="/vid.mp4" /></html>')
-
-    @unittest.skipUnless(brotli, 'brotli support is not installed')
-    def test_brotli(self):
-        self.__test_compression('br')
-
-    def test_deflate(self):
-        self.__test_compression('deflate')
-
-    def test_gzip(self):
-        self.__test_compression('gzip')
-
-    def test_multiple_encodings(self):
-        # https://www.rfc-editor.org/rfc/rfc9110.html#section-8.4
-        for pair in ('gzip,deflate', 'deflate, gzip', 'gzip, gzip', 'deflate, deflate'):
-            self.__test_compression(pair)
-
-    def test_unsupported_encoding(self):
-        # it should return the raw content
-        with FakeYDL() as ydl:
-            res = ydl.urlopen(
-                sanitized_Request(
-                    self._test_url('content-encoding'),
-                    headers={'ytdl-encoding': 'unsupported'}))
-            self.assertEqual(res.headers.get('Content-Encoding'), 'unsupported')
-            self.assertEqual(res.read(), b'raw')
-
-    def test_remove_dot_segments(self):
-        with FakeYDL() as ydl:
-            res = ydl.urlopen(sanitized_Request(self._test_url('a/b/./../../headers')))
-            self.assertEqual(compat_urllib_parse.urlparse(res.geturl()).path, '/headers')
-
-            res = ydl.urlopen(sanitized_Request(self._test_url('redirect_dotsegments')))
-            self.assertEqual(compat_urllib_parse.urlparse(res.geturl()).path, '/headers')
 
 
 def _build_proxy_handler(name):
@@ -515,7 +117,7 @@ def _build_proxy_handler(name):
             self.send_response(200)
             self.send_header('Content-Type', 'text/plain; charset=utf-8')
             self.end_headers()
-            self.wfile.write('{0}: {1}'.format(self.proxy_name, self.path).encode('utf-8'))
+            self.wfile.write('{self.proxy_name}: {self.path}'.format(self=self).encode('utf-8'))
     return HTTPTestRequestHandler
 
 
@@ -535,30 +137,10 @@ class TestProxy(unittest.TestCase):
         self.geo_proxy_thread.daemon = True
         self.geo_proxy_thread.start()
 
-    def tearDown(self):
-
-        def closer(svr):
-            def _closer():
-                svr.shutdown()
-                svr.server_close()
-            return _closer
-
-        shutdown_thread = threading.Thread(target=closer(self.proxy))
-        shutdown_thread.start()
-        self.proxy_thread.join(2.0)
-
-        shutdown_thread = threading.Thread(target=closer(self.geo_proxy))
-        shutdown_thread.start()
-        self.geo_proxy_thread.join(2.0)
-
-    def _test_proxy(self, host='127.0.0.1', port=None):
-        return '{0}:{1}'.format(
-            host, port if port is not None else self.port)
-
     def test_proxy(self):
-        geo_proxy = self._test_proxy(port=self.geo_port)
+        geo_proxy = '127.0.0.1:{0}'.format(self.geo_port)
         ydl = YoutubeDL({
-            'proxy': self._test_proxy(),
+            'proxy': '127.0.0.1:{0}'.format(self.port),
             'geo_verification_proxy': geo_proxy,
         })
         url = 'http://foo.com/bar'
@@ -572,7 +154,7 @@ class TestProxy(unittest.TestCase):
 
     def test_proxy_with_idn(self):
         ydl = YoutubeDL({
-            'proxy': self._test_proxy(),
+            'proxy': '127.0.0.1:{0}'.format(self.port),
         })
         url = 'http://中文.tw/'
         response = ydl.urlopen(url).read().decode('utf-8')
@@ -580,25 +162,5 @@ class TestProxy(unittest.TestCase):
         self.assertEqual(response, 'normal: http://xn--fiq228c.tw/')
 
 
-class TestFileURL(unittest.TestCase):
-    # See https://github.com/ytdl-org/youtube-dl/issues/8227
-    def test_file_urls(self):
-        tf = tempfile.NamedTemporaryFile(delete=False)
-        tf.write(b'foobar')
-        tf.close()
-        url = compat_urllib_parse.urljoin('file://', pathname2url(tf.name))
-        with FakeYDL() as ydl:
-            self.assertRaisesRegexp(
-                compat_urllib_error.URLError, 'file:// scheme is explicitly disabled in youtube-dl for security reasons', ydl.urlopen, url)
-        # not yet implemented
-        """
-        with FakeYDL({'enable_file_urls': True}) as ydl:
-            res = ydl.urlopen(url)
-            self.assertEqual(res.read(), b'foobar')
-            res.close()
-        """
-        os.unlink(tf.name)
-
-
 if __name__ == '__main__':
     unittest.main()

test/test_jsinterp.py

@@ -8,450 +8,109 @@ import sys
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-import math
+from youtube_dl.jsinterp import JSInterpreter
-import re
-
-from youtube_dl.compat import compat_str
-from youtube_dl.jsinterp import JS_Undefined, JSInterpreter
-
-NaN = object()
 
 
 class TestJSInterpreter(unittest.TestCase):
-    def _test(self, jsi_or_code, expected, func='f', args=()):
-        if isinstance(jsi_or_code, compat_str):
-            jsi_or_code = JSInterpreter(jsi_or_code)
-        got = jsi_or_code.call_function(func, *args)
-        if expected is NaN:
-            self.assertTrue(math.isnan(got), '{0} is not NaN'.format(got))
-        else:
-            self.assertEqual(got, expected)
-
     def test_basic(self):
-        jsi = JSInterpreter('function f(){;}')
+        jsi = JSInterpreter('function x(){;}')
-        self.assertEqual(repr(jsi.extract_function('f')), 'F<f>')
+        self.assertEqual(jsi.call_function('x'), None)
-        self._test(jsi, None)
 
-        self._test('function f(){return 42;}', 42)
+        jsi = JSInterpreter('function x3(){return 42;}')
-        self._test('function f(){42}', None)
+        self.assertEqual(jsi.call_function('x3'), 42)
-        self._test('var f = function(){return 42;}', 42)
 
-    def test_add(self):
+        jsi = JSInterpreter('var x5 = function(){return 42;}')
-        self._test('function f(){return 42 + 7;}', 49)
+        self.assertEqual(jsi.call_function('x5'), 42)
-        self._test('function f(){return 42 + undefined;}', NaN)
-        self._test('function f(){return 42 + null;}', 42)
-
-    def test_sub(self):
-        self._test('function f(){return 42 - 7;}', 35)
-        self._test('function f(){return 42 - undefined;}', NaN)
-        self._test('function f(){return 42 - null;}', 42)
-
-    def test_mul(self):
-        self._test('function f(){return 42 * 7;}', 294)
-        self._test('function f(){return 42 * undefined;}', NaN)
-        self._test('function f(){return 42 * null;}', 0)
-
-    def test_div(self):
-        jsi = JSInterpreter('function f(a, b){return a / b;}')
-        self._test(jsi, NaN, args=(0, 0))
-        self._test(jsi, NaN, args=(JS_Undefined, 1))
-        self._test(jsi, float('inf'), args=(2, 0))
-        self._test(jsi, 0, args=(0, 3))
-
-    def test_mod(self):
-        self._test('function f(){return 42 % 7;}', 0)
-        self._test('function f(){return 42 % 0;}', NaN)
-        self._test('function f(){return 42 % undefined;}', NaN)
-
-    def test_exp(self):
-        self._test('function f(){return 42 ** 2;}', 1764)
-        self._test('function f(){return 42 ** undefined;}', NaN)
-        self._test('function f(){return 42 ** null;}', 1)
-        self._test('function f(){return undefined ** 42;}', NaN)
 
     def test_calc(self):
-        self._test('function f(a){return 2*a+1;}', 7, args=[3])
+        jsi = JSInterpreter('function x4(a){return 2*a+1;}')
+        self.assertEqual(jsi.call_function('x4', 3), 7)
 
     def test_empty_return(self):
-        self._test('function f(){return; y()}', None)
+        jsi = JSInterpreter('function f(){return; y()}')
+        self.assertEqual(jsi.call_function('f'), None)
 
     def test_morespace(self):
-        self._test('function f (a) { return 2 * a + 1 ; }', 7, args=[3])
+        jsi = JSInterpreter('function x (a) { return 2 * a + 1 ; }')
-        self._test('function f () { x =  2  ; return x; }', 2)
+        self.assertEqual(jsi.call_function('x', 3), 7)
+
+        jsi = JSInterpreter('function f () { x =  2  ; return x; }')
+        self.assertEqual(jsi.call_function('f'), 2)
 
     def test_strange_chars(self):
-        self._test('function $_xY1 ($_axY1) { var $_axY2 = $_axY1 + 1; return $_axY2; }',
+        jsi = JSInterpreter('function $_xY1 ($_axY1) { var $_axY2 = $_axY1 + 1; return $_axY2; }')
-                   21, args=[20], func='$_xY1')
+        self.assertEqual(jsi.call_function('$_xY1', 20), 21)
 
     def test_operators(self):
-        self._test('function f(){return 1 << 5;}', 32)
+        jsi = JSInterpreter('function f(){return 1 << 5;}')
-        self._test('function f(){return 2 ** 5}', 32)
+        self.assertEqual(jsi.call_function('f'), 32)
-        self._test('function f(){return 19 & 21;}', 17)
+
-        self._test('function f(){return 11 >> 2;}', 2)
+        jsi = JSInterpreter('function f(){return 19 & 21;}')
-        self._test('function f(){return []? 2+3: 4;}', 5)
+        self.assertEqual(jsi.call_function('f'), 17)
-        self._test('function f(){return 1 == 2}', False)
+
-        self._test('function f(){return 0 && 1 || 2;}', 2)
+        jsi = JSInterpreter('function f(){return 11 >> 2;}')
-        self._test('function f(){return 0 ?? 42;}', 0)
+        self.assertEqual(jsi.call_function('f'), 2)
-        self._test('function f(){return "life, the universe and everything" < 42;}', False)
-        # https://github.com/ytdl-org/youtube-dl/issues/32815
-        self._test('function f(){return 0  - 7 * - 6;}', 42)
 
     def test_array_access(self):
-        self._test('function f(){var x = [1,2,3]; x[0] = 4; x[0] = 5; x[2.0] = 7; return x;}', [5, 2, 7])
+        jsi = JSInterpreter('function f(){var x = [1,2,3]; x[0] = 4; x[0] = 5; x[2] = 7; return x;}')
+        self.assertEqual(jsi.call_function('f'), [5, 2, 7])
 
     def test_parens(self):
-        self._test('function f(){return (1) + (2) * ((( (( (((((3)))))) )) ));}', 7)
+        jsi = JSInterpreter('function f(){return (1) + (2) * ((( (( (((((3)))))) )) ));}')
-        self._test('function f(){return (1 + 2) * 3;}', 9)
+        self.assertEqual(jsi.call_function('f'), 7)
 
-    def test_quotes(self):
+        jsi = JSInterpreter('function f(){return (1 + 2) * 3;}')
-        self._test(r'function f(){return "a\"\\("}', r'a"\(')
+        self.assertEqual(jsi.call_function('f'), 9)
 
     def test_assignments(self):
-        self._test('function f(){var x = 20; x = 30 + 1; return x;}', 31)
+        jsi = JSInterpreter('function f(){var x = 20; x = 30 + 1; return x;}')
-        self._test('function f(){var x = 20; x += 30 + 1; return x;}', 51)
+        self.assertEqual(jsi.call_function('f'), 31)
-        self._test('function f(){var x = 20; x -= 30 + 1; return x;}', -11)
+
+        jsi = JSInterpreter('function f(){var x = 20; x += 30 + 1; return x;}')
+        self.assertEqual(jsi.call_function('f'), 51)
+
+        jsi = JSInterpreter('function f(){var x = 20; x -= 30 + 1; return x;}')
+        self.assertEqual(jsi.call_function('f'), -11)
 
-    @unittest.skip('Not yet fully implemented')
     def test_comments(self):
-        self._test('''
+        'Skipping: Not yet fully implemented'
-            function f() {
+        return
-                var x = /* 1 + */ 2;
+        jsi = JSInterpreter('''
-                var y = /* 30
+        function x() {
-                * 40 */ 50;
+            var x = /* 1 + */ 2;
-                return x + y;
+            var y = /* 30
-            }
+            * 40 */ 50;
-        ''', 52)
+            return x + y;
+        }
+        ''')
+        self.assertEqual(jsi.call_function('x'), 52)
 
-        self._test('''
+        jsi = JSInterpreter('''
-            function f() {
+        function f() {
-                var x = "/*";
+            var x = "/*";
-                var y = 1 /* comment */ + 2;
+            var y = 1 /* comment */ + 2;
-                return y;
+            return y;
-            }
+        }
-        ''', 3)
+        ''')
+        self.assertEqual(jsi.call_function('f'), 3)
 
     def test_precedence(self):
-        self._test('''
+        jsi = JSInterpreter('''
-            function f() {
+        function x() {
-                var a = [10, 20, 30, 40, 50];
+            var a = [10, 20, 30, 40, 50];
-                var b = 6;
+            var b = 6;
-                a[0]=a[b%a.length];
+            a[0]=a[b%a.length];
-                return a;
+            return a;
-            }
+        }''')
-        ''', [20, 20, 30, 40, 50])
+        self.assertEqual(jsi.call_function('x'), [20, 20, 30, 40, 50])
-
-    def test_builtins(self):
-        self._test('function f() { return NaN }', NaN)
-
-    def test_Date(self):
-        self._test('function f() { return new Date("Wednesday 31 December 1969 18:01:26 MDT") - 0; }', 86000)
-
-        jsi = JSInterpreter('function f(dt) { return new Date(dt) - 0; }')
-        # date format m/d/y
-        self._test(jsi, 86000, args=['12/31/1969 18:01:26 MDT'])
-        # epoch 0
-        self._test(jsi, 0, args=['1 January 1970 00:00:00 UTC'])
 
     def test_call(self):
         jsi = JSInterpreter('''
         function x() { return 2; }
-        function y(a) { return x() + (a?a:0); }
+        function y(a) { return x() + a; }
         function z() { return y(3); }
         ''')
-        self._test(jsi, 5, func='z')
+        self.assertEqual(jsi.call_function('z'), 5)
-        self._test(jsi, 2, func='y')
-
-    def test_if(self):
-        self._test('''
-            function f() {
-            let a = 9;
-            if (0==0) {a++}
-            return a
-            }
-        ''', 10)
-
-        self._test('''
-            function f() {
-            if (0==0) {return 10}
-            }
-        ''', 10)
-
-        self._test('''
-            function f() {
-            if (0!=0) {return 1}
-            else {return 10}
-            }
-        ''', 10)
-
-    def test_elseif(self):
-        self._test('''
-            function f() {
-                if (0!=0) {return 1}
-                else if (1==0) {return 2}
-                else {return 10}
-            }
-        ''', 10)
-
-    def test_for_loop(self):
-        self._test('function f() { a=0; for (i=0; i-10; i++) {a++} return a }', 10)
-
-    def test_while_loop(self):
-        self._test('function f() { a=0; while (a<10) {a++} return a }', 10)
-
-    def test_switch(self):
-        jsi = JSInterpreter('''
-            function f(x) { switch(x){
-                case 1:x+=1;
-                case 2:x+=2;
-                case 3:x+=3;break;
-                case 4:x+=4;
-                default:x=0;
-            } return x }
-        ''')
-        self._test(jsi, 7, args=[1])
-        self._test(jsi, 6, args=[3])
-        self._test(jsi, 0, args=[5])
-
-    def test_switch_default(self):
-        jsi = JSInterpreter('''
-            function f(x) { switch(x){
-                case 2: x+=2;
-                default: x-=1;
-                case 5:
-                case 6: x+=6;
-                case 0: break;
-                case 1: x+=1;
-            } return x }
-        ''')
-        self._test(jsi, 2, args=[1])
-        self._test(jsi, 11, args=[5])
-        self._test(jsi, 14, args=[9])
-
-    def test_try(self):
-        self._test('function f() { try{return 10} catch(e){return 5} }', 10)
-
-    def test_catch(self):
-        self._test('function f() { try{throw 10} catch(e){return 5} }', 5)
-
-    def test_finally(self):
-        self._test('function f() { try{throw 10} finally {return 42} }', 42)
-        self._test('function f() { try{throw 10} catch(e){return 5} finally {return 42} }', 42)
-
-    def test_nested_try(self):
-        self._test('''
-            function f() {try {
-                try{throw 10} finally {throw 42}
-            } catch(e){return 5} }
-        ''', 5)
-
-    def test_for_loop_continue(self):
-        self._test('function f() { a=0; for (i=0; i-10; i++) { continue; a++ } return a }', 0)
-
-    def test_for_loop_break(self):
-        self._test('function f() { a=0; for (i=0; i-10; i++) { break; a++ } return a }', 0)
-
-    def test_for_loop_try(self):
-        self._test('''
-            function f() {
-                for (i=0; i-10; i++) { try { if (i == 5) throw i} catch {return 10} finally {break} };
-                return 42 }
-        ''', 42)
-
-    def test_literal_list(self):
-        self._test('function f() { return [1, 2, "asdf", [5, 6, 7]][3] }', [5, 6, 7])
-
-    def test_comma(self):
-        self._test('function f() { a=5; a -= 1, a+=3; return a }', 7)
-        self._test('function f() { a=5; return (a -= 1, a+=3, a); }', 7)
-        self._test('function f() { return (l=[0,1,2,3], function(a, b){return a+b})((l[1], l[2]), l[3]) }', 5)
-
-    def test_void(self):
-        self._test('function f() { return void 42; }', None)
-
-    def test_return_function(self):
-        jsi = JSInterpreter('''
-        function x() { return [1, function(){return 1}][1] }
-        ''')
-        self.assertEqual(jsi.call_function('x')([]), 1)
-
-    def test_null(self):
-        self._test('function f() { return null; }', None)
-        self._test('function f() { return [null > 0, null < 0, null == 0, null === 0]; }',
-                   [False, False, False, False])
-        self._test('function f() { return [null >= 0, null <= 0]; }', [True, True])
-
-    def test_undefined(self):
-        self._test('function f() { return undefined === undefined; }', True)
-        self._test('function f() { return undefined; }', JS_Undefined)
-        self._test('function f() {return undefined ?? 42; }', 42)
-        self._test('function f() { let v; return v; }', JS_Undefined)
-        self._test('function f() { let v; return v**0; }', 1)
-        self._test('function f() { let v; return [v>42, v<=42, v&&42, 42&&v]; }',
-                   [False, False, JS_Undefined, JS_Undefined])
-
-        self._test('''
-            function f() { return [
-                undefined === undefined,
-                undefined == undefined,
-                undefined == null
-            ]; }
-        ''', [True] * 3)
-        self._test('''
-            function f() { return [
-                undefined < undefined,
-                undefined > undefined,
-                undefined === 0,
-                undefined == 0,
-                undefined < 0,
-                undefined > 0,
-                undefined >= 0,
-                undefined <= 0,
-                undefined > null,
-                undefined < null,
-                undefined === null
-            ]; }
-        ''', [False] * 11)
-
-        jsi = JSInterpreter('''
-            function x() { let v; return [42+v, v+42, v**42, 42**v, 0**v]; }
-        ''')
-        for y in jsi.call_function('x'):
-            self.assertTrue(math.isnan(y))
-
-    def test_object(self):
-        self._test('function f() { return {}; }', {})
-        self._test('function f() { let a = {m1: 42, m2: 0 }; return [a["m1"], a.m2]; }', [42, 0])
-        self._test('function f() { let a; return a?.qq; }', JS_Undefined)
-        self._test('function f() { let a = {m1: 42, m2: 0 }; return a?.qq; }', JS_Undefined)
-
-    def test_regex(self):
-        self._test('function f() { let a=/,,[/,913,/](,)}/; }', None)
-
-        jsi = JSInterpreter('''
-            function x() { let a=/,,[/,913,/](,)}/; "".replace(a, ""); return a; }
-        ''')
-        attrs = set(('findall', 'finditer', 'match', 'scanner', 'search',
-                     'split', 'sub', 'subn'))
-        if sys.version_info >= (2, 7):
-            # documented for 2.6 but may not be found
-            attrs.update(('flags', 'groupindex', 'groups', 'pattern'))
-        self.assertSetEqual(set(dir(jsi.call_function('x'))) & attrs, attrs)
-
-        jsi = JSInterpreter('''
-            function x() { let a=/,,[/,913,/](,)}/i; return a; }
-        ''')
-        self.assertEqual(jsi.call_function('x').flags & ~re.U, re.I)
-
-        jsi = JSInterpreter(r'function f() { let a=/,][}",],()}(\[)/; return a; }')
-        self.assertEqual(jsi.call_function('f').pattern, r',][}",],()}(\[)')
-
-        jsi = JSInterpreter(r'function f() { let a=[/[)\\]/]; return a[0]; }')
-        self.assertEqual(jsi.call_function('f').pattern, r'[)\\]')
-
-    def test_replace(self):
-        self._test('function f() { let a="data-name".replace("data-", ""); return a }',
-                   'name')
-        self._test('function f() { let a="data-name".replace(new RegExp("^.+-"), ""); return a; }',
-                   'name')
-        self._test('function f() { let a="data-name".replace(/^.+-/, ""); return a; }',
-                   'name')
-        self._test('function f() { let a="data-name".replace(/a/g, "o"); return a; }',
-                   'doto-nome')
-        self._test('function f() { let a="data-name".replaceAll("a", "o"); return a; }',
-                   'doto-nome')
-
-    def test_char_code_at(self):
-        jsi = JSInterpreter('function f(i){return "test".charCodeAt(i)}')
-        self._test(jsi, 116, args=[0])
-        self._test(jsi, 101, args=[1])
-        self._test(jsi, 115, args=[2])
-        self._test(jsi, 116, args=[3])
-        self._test(jsi, None, args=[4])
-        self._test(jsi, 116, args=['not_a_number'])
-
-    def test_bitwise_operators_overflow(self):
-        self._test('function f(){return -524999584 << 5}', 379882496)
-        self._test('function f(){return 1236566549 << 5}', 915423904)
-
-    def test_bitwise_operators_typecast(self):
-        # madness
-        self._test('function f(){return null << 5}', 0)
-        self._test('function f(){return undefined >> 5}', 0)
-        self._test('function f(){return 42 << NaN}', 42)
-        self._test('function f(){return 42 << Infinity}', 42)
-
-    def test_negative(self):
-        self._test('function f(){return 2    *    -2.0    ;}', -4)
-        self._test('function f(){return 2    -    - -2    ;}', 0)
-        self._test('function f(){return 2    -    - - -2  ;}', 4)
-        self._test('function f(){return 2    -    + + - -2;}', 0)
-        self._test('function f(){return 2    +    - + - -2;}', 0)
-
-    def test_32066(self):
-        self._test(
-            "function f(){return Math.pow(3, 5) + new Date('1970-01-01T08:01:42.000+08:00') / 1000 * -239 - -24205;}",
-            70)
-
-    @unittest.skip('Not yet working')
-    def test_packed(self):
-        self._test(
-            '''function f(p,a,c,k,e,d){while(c--)if(k[c])p=p.replace(new RegExp('\\b'+c.toString(a)+'\\b','g'),k[c]);return p}''',
-            '''h 7=g("1j");7.7h({7g:[{33:"w://7f-7e-7d-7c.v.7b/7a/79/78/77/76.74?t=73&s=2s&e=72&f=2t&71=70.0.0.1&6z=6y&6x=6w"}],6v:"w://32.v.u/6u.31",16:"r%",15:"r%",6t:"6s",6r:"",6q:"l",6p:"l",6o:"6n",6m:\'6l\',6k:"6j",9:[{33:"/2u?b=6i&n=50&6h=w://32.v.u/6g.31",6f:"6e"}],1y:{6d:1,6c:\'#6b\',6a:\'#69\',68:"67",66:30,65:r,},"64":{63:"%62 2m%m%61%5z%5y%5x.u%5w%5v%5u.2y%22 2k%m%1o%22 5t%m%1o%22 5s%m%1o%22 2j%m%5r%22 16%m%5q%22 15%m%5p%22 5o%2z%5n%5m%2z",5l:"w://v.u/d/1k/5k.2y",5j:[]},\'5i\':{"5h":"5g"},5f:"5e",5d:"w://v.u",5c:{},5b:l,1x:[0.25,0.50,0.75,1,1.25,1.5,2]});h 1m,1n,5a;h 59=0,58=0;h 7=g("1j");h 2x=0,57=0,56=0;$.55({54:{\'53-52\':\'2i-51\'}});7.j(\'4z\',6(x){c(5>0&&x.1l>=5&&1n!=1){1n=1;$(\'q.4y\').4x(\'4w\')}});7.j(\'13\',6(x){2x=x.1l});7.j(\'2g\',6(x){2w(x)});7.j(\'4v\',6(){$(\'q.2v\').4u()});6 2w(x){$(\'q.2v\').4t();c(1m)19;1m=1;17=0;c(4s.4r===l){17=1}$.4q(\'/2u?b=4p&2l=1k&4o=2t-4n-4m-2s-4l&4k=&4j=&4i=&17=\'+17,6(2r){$(\'#4h\').4g(2r)});$(\'.3-8-4f-4e:4d("4c")\').2h(6(e){2q();g().4b(0);g().4a(l)});6 2q(){h $14=$("<q />").2p({1l:"49",16:"r%",15:"r%",48:0,2n:0,2o:47,46:"45(10%, 10%, 10%, 0.4)","44-43":"42"});$("<41 />").2p({16:"60%",15:"60%",2o:40,"3z-2n":"3y"}).3x({\'2m\':\'/?b=3w&2l=1k\',\'2k\':\'0\',\'2j\':\'2i\'}).2f($14);$14.2h(6(){$(3v).3u();g().2g()});$14.2f($(\'#1j\'))}g().13(0);}6 3t(){h 9=7.1b(2e);2d.2c(9);c(9.n>1){1r(i=0;i<9.n;i++){c(9[i].1a==2e){2d.2c(\'!!=\'+i);7.1p(i)}}}}7.j(\'3s\',6(){g().1h("/2a/3r.29","3q 10 28",6(){g().13(g().27()+10)},"2b");$("q[26=2b]").23().21(\'.3-20-1z\');g().1h("/2a/3p.29","3o 10 28",6(){h 12=g().27()-10;c(12<0)12=0;g().13(12)},"24");$("q[26=24]").23().21(\'.3-20-1z\');});6 1i(){}7.j(\'3n\',6(){1i()});7.j(\'3m\',6(){1i()});7.j("k",6(y){h 9=7.1b();c(9.n<2)19;$(\'.3-8-3l-3k\').3j(6(){$(\'#3-8-a-k\').1e(\'3-8-a-z\');$(\'.3-a-k\').p(\'o-1f\',\'11\')});7.1h("/3i/3h.3g","3f 3e",6(){$(\'.3-1w\').3d(\'3-8-1v\');$(\'.3-8-1y, .3-8-1x\').p(\'o-1g\',\'11\');c($(\'.3-1w\').3c(\'3-8-1v\')){$(\'.3-a-k\').p(\'o-1g\',\'l\');$(\'.3-a-k\').p(\'o-1f\',\'l\');$(\'.3-8-a\').1e(\'3-8-a-z\');$(\'.3-8-a:1u\').3b(\'3-8-a-z\')}3a{$(\'.3-a-k\').p(\'o-1g\',\'11\');$(\'.3-a-k\').p(\'o-1f\',\'11\');$(\'.3-8-a:1u\').1e(\'3-8-a-z\')}},"39");7.j("38",6(y){1d.37(\'1c\',y.9[y.36].1a)});c(1d.1t(\'1c\')){35("1s(1d.1t(\'1c\'));",34)}});h 18;6 1s(1q){h 9=7.1b();c(9.n>1){1r(i=0;i<9.n;i++){c(9[i].1a==1q){c(i==18){19}18=i;7.1p(i)}}}}',36,270,'|||jw|||function|player|settings|tracks|submenu||if||||jwplayer|var||on|audioTracks|true|3D|length|aria|attr|div|100|||sx|filemoon|https||event|active||false|tt|seek|dd|height|width|adb|current_audio|return|name|getAudioTracks|default_audio|localStorage|removeClass|expanded|checked|addButton|callMeMaybe|vplayer|0fxcyc2ajhp1|position|vvplay|vvad|220|setCurrentAudioTrack|audio_name|for|audio_set|getItem|last|open|controls|playbackRates|captions|rewind|icon|insertAfter||detach|ff00||button|getPosition|sec|png|player8|ff11|log|console|track_name|appendTo|play|click|no|scrolling|frameborder|file_code|src|top|zIndex|css|showCCform|data|1662367683|383371|dl|video_ad|doPlay|prevt|mp4|3E||jpg|thumbs|file|300|setTimeout|currentTrack|setItem|audioTrackChanged|dualSound|else|addClass|hasClass|toggleClass|Track|Audio|svg|dualy|images|mousedown|buttons|topbar|playAttemptFailed|beforePlay|Rewind|fr|Forward|ff|ready|set_audio_track|remove|this|upload_srt|prop|50px|margin|1000001|iframe|center|align|text|rgba|background|1000000|left|absolute|pause|setCurrentCaptions|Upload|contains|item|content|html|fviews|referer|prem|embed|3e57249ef633e0d03bf76ceb8d8a4b65|216|83|hash|view|get|TokenZir|window|hide|show|complete|slow|fadeIn|video_ad_fadein|time||cache|Cache|Content|headers|ajaxSetup|v2done|tott|vastdone2|vastdone1|vvbefore|playbackRateControls|cast|aboutlink|FileMoon|abouttext|UHD|1870|qualityLabels|sites|GNOME_POWER|link|2Fiframe|3C|allowfullscreen|22360|22640|22no|marginheight|marginwidth|2FGNOME_POWER|2F0fxcyc2ajhp1|2Fe|2Ffilemoon|2F|3A||22https|3Ciframe|code|sharing|fontOpacity|backgroundOpacity|Tahoma|fontFamily|303030|backgroundColor|FFFFFF|color|userFontScale|thumbnails|kind|0fxcyc2ajhp10000|url|get_slides|start|startparam|none|preload|html5|primary|hlshtml|androidhls|duration|uniform|stretching|0fxcyc2ajhp1_xt|image|2048|sp|6871|asn|127|srv|43200|_g3XlBcu2lmD9oDexD2NLWSmah2Nu3XcDrl93m9PwXY|m3u8||master|0fxcyc2ajhp1_x|00076|01|hls2|to|s01|delivery|storage|moon|sources|setup'''.split('|'))
-
-    def test_join(self):
-        test_input = list('test')
-        tests = [
-            'function f(a, b){return a.join(b)}',
-            'function f(a, b){return Array.prototype.join.call(a, b)}',
-            'function f(a, b){return Array.prototype.join.apply(a, [b])}',
-        ]
-        for test in tests:
-            jsi = JSInterpreter(test)
-            self._test(jsi, 'test', args=[test_input, ''])
-            self._test(jsi, 't-e-s-t', args=[test_input, '-'])
-            self._test(jsi, '', args=[[], '-'])
-
-    def test_split(self):
-        test_result = list('test')
-        tests = [
-            'function f(a, b){return a.split(b)}',
-            'function f(a, b){return String.prototype.split.call(a, b)}',
-            'function f(a, b){return String.prototype.split.apply(a, [b])}',
-        ]
-        for test in tests:
-            jsi = JSInterpreter(test)
-            self._test(jsi, test_result, args=['test', ''])
-            self._test(jsi, test_result, args=['t-e-s-t', '-'])
-            self._test(jsi, [''], args=['', '-'])
-            self._test(jsi, [], args=['', ''])
-
-    def test_slice(self):
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice()}', [0, 1, 2, 3, 4, 5, 6, 7, 8])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(0)}', [0, 1, 2, 3, 4, 5, 6, 7, 8])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(5)}', [5, 6, 7, 8])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(99)}', [])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(-2)}', [7, 8])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(-99)}', [0, 1, 2, 3, 4, 5, 6, 7, 8])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(0, 0)}', [])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(1, 0)}', [])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(0, 1)}', [0])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(3, 6)}', [3, 4, 5])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(1, -1)}', [1, 2, 3, 4, 5, 6, 7])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(-1, 1)}', [])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(-3, -1)}', [6, 7])
-        self._test('function f(){return "012345678".slice()}', '012345678')
-        self._test('function f(){return "012345678".slice(0)}', '012345678')
-        self._test('function f(){return "012345678".slice(5)}', '5678')
-        self._test('function f(){return "012345678".slice(99)}', '')
-        self._test('function f(){return "012345678".slice(-2)}', '78')
-        self._test('function f(){return "012345678".slice(-99)}', '012345678')
-        self._test('function f(){return "012345678".slice(0, 0)}', '')
-        self._test('function f(){return "012345678".slice(1, 0)}', '')
-        self._test('function f(){return "012345678".slice(0, 1)}', '0')
-        self._test('function f(){return "012345678".slice(3, 6)}', '345')
-        self._test('function f(){return "012345678".slice(1, -1)}', '1234567')
-        self._test('function f(){return "012345678".slice(-1, 1)}', '')
-        self._test('function f(){return "012345678".slice(-3, -1)}', '67')
 
 
 if __name__ == '__main__':

test/test_subtitles.py

@@ -38,9 +38,6 @@ class BaseTestSubtitles(unittest.TestCase):
         self.DL = FakeYDL()
         self.ie = self.IE()
         self.DL.add_info_extractor(self.ie)
-        if not self.IE.working():
-            print('Skipping: %s marked as not _WORKING' % self.IE.ie_key())
-            self.skipTest('IE marked as not _WORKING')
 
     def getInfoDict(self):
         info_dict = self.DL.extract_info(self.url, download=False)
@@ -59,21 +56,6 @@ class BaseTestSubtitles(unittest.TestCase):
 
 
 class TestYoutubeSubtitles(BaseTestSubtitles):
-    # Available subtitles for QRS8MkLhQmM:
-    # Language formats
-    # ru       vtt, ttml, srv3, srv2, srv1, json3
-    # fr       vtt, ttml, srv3, srv2, srv1, json3
-    # en       vtt, ttml, srv3, srv2, srv1, json3
-    # nl       vtt, ttml, srv3, srv2, srv1, json3
-    # de       vtt, ttml, srv3, srv2, srv1, json3
-    # ko       vtt, ttml, srv3, srv2, srv1, json3
-    # it       vtt, ttml, srv3, srv2, srv1, json3
-    # zh-Hant  vtt, ttml, srv3, srv2, srv1, json3
-    # hi       vtt, ttml, srv3, srv2, srv1, json3
-    # pt-BR    vtt, ttml, srv3, srv2, srv1, json3
-    # es-MX    vtt, ttml, srv3, srv2, srv1, json3
-    # ja       vtt, ttml, srv3, srv2, srv1, json3
-    # pl       vtt, ttml, srv3, srv2, srv1, json3
     url = 'QRS8MkLhQmM'
     IE = YoutubeIE
 
@@ -82,60 +64,41 @@ class TestYoutubeSubtitles(BaseTestSubtitles):
         self.DL.params['allsubtitles'] = True
         subtitles = self.getSubtitles()
         self.assertEqual(len(subtitles.keys()), 13)
-        self.assertEqual(md5(subtitles['en']), 'ae1bd34126571a77aabd4d276b28044d')
+        self.assertEqual(md5(subtitles['en']), '3cb210999d3e021bd6c7f0ea751eab06')
-        self.assertEqual(md5(subtitles['it']), '0e0b667ba68411d88fd1c5f4f4eab2f9')
+        self.assertEqual(md5(subtitles['it']), '6d752b98c31f1cf8d597050c7a2cb4b5')
         for lang in ['fr', 'de']:
             self.assertTrue(subtitles.get(lang) is not None, 'Subtitles for \'%s\' not extracted' % lang)
 
-    def _test_subtitles_format(self, fmt, md5_hash, lang='en'):
-        self.DL.params['writesubtitles'] = True
-        self.DL.params['subtitlesformat'] = fmt
-        subtitles = self.getSubtitles()
-        self.assertEqual(md5(subtitles[lang]), md5_hash)
-
     def test_youtube_subtitles_ttml_format(self):
-        self._test_subtitles_format('ttml', 'c97ddf1217390906fa9fbd34901f3da2')
+        self.DL.params['writesubtitles'] = True
+        self.DL.params['subtitlesformat'] = 'ttml'
+        subtitles = self.getSubtitles()
+        self.assertEqual(md5(subtitles['en']), 'e306f8c42842f723447d9f63ad65df54')
 
     def test_youtube_subtitles_vtt_format(self):
-        self._test_subtitles_format('vtt', 'ae1bd34126571a77aabd4d276b28044d')
+        self.DL.params['writesubtitles'] = True
-
+        self.DL.params['subtitlesformat'] = 'vtt'
-    def test_youtube_subtitles_json3_format(self):
-        self._test_subtitles_format('json3', '688dd1ce0981683867e7fe6fde2a224b')
-
-    def _test_automatic_captions(self, url, lang):
-        self.url = url
-        self.DL.params['writeautomaticsub'] = True
-        self.DL.params['subtitleslangs'] = [lang]
         subtitles = self.getSubtitles()
-        self.assertTrue(subtitles[lang] is not None)
+        self.assertEqual(md5(subtitles['en']), '3cb210999d3e021bd6c7f0ea751eab06')
 
     def test_youtube_automatic_captions(self):
-        # Available automatic captions for 8YoUxe5ncPo:
+        self.url = '8YoUxe5ncPo'
-        # Language formats (all in vtt, ttml, srv3, srv2, srv1, json3)
+        self.DL.params['writeautomaticsub'] = True
-        # gu, zh-Hans, zh-Hant, gd, ga, gl, lb, la, lo, tt, tr,
+        self.DL.params['subtitleslangs'] = ['it']
-        # lv, lt, tk, th, tg, te, fil, haw, yi, ceb, yo, de, da,
+        subtitles = self.getSubtitles()
-        # el, eo, en, eu, et, es, ru, rw, ro, bn, be, bg, uk, jv,
+        self.assertTrue(subtitles['it'] is not None)
-        # bs, ja, or, xh, co, ca, cy, cs, ps, pt, pa, vi, pl, hy,
-        # hr, ht, hu, hmn, hi, ha, mg, uz, ml, mn, mi, mk, ur,
-        # mt, ms, mr, ug, ta, my, af, sw, is, am,
-        #                                         *it*, iw, sv, ar,
-        # su, zu, az, id, ig, nl, no, ne, ny, fr, ku, fy, fa, fi,
-        # ka, kk, sr, sq, ko, kn, km, st, sk, si, so, sn, sm, sl,
-        # ky, sd
-        # ...
-        self._test_automatic_captions('8YoUxe5ncPo', 'it')
 
-    @unittest.skip('ASR subs all in all supported langs now')
     def test_youtube_translated_subtitles(self):
-        # This video has a subtitles track, which can be translated (#4555)
+        # This video has a subtitles track, which can be translated
-        self._test_automatic_captions('Ky9eprVWzlI', 'it')
+        self.url = 'Ky9eprVWzlI'
+        self.DL.params['writeautomaticsub'] = True
+        self.DL.params['subtitleslangs'] = ['it']
+        subtitles = self.getSubtitles()
+        self.assertTrue(subtitles['it'] is not None)
 
     def test_youtube_nosubtitles(self):
         self.DL.expect_warning('video doesn\'t have subtitles')
-        # Available automatic captions for 8YoUxe5ncPo:
+        self.url = 'n5BB19UTcdA'
-        # ...
-        # 8YoUxe5ncPo has no subtitles
-        self.url = '8YoUxe5ncPo'
         self.DL.params['writesubtitles'] = True
         self.DL.params['allsubtitles'] = True
         subtitles = self.getSubtitles()
@@ -165,7 +128,6 @@ class TestDailymotionSubtitles(BaseTestSubtitles):
         self.assertFalse(subtitles)
 
 
-@unittest.skip('IE broken')
 class TestTedSubtitles(BaseTestSubtitles):
     url = 'http://www.ted.com/talks/dan_dennett_on_our_consciousness.html'
     IE = TEDIE
@@ -190,19 +152,18 @@ class TestVimeoSubtitles(BaseTestSubtitles):
         self.DL.params['allsubtitles'] = True
         subtitles = self.getSubtitles()
         self.assertEqual(set(subtitles.keys()), set(['de', 'en', 'es', 'fr']))
-        self.assertEqual(md5(subtitles['en']), '386cbc9320b94e25cb364b97935e5dd1')
+        self.assertEqual(md5(subtitles['en']), '8062383cf4dec168fc40a088aa6d5888')
-        self.assertEqual(md5(subtitles['fr']), 'c9b69eef35bc6641c0d4da8a04f9dfac')
+        self.assertEqual(md5(subtitles['fr']), 'b6191146a6c5d3a452244d853fde6dc8')
 
     def test_nosubtitles(self):
         self.DL.expect_warning('video doesn\'t have subtitles')
-        self.url = 'http://vimeo.com/68093876'
+        self.url = 'http://vimeo.com/56015672'
         self.DL.params['writesubtitles'] = True
         self.DL.params['allsubtitles'] = True
         subtitles = self.getSubtitles()
         self.assertFalse(subtitles)
 
 
-@unittest.skip('IE broken')
 class TestWallaSubtitles(BaseTestSubtitles):
     url = 'http://vod.walla.co.il/movie/2705958/the-yes-men'
     IE = WallaIE
@@ -224,7 +185,6 @@ class TestWallaSubtitles(BaseTestSubtitles):
         self.assertFalse(subtitles)
 
 
-@unittest.skip('IE broken')
 class TestCeskaTelevizeSubtitles(BaseTestSubtitles):
     url = 'http://www.ceskatelevize.cz/ivysilani/10600540290-u6-uzasny-svet-techniky'
     IE = CeskaTelevizeIE
@@ -246,7 +206,6 @@ class TestCeskaTelevizeSubtitles(BaseTestSubtitles):
         self.assertFalse(subtitles)
 
 
-@unittest.skip('IE broken')
 class TestLyndaSubtitles(BaseTestSubtitles):
     url = 'http://www.lynda.com/Bootstrap-tutorials/Using-exercise-files/110885/114408-4.html'
     IE = LyndaIE
@@ -259,7 +218,6 @@ class TestLyndaSubtitles(BaseTestSubtitles):
         self.assertEqual(md5(subtitles['en']), '09bbe67222259bed60deaa26997d73a7')
 
 
-@unittest.skip('IE broken')
 class TestNPOSubtitles(BaseTestSubtitles):
     url = 'http://www.npo.nl/nos-journaal/28-08-2014/POW_00722860'
     IE = NPOIE
@@ -272,7 +230,6 @@ class TestNPOSubtitles(BaseTestSubtitles):
         self.assertEqual(md5(subtitles['nl']), 'fc6435027572b63fb4ab143abd5ad3f4')
 
 
-@unittest.skip('IE broken')
 class TestMTVSubtitles(BaseTestSubtitles):
     url = 'http://www.cc.com/video-clips/p63lk0/adam-devine-s-house-party-chasing-white-swans'
     IE = ComedyCentralIE
@@ -295,10 +252,9 @@ class TestNRKSubtitles(BaseTestSubtitles):
     def test_allsubtitles(self):
         self.DL.params['writesubtitles'] = True
         self.DL.params['allsubtitles'] = True
-        self.DL.params['format'] = 'best/bestvideo'
         subtitles = self.getSubtitles()
-        self.assertEqual(set(subtitles.keys()), set(['nb-ttv']))
+        self.assertEqual(set(subtitles.keys()), set(['no']))
-        self.assertEqual(md5(subtitles['nb-ttv']), '67e06ff02d0deaf975e68f6cb8f6a149')
+        self.assertEqual(md5(subtitles['no']), '544fa917d3197fcbee64634559221cc2')
 
 
 class TestRaiPlaySubtitles(BaseTestSubtitles):
@@ -321,7 +277,6 @@ class TestRaiPlaySubtitles(BaseTestSubtitles):
         self.assertEqual(md5(subtitles['it']), '4b3264186fbb103508abe5311cfcb9cd')
 
 
-@unittest.skip('IE broken - DRM only')
 class TestVikiSubtitles(BaseTestSubtitles):
     url = 'http://www.viki.com/videos/1060846v-punch-episode-18'
     IE = VikiIE
@@ -348,7 +303,6 @@ class TestThePlatformSubtitles(BaseTestSubtitles):
         self.assertEqual(md5(subtitles['en']), '97e7670cbae3c4d26ae8bcc7fdd78d4b')
 
 
-@unittest.skip('IE broken')
 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
@@ -384,7 +338,7 @@ class TestDemocracynowSubtitles(BaseTestSubtitles):
         self.DL.params['allsubtitles'] = True
         subtitles = self.getSubtitles()
         self.assertEqual(set(subtitles.keys()), set(['en']))
-        self.assertEqual(md5(subtitles['en']), 'a3cc4c0b5eadd74d9974f1c1f5101045')
+        self.assertEqual(md5(subtitles['en']), 'acaca989e24a9e45a6719c9b3d60815c')
 
     def test_subtitles_in_page(self):
         self.url = 'http://www.democracynow.org/2015/7/3/this_flag_comes_down_today_bree'
@@ -392,7 +346,7 @@ class TestDemocracynowSubtitles(BaseTestSubtitles):
         self.DL.params['allsubtitles'] = True
         subtitles = self.getSubtitles()
         self.assertEqual(set(subtitles.keys()), set(['en']))
-        self.assertEqual(md5(subtitles['en']), 'a3cc4c0b5eadd74d9974f1c1f5101045')
+        self.assertEqual(md5(subtitles['en']), 'acaca989e24a9e45a6719c9b3d60815c')
 
 
 if __name__ == '__main__':

test/test_swfinterp.py

@@ -5,18 +5,16 @@ from __future__ import unicode_literals
 import os
 import sys
 import unittest
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-dirn = os.path.dirname
-
-sys.path.insert(0, dirn(dirn(os.path.abspath(__file__))))
 
 import errno
+import io
 import json
 import re
 import subprocess
 
 from youtube_dl.swfinterp import SWFInterpreter
-from youtube_dl.compat import compat_open as open
 
 
 TEST_DIR = os.path.join(
@@ -45,7 +43,7 @@ def _make_testfunc(testfile):
                     '-static-link-runtime-shared-libraries', as_file])
             except OSError as ose:
                 if ose.errno == errno.ENOENT:
-                    self.skipTest('mxmlc not found!')
+                    print('mxmlc not found! Skipping test.')
                     return
                 raise
 
@@ -53,7 +51,7 @@ def _make_testfunc(testfile):
             swf_content = swf_f.read()
         swfi = SWFInterpreter(swf_content)
 
-        with open(as_file, 'r', encoding='utf-8') as as_f:
+        with io.open(as_file, 'r', encoding='utf-8') as as_f:
             as_content = as_f.read()
 
         def _find_spec(key):

test/test_traversal.py

@@ -1,509 +0,0 @@
-#!/usr/bin/env python
-# coding: utf-8
-from __future__ import unicode_literals
-
-# Allow direct execution
-import os
-import sys
-import unittest
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-
-import re
-
-from youtube_dl.traversal import (
-    dict_get,
-    get_first,
-    T,
-    traverse_obj,
-)
-from youtube_dl.compat import (
-    compat_etree_fromstring,
-    compat_http_cookies,
-    compat_str,
-)
-from youtube_dl.utils import (
-    int_or_none,
-    str_or_none,
-)
-
-_TEST_DATA = {
-    100: 100,
-    1.2: 1.2,
-    'str': 'str',
-    'None': None,
-    '...': Ellipsis,
-    'urls': [
-        {'index': 0, 'url': 'https://www.example.com/0'},
-        {'index': 1, 'url': 'https://www.example.com/1'},
-    ],
-    'data': (
-        {'index': 2},
-        {'index': 3},
-    ),
-    'dict': {},
-}
-
-
-if sys.version_info < (3, 0):
-    class _TestCase(unittest.TestCase):
-
-        def assertCountEqual(self, *args, **kwargs):
-            return self.assertItemsEqual(*args, **kwargs)
-else:
-    _TestCase = unittest.TestCase
-
-
-class TestTraversal(_TestCase):
-    def assertMaybeCountEqual(self, *args, **kwargs):
-        if sys.version_info < (3, 7):
-            # random dict order
-            return self.assertCountEqual(*args, **kwargs)
-        else:
-            return self.assertEqual(*args, **kwargs)
-
-    def test_traverse_obj(self):
-        # instant compat
-        str = compat_str
-
-        # define a pukka Iterable
-        def iter_range(stop):
-            for from_ in range(stop):
-                yield from_
-
-        # Test base functionality
-        self.assertEqual(traverse_obj(_TEST_DATA, ('str',)), 'str',
-                         msg='allow tuple path')
-        self.assertEqual(traverse_obj(_TEST_DATA, ['str']), 'str',
-                         msg='allow list path')
-        self.assertEqual(traverse_obj(_TEST_DATA, (value for value in ("str",))), 'str',
-                         msg='allow iterable path')
-        self.assertEqual(traverse_obj(_TEST_DATA, 'str'), 'str',
-                         msg='single items should be treated as a path')
-        self.assertEqual(traverse_obj(_TEST_DATA, None), _TEST_DATA)
-        self.assertEqual(traverse_obj(_TEST_DATA, 100), 100)
-        self.assertEqual(traverse_obj(_TEST_DATA, 1.2), 1.2)
-
-        # Test Ellipsis behavior
-        self.assertCountEqual(traverse_obj(_TEST_DATA, Ellipsis),
-                              (item for item in _TEST_DATA.values() if item not in (None, {})),
-                              msg='`...` should give all non-discarded values')
-        self.assertCountEqual(traverse_obj(_TEST_DATA, ('urls', 0, Ellipsis)), _TEST_DATA['urls'][0].values(),
-                              msg='`...` selection for dicts should select all values')
-        self.assertEqual(traverse_obj(_TEST_DATA, (Ellipsis, Ellipsis, 'url')),
-                         ['https://www.example.com/0', 'https://www.example.com/1'],
-                         msg='nested `...` queries should work')
-        self.assertCountEqual(traverse_obj(_TEST_DATA, (Ellipsis, Ellipsis, 'index')), iter_range(4),
-                              msg='`...` query result should be flattened')
-        self.assertEqual(traverse_obj(iter(range(4)), Ellipsis), list(range(4)),
-                         msg='`...` should accept iterables')
-
-        # Test function as key
-        self.assertEqual(traverse_obj(_TEST_DATA, lambda x, y: x == 'urls' and isinstance(y, list)),
-                         [_TEST_DATA['urls']],
-                         msg='function as query key should perform a filter based on (key, value)')
-        self.assertCountEqual(traverse_obj(_TEST_DATA, lambda _, x: isinstance(x[0], str)), set(('str',)),
-                              msg='exceptions in the query function should be caught')
-        self.assertEqual(traverse_obj(iter(range(4)), lambda _, x: x % 2 == 0), [0, 2],
-                         msg='function key should accept iterables')
-        if __debug__:
-            with self.assertRaises(Exception, msg='Wrong function signature should raise in debug'):
-                traverse_obj(_TEST_DATA, lambda a: Ellipsis)
-            with self.assertRaises(Exception, msg='Wrong function signature should raise in debug'):
-                traverse_obj(_TEST_DATA, lambda a, b, c: Ellipsis)
-
-        # Test set as key (transformation/type, like `expected_type`)
-        self.assertEqual(traverse_obj(_TEST_DATA, (Ellipsis, T(str.upper), )), ['STR'],
-                         msg='Function in set should be a transformation')
-        self.assertEqual(traverse_obj(_TEST_DATA, ('fail', T(lambda _: 'const'))), 'const',
-                         msg='Function in set should always be called')
-        self.assertEqual(traverse_obj(_TEST_DATA, (Ellipsis, T(str))), ['str'],
-                         msg='Type in set should be a type filter')
-        self.assertMaybeCountEqual(traverse_obj(_TEST_DATA, (Ellipsis, T(str, int))), [100, 'str'],
-                                   msg='Multiple types in set should be a type filter')
-        self.assertEqual(traverse_obj(_TEST_DATA, T(dict)), _TEST_DATA,
-                         msg='A single set should be wrapped into a path')
-        self.assertEqual(traverse_obj(_TEST_DATA, (Ellipsis, T(str.upper))), ['STR'],
-                         msg='Transformation function should not raise')
-        self.assertMaybeCountEqual(traverse_obj(_TEST_DATA, (Ellipsis, T(str_or_none))),
-                                   [item for item in map(str_or_none, _TEST_DATA.values()) if item is not None],
-                                   msg='Function in set should be a transformation')
-        if __debug__:
-            with self.assertRaises(Exception, msg='Sets with length != 1 should raise in debug'):
-                traverse_obj(_TEST_DATA, set())
-            with self.assertRaises(Exception, msg='Sets with length != 1 should raise in debug'):
-                traverse_obj(_TEST_DATA, set((str.upper, str)))
-
-        # Test `slice` as a key
-        _SLICE_DATA = [0, 1, 2, 3, 4]
-        self.assertEqual(traverse_obj(_TEST_DATA, ('dict', slice(1))), None,
-                         msg='slice on a dictionary should not throw')
-        self.assertEqual(traverse_obj(_SLICE_DATA, slice(1)), _SLICE_DATA[:1],
-                         msg='slice key should apply slice to sequence')
-        self.assertEqual(traverse_obj(_SLICE_DATA, slice(1, 2)), _SLICE_DATA[1:2],
-                         msg='slice key should apply slice to sequence')
-        self.assertEqual(traverse_obj(_SLICE_DATA, slice(1, 4, 2)), _SLICE_DATA[1:4:2],
-                         msg='slice key should apply slice to sequence')
-
-        # Test alternative paths
-        self.assertEqual(traverse_obj(_TEST_DATA, 'fail', 'str'), 'str',
-                         msg='multiple `paths` should be treated as alternative paths')
-        self.assertEqual(traverse_obj(_TEST_DATA, 'str', 100), 'str',
-                         msg='alternatives should exit early')
-        self.assertEqual(traverse_obj(_TEST_DATA, 'fail', 'fail'), None,
-                         msg='alternatives should return `default` if exhausted')
-        self.assertEqual(traverse_obj(_TEST_DATA, (Ellipsis, 'fail'), 100), 100,
-                         msg='alternatives should track their own branching return')
-        self.assertEqual(traverse_obj(_TEST_DATA, ('dict', Ellipsis), ('data', Ellipsis)), list(_TEST_DATA['data']),
-                         msg='alternatives on empty objects should search further')
-
-        # Test branch and path nesting
-        self.assertEqual(traverse_obj(_TEST_DATA, ('urls', (3, 0), 'url')), ['https://www.example.com/0'],
-                         msg='tuple as key should be treated as branches')
-        self.assertEqual(traverse_obj(_TEST_DATA, ('urls', [3, 0], 'url')), ['https://www.example.com/0'],
-                         msg='list as key should be treated as branches')
-        self.assertEqual(traverse_obj(_TEST_DATA, ('urls', ((1, 'fail'), (0, 'url')))), ['https://www.example.com/0'],
-                         msg='double nesting in path should be treated as paths')
-        self.assertEqual(traverse_obj(['0', [1, 2]], [(0, 1), 0]), [1],
-                         msg='do not fail early on branching')
-        self.assertCountEqual(traverse_obj(_TEST_DATA, ('urls', ((1, ('fail', 'url')), (0, 'url')))),
-                              ['https://www.example.com/0', 'https://www.example.com/1'],
-                              msg='triple nesting in path should be treated as branches')
-        self.assertEqual(traverse_obj(_TEST_DATA, ('urls', ('fail', (Ellipsis, 'url')))),
-                         ['https://www.example.com/0', 'https://www.example.com/1'],
-                         msg='ellipsis as branch path start gets flattened')
-
-        # Test dictionary as key
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 100, 1: 1.2}), {0: 100, 1: 1.2},
-                         msg='dict key should result in a dict with the same keys')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: ('urls', 0, 'url')}),
-                         {0: 'https://www.example.com/0'},
-                         msg='dict key should allow paths')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: ('urls', (3, 0), 'url')}),
-                         {0: ['https://www.example.com/0']},
-                         msg='tuple in dict path should be treated as branches')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: ('urls', ((1, 'fail'), (0, 'url')))}),
-                         {0: ['https://www.example.com/0']},
-                         msg='double nesting in dict path should be treated as paths')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: ('urls', ((1, ('fail', 'url')), (0, 'url')))}),
-                         {0: ['https://www.example.com/1', 'https://www.example.com/0']},
-                         msg='triple nesting in dict path should be treated as branches')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 'fail'}), {},
-                         msg='remove `None` values when top level dict key fails')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 'fail'}, default=Ellipsis), {0: Ellipsis},
-                         msg='use `default` if key fails and `default`')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 'dict'}), {},
-                         msg='remove empty values when dict key')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 'dict'}, default=Ellipsis), {0: Ellipsis},
-                         msg='use `default` when dict key and a default')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: {0: 'fail'}}), {},
-                         msg='remove empty values when nested dict key fails')
-        self.assertEqual(traverse_obj(None, {0: 'fail'}), {},
-                         msg='default to dict if pruned')
-        self.assertEqual(traverse_obj(None, {0: 'fail'}, default=Ellipsis), {0: Ellipsis},
-                         msg='default to dict if pruned and default is given')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: {0: 'fail'}}, default=Ellipsis), {0: {0: Ellipsis}},
-                         msg='use nested `default` when nested dict key fails and `default`')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: ('dict', Ellipsis)}), {},
-                         msg='remove key if branch in dict key not successful')
-
-        # Testing default parameter behavior
-        _DEFAULT_DATA = {'None': None, 'int': 0, 'list': []}
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, 'fail'), None,
-                         msg='default value should be `None`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, 'fail', 'fail', default=Ellipsis), Ellipsis,
-                         msg='chained fails should result in default')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, 'None', 'int'), 0,
-                         msg='should not short cirquit on `None`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, 'fail', default=1), 1,
-                         msg='invalid dict key should result in `default`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, 'None', default=1), 1,
-                         msg='`None` is a deliberate sentinel and should become `default`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, ('list', 10)), None,
-                         msg='`IndexError` should result in `default`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, (Ellipsis, 'fail'), default=1), 1,
-                         msg='if branched but not successful return `default` if defined, not `[]`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, (Ellipsis, 'fail'), default=None), None,
-                         msg='if branched but not successful return `default` even if `default` is `None`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, (Ellipsis, 'fail')), [],
-                         msg='if branched but not successful return `[]`, not `default`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, ('list', Ellipsis)), [],
-                         msg='if branched but object is empty return `[]`, not `default`')
-        self.assertEqual(traverse_obj(None, Ellipsis), [],
-                         msg='if branched but object is `None` return `[]`, not `default`')
-        self.assertEqual(traverse_obj({0: None}, (0, Ellipsis)), [],
-                         msg='if branched but state is `None` return `[]`, not `default`')
-
-        branching_paths = [
-            ('fail', Ellipsis),
-            (Ellipsis, 'fail'),
-            100 * ('fail',) + (Ellipsis,),
-            (Ellipsis,) + 100 * ('fail',),
-        ]
-        for branching_path in branching_paths:
-            self.assertEqual(traverse_obj({}, branching_path), [],
-                             msg='if branched but state is `None`, return `[]` (not `default`)')
-            self.assertEqual(traverse_obj({}, 'fail', branching_path), [],
-                             msg='if branching in last alternative and previous did not match, return `[]` (not `default`)')
-            self.assertEqual(traverse_obj({0: 'x'}, 0, branching_path), 'x',
-                             msg='if branching in last alternative and previous did match, return single value')
-            self.assertEqual(traverse_obj({0: 'x'}, branching_path, 0), 'x',
-                             msg='if branching in first alternative and non-branching path does match, return single value')
-            self.assertEqual(traverse_obj({}, branching_path, 'fail'), None,
-                             msg='if branching in first alternative and non-branching path does not match, return `default`')
-
-        # Testing expected_type behavior
-        _EXPECTED_TYPE_DATA = {'str': 'str', 'int': 0}
-        self.assertEqual(traverse_obj(_EXPECTED_TYPE_DATA, 'str', expected_type=str),
-                         'str', msg='accept matching `expected_type` type')
-        self.assertEqual(traverse_obj(_EXPECTED_TYPE_DATA, 'str', expected_type=int),
-                         None, msg='reject non-matching `expected_type` type')
-        self.assertEqual(traverse_obj(_EXPECTED_TYPE_DATA, 'int', expected_type=lambda x: str(x)),
-                         '0', msg='transform type using type function')
-        self.assertEqual(traverse_obj(_EXPECTED_TYPE_DATA, 'str', expected_type=lambda _: 1 / 0),
-                         None, msg='wrap expected_type function in try_call')
-        self.assertEqual(traverse_obj(_EXPECTED_TYPE_DATA, Ellipsis, expected_type=str),
-                         ['str'], msg='eliminate items that expected_type fails on')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 100, 1: 1.2}, expected_type=int),
-                         {0: 100}, msg='type as expected_type should filter dict values')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 100, 1: 1.2, 2: 'None'}, expected_type=str_or_none),
-                         {0: '100', 1: '1.2'}, msg='function as expected_type should transform dict values')
-        self.assertEqual(traverse_obj(_TEST_DATA, ({0: 1.2}, 0, set((int_or_none,))), expected_type=int),
-                         1, msg='expected_type should not filter non-final dict values')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: {0: 100, 1: 'str'}}, expected_type=int),
-                         {0: {0: 100}}, msg='expected_type should transform deep dict values')
-        self.assertEqual(traverse_obj(_TEST_DATA, [({0: '...'}, {0: '...'})], expected_type=type(Ellipsis)),
-                         [{0: Ellipsis}, {0: Ellipsis}], msg='expected_type should transform branched dict values')
-        self.assertEqual(traverse_obj({1: {3: 4}}, [(1, 2), 3], expected_type=int),
-                         [4], msg='expected_type regression for type matching in tuple branching')
-        self.assertEqual(traverse_obj(_TEST_DATA, ['data', Ellipsis], expected_type=int),
-                         [], msg='expected_type regression for type matching in dict result')
-
-        # Test get_all behavior
-        _GET_ALL_DATA = {'key': [0, 1, 2]}
-        self.assertEqual(traverse_obj(_GET_ALL_DATA, ('key', Ellipsis), get_all=False), 0,
-                         msg='if not `get_all`, return only first matching value')
-        self.assertEqual(traverse_obj(_GET_ALL_DATA, Ellipsis, get_all=False), [0, 1, 2],
-                         msg='do not overflatten if not `get_all`')
-
-        # Test casesense behavior
-        _CASESENSE_DATA = {
-            'KeY': 'value0',
-            0: {
-                'KeY': 'value1',
-                0: {'KeY': 'value2'},
-            },
-            # FULLWIDTH LATIN CAPITAL LETTER K
-            '\uff2bey': 'value3',
-        }
-        self.assertEqual(traverse_obj(_CASESENSE_DATA, 'key'), None,
-                         msg='dict keys should be case sensitive unless `casesense`')
-        self.assertEqual(traverse_obj(_CASESENSE_DATA, 'keY',
-                                      casesense=False), 'value0',
-                         msg='allow non matching key case if `casesense`')
-        self.assertEqual(traverse_obj(_CASESENSE_DATA, '\uff4bey',  # FULLWIDTH LATIN SMALL LETTER K
-                                      casesense=False), 'value3',
-                         msg='allow non matching Unicode key case if `casesense`')
-        self.assertEqual(traverse_obj(_CASESENSE_DATA, (0, ('keY',)),
-                                      casesense=False), ['value1'],
-                         msg='allow non matching key case in branch if `casesense`')
-        self.assertEqual(traverse_obj(_CASESENSE_DATA, (0, ((0, 'keY'),)),
-                                      casesense=False), ['value2'],
-                         msg='allow non matching key case in branch path if `casesense`')
-
-        # Test traverse_string behavior
-        _TRAVERSE_STRING_DATA = {'str': 'str', 1.2: 1.2}
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', 0)), None,
-                         msg='do not traverse into string if not `traverse_string`')
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', 0),
-                                      _traverse_string=True), 's',
-                         msg='traverse into string if `traverse_string`')
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, (1.2, 1),
-                                      _traverse_string=True), '.',
-                         msg='traverse into converted data if `traverse_string`')
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', Ellipsis),
-                                      _traverse_string=True), 'str',
-                         msg='`...` should result in string (same value) if `traverse_string`')
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', slice(0, None, 2)),
-                                      _traverse_string=True), 'sr',
-                         msg='`slice` should result in string if `traverse_string`')
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', lambda i, v: i or v == 's'),
-                                      _traverse_string=True), 'str',
-                         msg='function should result in string if `traverse_string`')
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', (0, 2)),
-                                      _traverse_string=True), ['s', 'r'],
-                         msg='branching should result in list if `traverse_string`')
-        self.assertEqual(traverse_obj({}, (0, Ellipsis), _traverse_string=True), [],
-                         msg='branching should result in list if `traverse_string`')
-        self.assertEqual(traverse_obj({}, (0, lambda x, y: True), _traverse_string=True), [],
-                         msg='branching should result in list if `traverse_string`')
-        self.assertEqual(traverse_obj({}, (0, slice(1)), _traverse_string=True), [],
-                         msg='branching should result in list if `traverse_string`')
-
-        # Test re.Match as input obj
-        mobj = re.match(r'^0(12)(?P<group>3)(4)?$', '0123')
-        self.assertEqual(traverse_obj(mobj, Ellipsis), [x for x in mobj.groups() if x is not None],
-                         msg='`...` on a `re.Match` should give its `groups()`')
-        self.assertEqual(traverse_obj(mobj, lambda k, _: k in (0, 2)), ['0123', '3'],
-                         msg='function on a `re.Match` should give groupno, value starting at 0')
-        self.assertEqual(traverse_obj(mobj, 'group'), '3',
-                         msg='str key on a `re.Match` should give group with that name')
-        self.assertEqual(traverse_obj(mobj, 2), '3',
-                         msg='int key on a `re.Match` should give group with that name')
-        self.assertEqual(traverse_obj(mobj, 'gRoUp', casesense=False), '3',
-                         msg='str key on a `re.Match` should respect casesense')
-        self.assertEqual(traverse_obj(mobj, 'fail'), None,
-                         msg='failing str key on a `re.Match` should return `default`')
-        self.assertEqual(traverse_obj(mobj, 'gRoUpS', casesense=False), None,
-                         msg='failing str key on a `re.Match` should return `default`')
-        self.assertEqual(traverse_obj(mobj, 8), None,
-                         msg='failing int key on a `re.Match` should return `default`')
-        self.assertEqual(traverse_obj(mobj, lambda k, _: k in (0, 'group')), ['0123', '3'],
-                         msg='function on a `re.Match` should give group name as well')
-
-        # Test xml.etree.ElementTree.Element as input obj
-        etree = compat_etree_fromstring('''<?xml version="1.0"?>
-        <data>
-            <country name="Liechtenstein">
-                <rank>1</rank>
-                <year>2008</year>
-                <gdppc>141100</gdppc>
-                <neighbor name="Austria" direction="E"/>
-                <neighbor name="Switzerland" direction="W"/>
-            </country>
-            <country name="Singapore">
-                <rank>4</rank>
-                <year>2011</year>
-                <gdppc>59900</gdppc>
-                <neighbor name="Malaysia" direction="N"/>
-            </country>
-            <country name="Panama">
-                <rank>68</rank>
-                <year>2011</year>
-                <gdppc>13600</gdppc>
-                <neighbor name="Costa Rica" direction="W"/>
-                <neighbor name="Colombia" direction="E"/>
-            </country>
-        </data>''')
-        self.assertEqual(traverse_obj(etree, ''), etree,
-                         msg='empty str key should return the element itself')
-        self.assertEqual(traverse_obj(etree, 'country'), list(etree),
-                         msg='str key should return all children with that tag name')
-        self.assertEqual(traverse_obj(etree, Ellipsis), list(etree),
-                         msg='`...` as key should return all children')
-        self.assertEqual(traverse_obj(etree, lambda _, x: x[0].text == '4'), [etree[1]],
-                         msg='function as key should get element as value')
-        self.assertEqual(traverse_obj(etree, lambda i, _: i == 1), [etree[1]],
-                         msg='function as key should get index as key')
-        self.assertEqual(traverse_obj(etree, 0), etree[0],
-                         msg='int key should return the nth child')
-        self.assertEqual(traverse_obj(etree, './/neighbor/@name'),
-                         ['Austria', 'Switzerland', 'Malaysia', 'Costa Rica', 'Colombia'],
-                         msg='`@<attribute>` at end of path should give that attribute')
-        self.assertEqual(traverse_obj(etree, '//neighbor/@fail'), [None, None, None, None, None],
-                         msg='`@<nonexistent>` at end of path should give `None`')
-        self.assertEqual(traverse_obj(etree, ('//neighbor/@', 2)), {'name': 'Malaysia', 'direction': 'N'},
-                         msg='`@` should give the full attribute dict')
-        self.assertEqual(traverse_obj(etree, '//year/text()'), ['2008', '2011', '2011'],
-                         msg='`text()` at end of path should give the inner text')
-        self.assertEqual(traverse_obj(etree, '//*[@direction]/@direction'), ['E', 'W', 'N', 'W', 'E'],
-                         msg='full python xpath features should be supported')
-        self.assertEqual(traverse_obj(etree, (0, '@name')), 'Liechtenstein',
-                         msg='special transformations should act on current element')
-        self.assertEqual(traverse_obj(etree, ('country', 0, Ellipsis, 'text()', T(int_or_none))), [1, 2008, 141100],
-                         msg='special transformations should act on current element')
-
-    def test_traversal_unbranching(self):
-        self.assertEqual(traverse_obj(_TEST_DATA, [(100, 1.2), all]), [100, 1.2],
-                         msg='`all` should give all results as list')
-        self.assertEqual(traverse_obj(_TEST_DATA, [(100, 1.2), any]), 100,
-                         msg='`any` should give the first result')
-        self.assertEqual(traverse_obj(_TEST_DATA, [100, all]), [100],
-                         msg='`all` should give list if non branching')
-        self.assertEqual(traverse_obj(_TEST_DATA, [100, any]), 100,
-                         msg='`any` should give single item if non branching')
-        self.assertEqual(traverse_obj(_TEST_DATA, [('dict', 'None', 100), all]), [100],
-                         msg='`all` should filter `None` and empty dict')
-        self.assertEqual(traverse_obj(_TEST_DATA, [('dict', 'None', 100), any]), 100,
-                         msg='`any` should filter `None` and empty dict')
-        self.assertEqual(traverse_obj(_TEST_DATA, [{
-            'all': [('dict', 'None', 100, 1.2), all],
-            'any': [('dict', 'None', 100, 1.2), any],
-        }]), {'all': [100, 1.2], 'any': 100},
-            msg='`all`/`any` should apply to each dict path separately')
-        self.assertEqual(traverse_obj(_TEST_DATA, [{
-            'all': [('dict', 'None', 100, 1.2), all],
-            'any': [('dict', 'None', 100, 1.2), any],
-        }], get_all=False), {'all': [100, 1.2], 'any': 100},
-            msg='`all`/`any` should apply to dict regardless of `get_all`')
-        self.assertIs(traverse_obj(_TEST_DATA, [('dict', 'None', 100, 1.2), all, T(float)]), None,
-                      msg='`all` should reset branching status')
-        self.assertIs(traverse_obj(_TEST_DATA, [('dict', 'None', 100, 1.2), any, T(float)]), None,
-                      msg='`any` should reset branching status')
-        self.assertEqual(traverse_obj(_TEST_DATA, [('dict', 'None', 100, 1.2), all, Ellipsis, T(float)]), [1.2],
-                         msg='`all` should allow further branching')
-        self.assertEqual(traverse_obj(_TEST_DATA, [('dict', 'None', 'urls', 'data'), any, Ellipsis, 'index']), [0, 1],
-                         msg='`any` should allow further branching')
-
-    def test_traversal_morsel(self):
-        values = {
-            'expires': 'a',
-            'path': 'b',
-            'comment': 'c',
-            'domain': 'd',
-            'max-age': 'e',
-            'secure': 'f',
-            'httponly': 'g',
-            'version': 'h',
-            'samesite': 'i',
-        }
-        # SameSite added in Py3.8, breaks .update for 3.5-3.7
-        if sys.version_info < (3, 8):
-            del values['samesite']
-        morsel = compat_http_cookies.Morsel()
-        morsel.set(str('item_key'), 'item_value', 'coded_value')
-        morsel.update(values)
-        values['key'] = str('item_key')
-        values['value'] = 'item_value'
-        values = dict((str(k), v) for k, v in values.items())
-        # make test pass even without ordered dict
-        value_set = set(values.values())
-
-        for key, value in values.items():
-            self.assertEqual(traverse_obj(morsel, key), value,
-                             msg='Morsel should provide access to all values')
-        self.assertEqual(set(traverse_obj(morsel, Ellipsis)), value_set,
-                         msg='`...` should yield all values')
-        self.assertEqual(set(traverse_obj(morsel, lambda k, v: True)), value_set,
-                         msg='function key should yield all values')
-        self.assertIs(traverse_obj(morsel, [(None,), any]), morsel,
-                      msg='Morsel should not be implicitly changed to dict on usage')
-
-    def test_get_first(self):
-        self.assertEqual(get_first([{'a': None}, {'a': 'spam'}], 'a'), 'spam')
-
-    def test_dict_get(self):
-        FALSE_VALUES = {
-            'none': None,
-            'false': False,
-            'zero': 0,
-            'empty_string': '',
-            'empty_list': [],
-        }
-        d = FALSE_VALUES.copy()
-        d['a'] = 42
-        self.assertEqual(dict_get(d, 'a'), 42)
-        self.assertEqual(dict_get(d, 'b'), None)
-        self.assertEqual(dict_get(d, 'b', 42), 42)
-        self.assertEqual(dict_get(d, ('a', )), 42)
-        self.assertEqual(dict_get(d, ('b', 'a', )), 42)
-        self.assertEqual(dict_get(d, ('b', 'c', 'a', 'd', )), 42)
-        self.assertEqual(dict_get(d, ('b', 'c', )), None)
-        self.assertEqual(dict_get(d, ('b', 'c', ), 42), 42)
-        for key, false_value in FALSE_VALUES.items():
-            self.assertEqual(dict_get(d, ('b', 'c', key, )), None)
-            self.assertEqual(dict_get(d, ('b', 'c', key, ), skip_false_values=False), false_value)
-
-
-if __name__ == '__main__':
-    unittest.main()

test/test_unicode_literals.py

@@ -2,21 +2,19 @@ from __future__ import unicode_literals
 
 # Allow direct execution
 import os
-import re
 import sys
 import unittest
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-dirn = os.path.dirname
+import io
+import re
 
-rootDir = dirn(dirn(os.path.abspath(__file__)))
+rootDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-
-sys.path.insert(0, rootDir)
 
 IGNORED_FILES = [
     'setup.py',  # http://bugs.python.org/issue13943
     'conf.py',
     'buildserver.py',
-    'get-pip.py',
 ]
 
 IGNORED_DIRS = [
@@ -25,7 +23,6 @@ IGNORED_DIRS = [
 ]
 
 from test.helper import assertRegexpMatches
-from youtube_dl.compat import compat_open as open
 
 
 class TestUnicodeLiterals(unittest.TestCase):
@@ -43,7 +40,7 @@ class TestUnicodeLiterals(unittest.TestCase):
                     continue
 
                 fn = os.path.join(dirpath, basename)
-                with open(fn, encoding='utf-8') as inf:
+                with io.open(fn, encoding='utf-8') as inf:
                     code = inf.read()
 
                 if "'" not in code and '"' not in code:

test/test_utils.py

@@ -12,16 +12,13 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 # Various small unit tests
 import io
-import itertools
 import json
-import types
 import xml.etree.ElementTree
 
 from youtube_dl.utils import (
-    _UnsafeExtensionError,
     age_restricted,
     args_to_str,
-    base_url,
+    encode_base_n,
     caesar,
     clean_html,
     clean_podcast_url,
@@ -29,12 +26,11 @@ from youtube_dl.utils import (
     DateRange,
     detect_exe_version,
     determine_ext,
-    encode_base_n,
+    dict_get,
     encode_compat_str,
     encodeFilename,
     escape_rfc3986,
     escape_url,
-    expand_path,
     extract_attributes,
     ExtractorError,
     find_xpath_attr,
@@ -48,11 +44,8 @@ from youtube_dl.utils import (
     int_or_none,
     intlist_to_bytes,
     is_html,
-    join_nonempty,
     js_to_json,
-    LazyList,
     limit_length,
-    lowercase_escape,
     merge_dicts,
     mimetype2ext,
     month_by_name,
@@ -61,26 +54,24 @@ from youtube_dl.utils import (
     OnDemandPagedList,
     orderedSet,
     parse_age_limit,
-    parse_bitrate,
     parse_duration,
     parse_filesize,
-    parse_codecs,
     parse_count,
     parse_iso8601,
     parse_resolution,
-    parse_qs,
+    parse_bitrate,
     pkcs1pad,
-    prepend_extension,
     read_batch_urls,
-    remove_start,
-    remove_end,
-    remove_quotes,
-    replace_extension,
-    rot47,
     sanitize_filename,
     sanitize_path,
     sanitize_url,
-    sanitized_Request,
+    expand_path,
+    prepend_extension,
+    replace_extension,
+    remove_start,
+    remove_end,
+    remove_quotes,
+    rot47,
     shell_quote,
     smuggle_url,
     str_to_int,
@@ -88,19 +79,19 @@ from youtube_dl.utils import (
     strip_or_none,
     subtitles_filename,
     timeconvert,
-    try_call,
     unescapeHTML,
     unified_strdate,
     unified_timestamp,
     unsmuggle_url,
     uppercase_escape,
+    lowercase_escape,
     url_basename,
     url_or_none,
+    base_url,
     urljoin,
     urlencode_postdata,
     urshift,
     update_url_query,
-    variadic,
     version_tuple,
     xpath_with_ns,
     xpath_element,
@@ -113,7 +104,7 @@ from youtube_dl.utils import (
     cli_option,
     cli_valueless_option,
     cli_bool_option,
-    YoutubeDLHandler,
+    parse_codecs,
 )
 from youtube_dl.compat import (
     compat_chr,
@@ -121,13 +112,12 @@ from youtube_dl.compat import (
     compat_getenv,
     compat_os_name,
     compat_setenv,
-    compat_str,
     compat_urlparse,
+    compat_parse_qs,
 )
 
 
 class TestUtil(unittest.TestCase):
-
     def test_timeconvert(self):
         self.assertTrue(timeconvert('') is None)
         self.assertTrue(timeconvert('bougrg') is None)
@@ -246,19 +236,6 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(sanitize_url('httpss://foo.bar'), 'https://foo.bar')
         self.assertEqual(sanitize_url('rmtps://foo.bar'), 'rtmps://foo.bar')
         self.assertEqual(sanitize_url('https://foo.bar'), 'https://foo.bar')
-        self.assertEqual(sanitize_url('foo bar'), 'foo bar')
-
-    def test_sanitized_Request(self):
-        self.assertFalse(sanitized_Request('http://foo.bar').has_header('Authorization'))
-        self.assertFalse(sanitized_Request('http://:foo.bar').has_header('Authorization'))
-        self.assertEqual(sanitized_Request('http://@foo.bar').get_header('Authorization'),
-                         'Basic Og==')
-        self.assertEqual(sanitized_Request('http://:pass@foo.bar').get_header('Authorization'),
-                         'Basic OnBhc3M=')
-        self.assertEqual(sanitized_Request('http://user:@foo.bar').get_header('Authorization'),
-                         'Basic dXNlcjo=')
-        self.assertEqual(sanitized_Request('http://user:pass@foo.bar').get_header('Authorization'),
-                         'Basic dXNlcjpwYXNz')
 
     def test_expand_path(self):
         def env(var):
@@ -272,27 +249,6 @@ class TestUtil(unittest.TestCase):
             expand_path('~/%s' % env('YOUTUBE_DL_EXPATH_PATH')),
             '%s/expanded' % compat_getenv('HOME'))
 
-    _uncommon_extensions = [
-        ('exe', 'abc.exe.ext'),
-        ('de', 'abc.de.ext'),
-        ('../.mp4', None),
-        ('..\\.mp4', None),
-    ]
-
-    def assertUnsafeExtension(self, ext=None):
-        assert_raises = self.assertRaises(_UnsafeExtensionError)
-        assert_raises.ext = ext
-        orig_exit = assert_raises.__exit__
-
-        def my_exit(self_, exc_type, exc_val, exc_tb):
-            did_raise = orig_exit(exc_type, exc_val, exc_tb)
-            if did_raise and assert_raises.ext is not None:
-                self.assertEqual(assert_raises.ext, assert_raises.exception.extension, 'Unsafe extension  not as unexpected')
-            return did_raise
-
-        assert_raises.__exit__ = types.MethodType(my_exit, assert_raises)
-        return assert_raises
-
     def test_prepend_extension(self):
         self.assertEqual(prepend_extension('abc.ext', 'temp'), 'abc.temp.ext')
         self.assertEqual(prepend_extension('abc.ext', 'temp', 'ext'), 'abc.temp.ext')
@@ -301,19 +257,6 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(prepend_extension('.abc', 'temp'), '.abc.temp')
         self.assertEqual(prepend_extension('.abc.ext', 'temp'), '.abc.temp.ext')
 
-        # Test uncommon extensions
-        self.assertEqual(prepend_extension('abc.ext', 'bin'), 'abc.bin.ext')
-        for ext, result in self._uncommon_extensions:
-            with self.assertUnsafeExtension(ext):
-                prepend_extension('abc', ext)
-            if result:
-                self.assertEqual(prepend_extension('abc.ext', ext, 'ext'), result)
-            else:
-                with self.assertUnsafeExtension(ext):
-                    prepend_extension('abc.ext', ext, 'ext')
-            with self.assertUnsafeExtension(ext):
-                prepend_extension('abc.unexpected_ext', ext, 'ext')
-
     def test_replace_extension(self):
         self.assertEqual(replace_extension('abc.ext', 'temp'), 'abc.temp')
         self.assertEqual(replace_extension('abc.ext', 'temp', 'ext'), 'abc.temp')
@@ -322,16 +265,6 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(replace_extension('.abc', 'temp'), '.abc.temp')
         self.assertEqual(replace_extension('.abc.ext', 'temp'), '.abc.temp')
 
-        # Test uncommon extensions
-        self.assertEqual(replace_extension('abc.ext', 'bin'), 'abc.unknown_video')
-        for ext, _ in self._uncommon_extensions:
-            with self.assertUnsafeExtension(ext):
-                replace_extension('abc', ext)
-            with self.assertUnsafeExtension(ext):
-                replace_extension('abc.ext', ext, 'ext')
-            with self.assertUnsafeExtension(ext):
-                replace_extension('abc.unexpected_ext', ext, 'ext')
-
     def test_subtitles_filename(self):
         self.assertEqual(subtitles_filename('abc.ext', 'en', 'vtt'), 'abc.en.vtt')
         self.assertEqual(subtitles_filename('abc.ext', 'en', 'vtt', 'ext'), 'abc.en.vtt')
@@ -437,9 +370,6 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(unified_timestamp('Sep 11, 2013 | 5:49 AM'), 1378878540)
         self.assertEqual(unified_timestamp('December 15, 2017 at 7:49 am'), 1513324140)
         self.assertEqual(unified_timestamp('2018-03-14T08:32:43.1493874+00:00'), 1521016363)
-        self.assertEqual(unified_timestamp('December 31 1969 20:00:01 EDT'), 1)
-        self.assertEqual(unified_timestamp('Wednesday 31 December 1969 18:01:26 MDT'), 86)
-        self.assertEqual(unified_timestamp('12/31/1969 20:01:18 EDT', False), 78)
 
     def test_determine_ext(self):
         self.assertEqual(determine_ext('http://example.com/foo/bar.mp4/?download'), 'mp4')
@@ -561,14 +491,11 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(float_or_none(set()), None)
 
     def test_int_or_none(self):
-        self.assertEqual(int_or_none(42), 42)
         self.assertEqual(int_or_none('42'), 42)
         self.assertEqual(int_or_none(''), None)
         self.assertEqual(int_or_none(None), None)
         self.assertEqual(int_or_none([]), None)
         self.assertEqual(int_or_none(set()), None)
-        self.assertEqual(int_or_none('42', base=8), 34)
-        self.assertRaises(TypeError, int_or_none(42, base=8))
 
     def test_str_to_int(self):
         self.assertEqual(str_to_int('123,456'), 123456)
@@ -735,36 +662,38 @@ class TestUtil(unittest.TestCase):
         self.assertTrue(isinstance(data, bytes))
 
     def test_update_url_query(self):
-        self.assertEqual(parse_qs(update_url_query(
+        def query_dict(url):
+            return compat_parse_qs(compat_urlparse.urlparse(url).query)
+        self.assertEqual(query_dict(update_url_query(
             'http://example.com/path', {'quality': ['HD'], 'format': ['mp4']})),
-            parse_qs('http://example.com/path?quality=HD&format=mp4'))
+            query_dict('http://example.com/path?quality=HD&format=mp4'))
-        self.assertEqual(parse_qs(update_url_query(
+        self.assertEqual(query_dict(update_url_query(
             'http://example.com/path', {'system': ['LINUX', 'WINDOWS']})),
-            parse_qs('http://example.com/path?system=LINUX&system=WINDOWS'))
+            query_dict('http://example.com/path?system=LINUX&system=WINDOWS'))
-        self.assertEqual(parse_qs(update_url_query(
+        self.assertEqual(query_dict(update_url_query(
             'http://example.com/path', {'fields': 'id,formats,subtitles'})),
-            parse_qs('http://example.com/path?fields=id,formats,subtitles'))
+            query_dict('http://example.com/path?fields=id,formats,subtitles'))
-        self.assertEqual(parse_qs(update_url_query(
+        self.assertEqual(query_dict(update_url_query(
             'http://example.com/path', {'fields': ('id,formats,subtitles', 'thumbnails')})),
-            parse_qs('http://example.com/path?fields=id,formats,subtitles&fields=thumbnails'))
+            query_dict('http://example.com/path?fields=id,formats,subtitles&fields=thumbnails'))
-        self.assertEqual(parse_qs(update_url_query(
+        self.assertEqual(query_dict(update_url_query(
             'http://example.com/path?manifest=f4m', {'manifest': []})),
-            parse_qs('http://example.com/path'))
+            query_dict('http://example.com/path'))
-        self.assertEqual(parse_qs(update_url_query(
+        self.assertEqual(query_dict(update_url_query(
             'http://example.com/path?system=LINUX&system=WINDOWS', {'system': 'LINUX'})),
-            parse_qs('http://example.com/path?system=LINUX'))
+            query_dict('http://example.com/path?system=LINUX'))
-        self.assertEqual(parse_qs(update_url_query(
+        self.assertEqual(query_dict(update_url_query(
             'http://example.com/path', {'fields': b'id,formats,subtitles'})),
-            parse_qs('http://example.com/path?fields=id,formats,subtitles'))
+            query_dict('http://example.com/path?fields=id,formats,subtitles'))
-        self.assertEqual(parse_qs(update_url_query(
+        self.assertEqual(query_dict(update_url_query(
             'http://example.com/path', {'width': 1080, 'height': 720})),
-            parse_qs('http://example.com/path?width=1080&height=720'))
+            query_dict('http://example.com/path?width=1080&height=720'))
-        self.assertEqual(parse_qs(update_url_query(
+        self.assertEqual(query_dict(update_url_query(
             'http://example.com/path', {'bitrate': 5020.43})),
-            parse_qs('http://example.com/path?bitrate=5020.43'))
+            query_dict('http://example.com/path?bitrate=5020.43'))
-        self.assertEqual(parse_qs(update_url_query(
+        self.assertEqual(query_dict(update_url_query(
             'http://example.com/path', {'test': '第二行тест'})),
-            parse_qs('http://example.com/path?test=%E7%AC%AC%E4%BA%8C%E8%A1%8C%D1%82%D0%B5%D1%81%D1%82'))
+            query_dict('http://example.com/path?test=%E7%AC%AC%E4%BA%8C%E8%A1%8C%D1%82%D0%B5%D1%81%D1%82'))
 
     def test_multipart_encode(self):
         self.assertEqual(
@@ -776,6 +705,28 @@ class TestUtil(unittest.TestCase):
         self.assertRaises(
             ValueError, multipart_encode, {b'field': b'value'}, boundary='value')
 
+    def test_dict_get(self):
+        FALSE_VALUES = {
+            'none': None,
+            'false': False,
+            'zero': 0,
+            'empty_string': '',
+            'empty_list': [],
+        }
+        d = FALSE_VALUES.copy()
+        d['a'] = 42
+        self.assertEqual(dict_get(d, 'a'), 42)
+        self.assertEqual(dict_get(d, 'b'), None)
+        self.assertEqual(dict_get(d, 'b', 42), 42)
+        self.assertEqual(dict_get(d, ('a', )), 42)
+        self.assertEqual(dict_get(d, ('b', 'a', )), 42)
+        self.assertEqual(dict_get(d, ('b', 'c', 'a', 'd', )), 42)
+        self.assertEqual(dict_get(d, ('b', 'c', )), None)
+        self.assertEqual(dict_get(d, ('b', 'c', ), 42), 42)
+        for key, false_value in FALSE_VALUES.items():
+            self.assertEqual(dict_get(d, ('b', 'c', key, )), None)
+            self.assertEqual(dict_get(d, ('b', 'c', key, ), skip_false_values=False), false_value)
+
     def test_merge_dicts(self):
         self.assertEqual(merge_dicts({'a': 1}, {'b': 2}), {'a': 1, 'b': 2})
         self.assertEqual(merge_dicts({'a': 1}, {'a': 2}), {'a': 1})
@@ -934,111 +885,6 @@ class TestUtil(unittest.TestCase):
         )
         self.assertEqual(escape_url('http://vimeo.com/56015672#at=0'), 'http://vimeo.com/56015672#at=0')
 
-    def test_remove_dot_segments(self):
-
-        def remove_dot_segments(p):
-            q = '' if p.startswith('/') else '/'
-            p = 'http://example.com' + q + p
-            p = compat_urlparse.urlsplit(YoutubeDLHandler._fix_path(p)).path
-            return p[1:] if q else p
-
-        self.assertEqual(remove_dot_segments('/a/b/c/./../../g'), '/a/g')
-        self.assertEqual(remove_dot_segments('mid/content=5/../6'), 'mid/6')
-        self.assertEqual(remove_dot_segments('/ad/../cd'), '/cd')
-        self.assertEqual(remove_dot_segments('/ad/../cd/'), '/cd/')
-        self.assertEqual(remove_dot_segments('/..'), '/')
-        self.assertEqual(remove_dot_segments('/./'), '/')
-        self.assertEqual(remove_dot_segments('/./a'), '/a')
-        self.assertEqual(remove_dot_segments('/abc/./.././d/././e/.././f/./../../ghi'), '/ghi')
-        self.assertEqual(remove_dot_segments('/'), '/')
-        self.assertEqual(remove_dot_segments('/t'), '/t')
-        self.assertEqual(remove_dot_segments('t'), 't')
-        self.assertEqual(remove_dot_segments(''), '')
-        self.assertEqual(remove_dot_segments('/../a/b/c'), '/a/b/c')
-        self.assertEqual(remove_dot_segments('../a'), 'a')
-        self.assertEqual(remove_dot_segments('./a'), 'a')
-        self.assertEqual(remove_dot_segments('.'), '')
-        self.assertEqual(remove_dot_segments('////'), '////')
-
-    def test_js_to_json_vars_strings(self):
-        self.assertDictEqual(
-            json.loads(js_to_json(
-                '''{
-                    'null': a,
-                    'nullStr': b,
-                    'true': c,
-                    'trueStr': d,
-                    'false': e,
-                    'falseStr': f,
-                    'unresolvedVar': g,
-                }''',
-                {
-                    'a': 'null',
-                    'b': '"null"',
-                    'c': 'true',
-                    'd': '"true"',
-                    'e': 'false',
-                    'f': '"false"',
-                    'g': 'var',
-                }
-            )),
-            {
-                'null': None,
-                'nullStr': 'null',
-                'true': True,
-                'trueStr': 'true',
-                'false': False,
-                'falseStr': 'false',
-                'unresolvedVar': 'var'
-            }
-        )
-
-        self.assertDictEqual(
-            json.loads(js_to_json(
-                '''{
-                    'int': a,
-                    'intStr': b,
-                    'float': c,
-                    'floatStr': d,
-                }''',
-                {
-                    'a': '123',
-                    'b': '"123"',
-                    'c': '1.23',
-                    'd': '"1.23"',
-                }
-            )),
-            {
-                'int': 123,
-                'intStr': '123',
-                'float': 1.23,
-                'floatStr': '1.23',
-            }
-        )
-
-        self.assertDictEqual(
-            json.loads(js_to_json(
-                '''{
-                    'object': a,
-                    'objectStr': b,
-                    'array': c,
-                    'arrayStr': d,
-                }''',
-                {
-                    'a': '{}',
-                    'b': '"{}"',
-                    'c': '[]',
-                    'd': '"[]"',
-                }
-            )),
-            {
-                'object': {},
-                'objectStr': '{}',
-                'array': [],
-                'arrayStr': '[]',
-            }
-        )
-
     def test_js_to_json_realworld(self):
         inp = '''{
             'clip':{'provider':'pseudo'}
@@ -1109,10 +955,10 @@ class TestUtil(unittest.TestCase):
             !42: 42
         }''')
         self.assertEqual(json.loads(on), {
-            'a': True,
+            'a': 0,
-            'b': False,
+            'b': 1,
-            'c': False,
+            'c': 0,
-            'd': True,
+            'd': 42.42,
             'e': [],
             'f': "abc",
             'g': "",
@@ -1182,26 +1028,10 @@ class TestUtil(unittest.TestCase):
         on = js_to_json('{ "040": "040" }')
         self.assertEqual(json.loads(on), {'040': '040'})
 
-        on = js_to_json('[1,//{},\n2]')
-        self.assertEqual(json.loads(on), [1, 2])
-
-        on = js_to_json(r'"\^\$\#"')
-        self.assertEqual(json.loads(on), R'^$#', msg='Unnecessary escapes should be stripped')
-
-        on = js_to_json('\'"\\""\'')
-        self.assertEqual(json.loads(on), '"""', msg='Unnecessary quote escape should be escaped')
-
     def test_js_to_json_malformed(self):
         self.assertEqual(js_to_json('42a1'), '42"a1"')
         self.assertEqual(js_to_json('42a-1'), '42"a"-1')
 
-    def test_js_to_json_template_literal(self):
-        self.assertEqual(js_to_json('`Hello ${name}`', {'name': '"world"'}), '"Hello world"')
-        self.assertEqual(js_to_json('`${name}${name}`', {'name': '"X"'}), '"XX"')
-        self.assertEqual(js_to_json('`${name}${name}`', {'name': '5'}), '"55"')
-        self.assertEqual(js_to_json('`${name}"${name}"`', {'name': '5'}), '"5\\"5\\""')
-        self.assertEqual(js_to_json('`${name}`', {}), '"name"')
-
     def test_extract_attributes(self):
         self.assertEqual(extract_attributes('<e x="y">'), {'x': 'y'})
         self.assertEqual(extract_attributes("<e x='y'>"), {'x': 'y'})
@@ -1645,84 +1475,6 @@ Line 1
         self.assertEqual(clean_podcast_url('https://www.podtrac.com/pts/redirect.mp3/chtbl.com/track/5899E/traffic.megaphone.fm/HSW7835899191.mp3'), 'https://traffic.megaphone.fm/HSW7835899191.mp3')
         self.assertEqual(clean_podcast_url('https://play.podtrac.com/npr-344098539/edge1.pod.npr.org/anon.npr-podcasts/podcast/npr/waitwait/2020/10/20201003_waitwait_wwdtmpodcast201003-015621a5-f035-4eca-a9a1-7c118d90bc3c.mp3'), 'https://edge1.pod.npr.org/anon.npr-podcasts/podcast/npr/waitwait/2020/10/20201003_waitwait_wwdtmpodcast201003-015621a5-f035-4eca-a9a1-7c118d90bc3c.mp3')
 
-    def test_LazyList(self):
-        it = list(range(10))
-
-        self.assertEqual(list(LazyList(it)), it)
-        self.assertEqual(LazyList(it).exhaust(), it)
-        self.assertEqual(LazyList(it)[5], it[5])
-
-        self.assertEqual(LazyList(it)[5:], it[5:])
-        self.assertEqual(LazyList(it)[:5], it[:5])
-        self.assertEqual(LazyList(it)[::2], it[::2])
-        self.assertEqual(LazyList(it)[1::2], it[1::2])
-        self.assertEqual(LazyList(it)[5::-1], it[5::-1])
-        self.assertEqual(LazyList(it)[6:2:-2], it[6:2:-2])
-        self.assertEqual(LazyList(it)[::-1], it[::-1])
-
-        self.assertTrue(LazyList(it))
-        self.assertFalse(LazyList(range(0)))
-        self.assertEqual(len(LazyList(it)), len(it))
-        self.assertEqual(repr(LazyList(it)), repr(it))
-        self.assertEqual(compat_str(LazyList(it)), compat_str(it))
-
-        self.assertEqual(list(LazyList(it, reverse=True)), it[::-1])
-        self.assertEqual(list(reversed(LazyList(it))[::-1]), it)
-        self.assertEqual(list(reversed(LazyList(it))[1:3:7]), it[::-1][1:3:7])
-
-    def test_LazyList_laziness(self):
-
-        def test(ll, idx, val, cache):
-            self.assertEqual(ll[idx], val)
-            self.assertEqual(ll._cache, list(cache))
-
-        ll = LazyList(range(10))
-        test(ll, 0, 0, range(1))
-        test(ll, 5, 5, range(6))
-        test(ll, -3, 7, range(10))
-
-        ll = LazyList(range(10), reverse=True)
-        test(ll, -1, 0, range(1))
-        test(ll, 3, 6, range(10))
-
-        ll = LazyList(itertools.count())
-        test(ll, 10, 10, range(11))
-        ll = reversed(ll)
-        test(ll, -15, 14, range(15))
-
-    def test_try_call(self):
-        def total(*x, **kwargs):
-            return sum(x) + sum(kwargs.values())
-
-        self.assertEqual(try_call(None), None,
-                         msg='not a fn should give None')
-        self.assertEqual(try_call(lambda: 1), 1,
-                         msg='int fn with no expected_type should give int')
-        self.assertEqual(try_call(lambda: 1, expected_type=int), 1,
-                         msg='int fn with expected_type int should give int')
-        self.assertEqual(try_call(lambda: 1, expected_type=dict), None,
-                         msg='int fn with wrong expected_type should give None')
-        self.assertEqual(try_call(total, args=(0, 1, 0, ), expected_type=int), 1,
-                         msg='fn should accept arglist')
-        self.assertEqual(try_call(total, kwargs={'a': 0, 'b': 1, 'c': 0}, expected_type=int), 1,
-                         msg='fn should accept kwargs')
-        self.assertEqual(try_call(lambda: 1, expected_type=dict), None,
-                         msg='int fn with no expected_type should give None')
-        self.assertEqual(try_call(lambda x: {}, total, args=(42, ), expected_type=int), 42,
-                         msg='expect first int result with expected_type int')
-
-    def test_variadic(self):
-        self.assertEqual(variadic(None), (None, ))
-        self.assertEqual(variadic('spam'), ('spam', ))
-        self.assertEqual(variadic('spam', allowed_types=dict), 'spam')
-        self.assertEqual(variadic('spam', allowed_types=[dict]), 'spam')
-
-    def test_join_nonempty(self):
-        self.assertEqual(join_nonempty('a', 'b'), 'a-b')
-        self.assertEqual(join_nonempty(
-            'a', 'b', 'c', 'd',
-            from_dict={'a': 'c', 'c': [], 'b': 'd', 'd': None}), 'c-d')
-
 
 if __name__ == '__main__':
     unittest.main()

test/test_write_annotations.py

@@ -11,11 +11,12 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 from test.helper import get_params, try_rm
 
 
+import io
+
 import xml.etree.ElementTree
 
 import youtube_dl.YoutubeDL
 import youtube_dl.extractor
-from youtube_dl.compat import compat_open as open
 
 
 class YoutubeDL(youtube_dl.YoutubeDL):
@@ -50,7 +51,7 @@ class TestAnnotations(unittest.TestCase):
         ydl.download([TEST_ID])
         self.assertTrue(os.path.exists(ANNOTATIONS_FILE))
         annoxml = None
-        with open(ANNOTATIONS_FILE, 'r', encoding='utf-8') as annof:
+        with io.open(ANNOTATIONS_FILE, 'r', encoding='utf-8') as annof:
             annoxml = xml.etree.ElementTree.parse(annof)
         self.assertTrue(annoxml is not None, 'Failed to parse annotations XML')
         root = annoxml.getroot()

test/test_youtube_lists.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
 # Allow direct execution
@@ -10,10 +9,11 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from test.helper import FakeYDL
 
+
 from youtube_dl.extractor import (
-    YoutubeIE,
     YoutubePlaylistIE,
     YoutubeTabIE,
+    YoutubeIE,
 )
 
 
@@ -25,23 +25,38 @@ class TestYoutubeLists(unittest.TestCase):
     def test_youtube_playlist_noplaylist(self):
         dl = FakeYDL()
         dl.params['noplaylist'] = True
-        dl.params['format'] = 'best'
         ie = YoutubePlaylistIE(dl)
         result = ie.extract('https://www.youtube.com/watch?v=FXxLjLQi3Fg&list=PLwiyx1dc3P2JR9N8gQaQN_BCvlSlap7re')
         self.assertEqual(result['_type'], 'url')
-        result = dl.extract_info(result['url'], download=False, ie_key=result.get('ie_key'), process=False)
         self.assertEqual(YoutubeIE().extract_id(result['url']), 'FXxLjLQi3Fg')
 
+    def test_youtube_course(self):
+        dl = FakeYDL()
+        ie = YoutubePlaylistIE(dl)
+        # TODO find a > 100 (paginating?) videos course
+        result = ie.extract('https://www.youtube.com/course?list=ECUl4u3cNGP61MdtwGTqZA0MreSaDybji8')
+        entries = list(result['entries'])
+        self.assertEqual(YoutubeIE().extract_id(entries[0]['url']), 'j9WZyLZCBzs')
+        self.assertEqual(len(entries), 25)
+        self.assertEqual(YoutubeIE().extract_id(entries[-1]['url']), 'rYefUsYuEp0')
+
     def test_youtube_mix(self):
         dl = FakeYDL()
-        dl.params['format'] = 'best'
+        ie = YoutubePlaylistIE(dl)
-        ie = YoutubeTabIE(dl)
+        result = ie.extract('https://www.youtube.com/watch?v=W01L70IGBgE&index=2&list=RDOQpdSVF_k_w')
-        result = dl.extract_info('https://www.youtube.com/watch?v=tyITL_exICo&list=RDCLAK5uy_kLWIr9gv1XLlPbaDS965-Db4TrBoUTxQ8',
+        entries = result['entries']
-                                 download=False, ie_key=ie.ie_key(), process=True)
+        self.assertTrue(len(entries) >= 50)
-        entries = (result or {}).get('entries', [{'id': 'not_found', }])
-        self.assertTrue(len(entries) >= 25)
         original_video = entries[0]
-        self.assertEqual(original_video['id'], 'tyITL_exICo')
+        self.assertEqual(original_video['id'], 'OQpdSVF_k_w')
+
+    def test_youtube_toptracks(self):
+        print('Skipping: The playlist page gives error 500')
+        return
+        dl = FakeYDL()
+        ie = YoutubePlaylistIE(dl)
+        result = ie.extract('https://www.youtube.com/playlist?list=MCUS')
+        entries = result['entries']
+        self.assertEqual(len(entries), 100)
 
     def test_youtube_flat_playlist_extraction(self):
         dl = FakeYDL()
@@ -52,7 +67,7 @@ class TestYoutubeLists(unittest.TestCase):
         entries = list(result['entries'])
         self.assertTrue(len(entries) == 1)
         video = entries[0]
-        self.assertEqual(video['_type'], 'url')
+        self.assertEqual(video['_type'], 'url_transparent')
         self.assertEqual(video['ie_key'], 'Youtube')
         self.assertEqual(video['id'], 'BaW_jenozKc')
         self.assertEqual(video['url'], 'BaW_jenozKc')

test/test_youtube_misc.py

@@ -1,26 +0,0 @@
-#!/usr/bin/env python
-from __future__ import unicode_literals
-
-# Allow direct execution
-import os
-import sys
-import unittest
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-
-from youtube_dl.extractor import YoutubeIE
-
-
-class TestYoutubeMisc(unittest.TestCase):
-    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')
-
-
-if __name__ == '__main__':
-    unittest.main()

test/test_youtube_signature.py

@@ -8,20 +8,15 @@ import sys
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
+import io
 import re
 import string
 
-from youtube_dl.compat import (
-    compat_open as open,
-    compat_str,
-    compat_urlretrieve,
-)
-
 from test.helper import FakeYDL
 from youtube_dl.extractor import YoutubeIE
-from youtube_dl.jsinterp import JSInterpreter
+from youtube_dl.compat import compat_str, compat_urlretrieve
 
-_SIG_TESTS = [
+_TESTS = [
     (
         'https://s.ytimg.com/yts/jsbin/html5player-vflHOr_nV.js',
         86,
@@ -69,126 +64,10 @@ _SIG_TESTS = [
     )
 ]
 
-_NSIG_TESTS = [
-    (
-        'https://www.youtube.com/s/player/7862ca1f/player_ias.vflset/en_US/base.js',
-        'X_LCxVDjAavgE5t', 'yxJ1dM6iz5ogUg',
-    ),
-    (
-        'https://www.youtube.com/s/player/9216d1f7/player_ias.vflset/en_US/base.js',
-        'SLp9F5bwjAdhE9F-', 'gWnb9IK2DJ8Q1w',
-    ),
-    (
-        'https://www.youtube.com/s/player/f8cb7a3b/player_ias.vflset/en_US/base.js',
-        'oBo2h5euWy6osrUt', 'ivXHpm7qJjJN',
-    ),
-    (
-        'https://www.youtube.com/s/player/2dfe380c/player_ias.vflset/en_US/base.js',
-        'oBo2h5euWy6osrUt', '3DIBbn3qdQ',
-    ),
-    (
-        'https://www.youtube.com/s/player/f1ca6900/player_ias.vflset/en_US/base.js',
-        'cu3wyu6LQn2hse', 'jvxetvmlI9AN9Q',
-    ),
-    (
-        'https://www.youtube.com/s/player/8040e515/player_ias.vflset/en_US/base.js',
-        'wvOFaY-yjgDuIEg5', 'HkfBFDHmgw4rsw',
-    ),
-    (
-        'https://www.youtube.com/s/player/e06dea74/player_ias.vflset/en_US/base.js',
-        'AiuodmaDDYw8d3y4bf', 'ankd8eza2T6Qmw',
-    ),
-    (
-        'https://www.youtube.com/s/player/5dd88d1d/player-plasma-ias-phone-en_US.vflset/base.js',
-        'kSxKFLeqzv_ZyHSAt', 'n8gS8oRlHOxPFA',
-    ),
-    (
-        'https://www.youtube.com/s/player/324f67b9/player_ias.vflset/en_US/base.js',
-        'xdftNy7dh9QGnhW', '22qLGxrmX8F1rA',
-    ),
-    (
-        'https://www.youtube.com/s/player/4c3f79c5/player_ias.vflset/en_US/base.js',
-        'TDCstCG66tEAO5pR9o', 'dbxNtZ14c-yWyw',
-    ),
-    (
-        'https://www.youtube.com/s/player/c81bbb4a/player_ias.vflset/en_US/base.js',
-        'gre3EcLurNY2vqp94', 'Z9DfGxWP115WTg',
-    ),
-    (
-        'https://www.youtube.com/s/player/1f7d5369/player_ias.vflset/en_US/base.js',
-        'batNX7sYqIJdkJ', 'IhOkL_zxbkOZBw',
-    ),
-    (
-        'https://www.youtube.com/s/player/009f1d77/player_ias.vflset/en_US/base.js',
-        '5dwFHw8aFWQUQtffRq', 'audescmLUzI3jw',
-    ),
-    (
-        'https://www.youtube.com/s/player/dc0c6770/player_ias.vflset/en_US/base.js',
-        '5EHDMgYLV6HPGk_Mu-kk', 'n9lUJLHbxUI0GQ',
-    ),
-    (
-        'https://www.youtube.com/s/player/c2199353/player_ias.vflset/en_US/base.js',
-        '5EHDMgYLV6HPGk_Mu-kk', 'AD5rgS85EkrE7',
-    ),
-    (
-        'https://www.youtube.com/s/player/113ca41c/player_ias.vflset/en_US/base.js',
-        'cgYl-tlYkhjT7A', 'hI7BBr2zUgcmMg',
-    ),
-    (
-        'https://www.youtube.com/s/player/c57c113c/player_ias.vflset/en_US/base.js',
-        '-Txvy6bT5R6LqgnQNx', 'dcklJCnRUHbgSg',
-    ),
-    (
-        'https://www.youtube.com/s/player/5a3b6271/player_ias.vflset/en_US/base.js',
-        'B2j7f_UPT4rfje85Lu_e', 'm5DmNymaGQ5RdQ',
-    ),
-    (
-        'https://www.youtube.com/s/player/dac945fd/player_ias.vflset/en_US/base.js',
-        'o8BkRxXhuYsBCWi6RplPdP', '3Lx32v_hmzTm6A',
-    ),
-    (
-        'https://www.youtube.com/s/player/6f20102c/player_ias.vflset/en_US/base.js',
-        'lE8DhoDmKqnmJJ', 'pJTTX6XyJP2BYw',
-    ),
-    (
-        'https://www.youtube.com/s/player/cfa9e7cb/player_ias.vflset/en_US/base.js',
-        'qO0NiMtYQ7TeJnfFG2', 'k9cuJDHNS5O7kQ',
-    ),
-    (
-        'https://www.youtube.com/s/player/b7910ca8/player_ias.vflset/en_US/base.js',
-        '_hXMCwMt9qE310D', 'LoZMgkkofRMCZQ',
-    ),
-    (
-        'https://www.youtube.com/s/player/590f65a6/player_ias.vflset/en_US/base.js',
-        '1tm7-g_A9zsI8_Lay_', 'xI4Vem4Put_rOg',
-    ),
-    (
-        'https://www.youtube.com/s/player/b22ef6e7/player_ias.vflset/en_US/base.js',
-        'b6HcntHGkvBLk_FRf', 'kNPW6A7FyP2l8A',
-    ),
-    (
-        'https://www.youtube.com/s/player/3400486c/player_ias.vflset/en_US/base.js',
-        'lL46g3XifCKUZn1Xfw', 'z767lhet6V2Skl',
-    ),
-    (
-        'https://www.youtube.com/s/player/5604538d/player_ias.vflset/en_US/base.js',
-        '7X-he4jjvMx7BCX', 'sViSydX8IHtdWA',
-    ),
-    (
-        'https://www.youtube.com/s/player/20dfca59/player_ias.vflset/en_US/base.js',
-        '-fLCxedkAk4LUTK2', 'O8kfRq1y1eyHGw',
-    ),
-    (
-        'https://www.youtube.com/s/player/b12cc44b/player_ias.vflset/en_US/base.js',
-        'keLa5R2U00sR9SQK', 'N1OGyujjEwMnLw',
-    ),
-]
-
 
 class TestPlayerInfo(unittest.TestCase):
     def test_youtube_extract_player_info(self):
         PLAYER_URLS = (
-            ('https://www.youtube.com/s/player/4c3f79c5/player_ias.vflset/en_US/base.js', '4c3f79c5'),
             ('https://www.youtube.com/s/player/64dddad9/player_ias.vflset/en_US/base.js', '64dddad9'),
             ('https://www.youtube.com/s/player/64dddad9/player_ias.vflset/fr_FR/base.js', '64dddad9'),
             ('https://www.youtube.com/s/player/64dddad9/player-plasma-ias-phone-en_US.vflset/base.js', '64dddad9'),
@@ -211,61 +90,40 @@ class TestPlayerInfo(unittest.TestCase):
 class TestSignature(unittest.TestCase):
     def setUp(self):
         TEST_DIR = os.path.dirname(os.path.abspath(__file__))
-        self.TESTDATA_DIR = os.path.join(TEST_DIR, 'testdata/sigs')
+        self.TESTDATA_DIR = os.path.join(TEST_DIR, 'testdata')
         if not os.path.exists(self.TESTDATA_DIR):
             os.mkdir(self.TESTDATA_DIR)
 
-    def tearDown(self):
+
-        try:
+def make_tfunc(url, sig_input, expected_sig):
-            for f in os.listdir(self.TESTDATA_DIR):
+    m = re.match(r'.*-([a-zA-Z0-9_-]+)(?:/watch_as3|/html5player)?\.[a-z]+$', url)
-                os.remove(f)
+    assert m, '%r should follow URL format' % url
-        except OSError:
+    test_id = m.group(1)
-            pass
+
+    def test_func(self):
+        basename = 'player-%s.js' % test_id
+        fn = os.path.join(self.TESTDATA_DIR, basename)
+
+        if not os.path.exists(fn):
+            compat_urlretrieve(url, fn)
+
+        ydl = FakeYDL()
+        ie = YoutubeIE(ydl)
+        with io.open(fn, encoding='utf-8') as testf:
+            jscode = testf.read()
+        func = ie._parse_sig_js(jscode)
+        src_sig = (
+            compat_str(string.printable[:sig_input])
+            if isinstance(sig_input, int) else sig_input)
+        got_sig = func(src_sig)
+        self.assertEqual(got_sig, expected_sig)
+
+    test_func.__name__ = str('test_signature_js_' + test_id)
+    setattr(TestSignature, test_func.__name__, test_func)
 
 
-def t_factory(name, sig_func, url_pattern):
+for test_spec in _TESTS:
-    def make_tfunc(url, sig_input, expected_sig):
+    make_tfunc(*test_spec)
-        m = url_pattern.match(url)
-        assert m, '%r should follow URL format' % url
-        test_id = m.group('id')
-
-        def test_func(self):
-            basename = 'player-{0}-{1}.js'.format(name, test_id)
-            fn = os.path.join(self.TESTDATA_DIR, basename)
-
-            if not os.path.exists(fn):
-                compat_urlretrieve(url, fn)
-            with open(fn, encoding='utf-8') as testf:
-                jscode = testf.read()
-            self.assertEqual(sig_func(jscode, sig_input), expected_sig)
-
-        test_func.__name__ = str('test_{0}_js_{1}'.format(name, test_id))
-        setattr(TestSignature, test_func.__name__, test_func)
-    return make_tfunc
-
-
-def signature(jscode, sig_input):
-    func = YoutubeIE(FakeYDL())._parse_sig_js(jscode)
-    src_sig = (
-        compat_str(string.printable[:sig_input])
-        if isinstance(sig_input, int) else sig_input)
-    return func(src_sig)
-
-
-def n_sig(jscode, sig_input):
-    funcname = YoutubeIE(FakeYDL())._extract_n_function_name(jscode)
-    return JSInterpreter(jscode).call_function(funcname, sig_input)
-
-
-make_sig_test = t_factory(
-    'signature', signature, re.compile(r'.*-(?P<id>[a-zA-Z0-9_-]+)(?:/watch_as3|/html5player)?\.[a-z]+$'))
-for test_spec in _SIG_TESTS:
-    make_sig_test(*test_spec)
-
-make_nsig_test = t_factory(
-    'nsig', n_sig, re.compile(r'.+/player/(?P<id>[a-zA-Z0-9_-]+)/.+.js$'))
-for test_spec in _NSIG_TESTS:
-    make_nsig_test(*test_spec)
 
 
 if __name__ == '__main__':

test/testdata/mpd/range_only.mpd

@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!-- MPD file Generated with GPAC version 1.0.1-revrelease at 2021-11-27T20:53:11.690Z -->
-<MPD xmlns="urn:mpeg:dash:schema:mpd:2011" minBufferTime="PT1.500S" type="static" mediaPresentationDuration="PT0H0M30.196S" maxSegmentDuration="PT0H0M10.027S" profiles="urn:mpeg:dash:profile:full:2011">
- <ProgramInformation moreInformationURL="http://gpac.io">
-  <Title>manifest.mpd generated by GPAC</Title>
- </ProgramInformation>
-
- <Period duration="PT0H0M30.196S">
-  <AdaptationSet segmentAlignment="true" maxWidth="768" maxHeight="432" maxFrameRate="30000/1001" par="16:9" lang="und" startWithSAP="1">
-   <Representation id="1" mimeType="video/mp4" codecs="avc1.4D401E" width="768" height="432" frameRate="30000/1001" sar="1:1" bandwidth="526987">
-    <BaseURL>video_dashinit.mp4</BaseURL>
-    <SegmentList timescale="90000" duration="900000">
-     <Initialization range="0-881"/>
-     <SegmentURL mediaRange="882-876094" indexRange="882-925"/>
-     <SegmentURL mediaRange="876095-1466732" indexRange="876095-876138"/>
-     <SegmentURL mediaRange="1466733-1953615" indexRange="1466733-1466776"/>
-     <SegmentURL mediaRange="1953616-1994211" indexRange="1953616-1953659"/>
-    </SegmentList>
-   </Representation>
-  </AdaptationSet>
-  <AdaptationSet segmentAlignment="true" lang="und" startWithSAP="1">
-   <Representation id="2" mimeType="audio/mp4" codecs="mp4a.40.2" audioSamplingRate="48000" bandwidth="98096">
-    <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
-    <BaseURL>audio_dashinit.mp4</BaseURL>
-    <SegmentList timescale="48000" duration="480000">
-     <Initialization range="0-752"/>
-     <SegmentURL mediaRange="753-124129" indexRange="753-796"/>
-     <SegmentURL mediaRange="124130-250544" indexRange="124130-124173"/>
-     <SegmentURL mediaRange="250545-374929" indexRange="250545-250588"/>
-    </SegmentList>
-   </Representation>
-  </AdaptationSet>
- </Period>
-</MPD>
-

test/testdata/mpd/subtitles.mpd

@@ -1,351 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Created with Unified Streaming Platform (version=1.10.18-20255) -->
-<MPD
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns="urn:mpeg:dash:schema:mpd:2011"
-  xsi:schemaLocation="urn:mpeg:dash:schema:mpd:2011 http://standards.iso.org/ittf/PubliclyAvailableStandards/MPEG-DASH_schema_files/DASH-MPD.xsd"
-  type="static"
-  mediaPresentationDuration="PT14M48S"
-  maxSegmentDuration="PT1M"
-  minBufferTime="PT10S"
-  profiles="urn:mpeg:dash:profile:isoff-live:2011">
-  <Period
-    id="1"
-    duration="PT14M48S">
-    <BaseURL>dash/</BaseURL>
-    <AdaptationSet
-      id="1"
-      group="1"
-      contentType="audio"
-      segmentAlignment="true"
-      audioSamplingRate="48000"
-      mimeType="audio/mp4"
-      codecs="mp4a.40.2"
-      startWithSAP="1">
-      <AudioChannelConfiguration
-        schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011"
-        value="2" />
-      <Role schemeIdUri="urn:mpeg:dash:role:2011" value="main" />
-      <SegmentTemplate
-        timescale="48000"
-        initialization="3144-kZT4LWMQw6Rh7Kpd-$RepresentationID$.dash"
-        media="3144-kZT4LWMQw6Rh7Kpd-$RepresentationID$-$Time$.dash">
-        <SegmentTimeline>
-          <S t="0" d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="3584" />
-        </SegmentTimeline>
-      </SegmentTemplate>
-      <Representation
-        id="audio=128001"
-        bandwidth="128001">
-      </Representation>
-    </AdaptationSet>
-    <AdaptationSet
-      id="2"
-      group="3"
-      contentType="text"
-      lang="en"
-      mimeType="application/mp4"
-      codecs="stpp"
-      startWithSAP="1">
-      <Role schemeIdUri="urn:mpeg:dash:role:2011" value="subtitle" />
-      <SegmentTemplate
-        timescale="1000"
-        initialization="3144-kZT4LWMQw6Rh7Kpd-$RepresentationID$.dash"
-        media="3144-kZT4LWMQw6Rh7Kpd-$RepresentationID$-$Time$.dash">
-        <SegmentTimeline>
-          <S t="0" d="60000" r="9" />
-          <S d="24000" />
-        </SegmentTimeline>
-      </SegmentTemplate>
-      <Representation
-        id="textstream_eng=1000"
-        bandwidth="1000">
-      </Representation>
-    </AdaptationSet>
-    <AdaptationSet
-      id="3"
-      group="2"
-      contentType="video"
-      par="960:409"
-      minBandwidth="100000"
-      maxBandwidth="4482000"
-      maxWidth="1689"
-      maxHeight="720"
-      segmentAlignment="true"
-      mimeType="video/mp4"
-      codecs="avc1.4D401F"
-      startWithSAP="1">
-      <Role schemeIdUri="urn:mpeg:dash:role:2011" value="main" />
-      <SegmentTemplate
-        timescale="12288"
-        initialization="3144-kZT4LWMQw6Rh7Kpd-$RepresentationID$.dash"
-        media="3144-kZT4LWMQw6Rh7Kpd-$RepresentationID$-$Time$.dash">
-        <SegmentTimeline>
-          <S t="0" d="24576" r="443" />
-        </SegmentTimeline>
-      </SegmentTemplate>
-      <Representation
-        id="video=100000"
-        bandwidth="100000"
-        width="336"
-        height="144"
-        sar="2880:2863"
-        scanType="progressive">
-      </Representation>
-      <Representation
-        id="video=326000"
-        bandwidth="326000"
-        width="562"
-        height="240"
-        sar="115200:114929"
-        scanType="progressive">
-      </Representation>
-      <Representation
-        id="video=698000"
-        bandwidth="698000"
-        width="844"
-        height="360"
-        sar="86400:86299"
-        scanType="progressive">
-      </Representation>
-      <Representation
-        id="video=1493000"
-        bandwidth="1493000"
-        width="1126"
-        height="480"
-        sar="230400:230267"
-        scanType="progressive">
-      </Representation>
-      <Representation
-        id="video=4482000"
-        bandwidth="4482000"
-        width="1688"
-        height="720"
-        sar="86400:86299"
-        scanType="progressive">
-      </Representation>
-    </AdaptationSet>
-  </Period>
-</MPD>

test/testdata/mpd/url_and_range.mpd

@@ -1,32 +0,0 @@
-<?xml version="1.0" ?>
-<MPD xmlns="urn:mpeg:dash:schema:mpd:2011" profiles="urn:mpeg:dash:profile:isoff-live:2011" minBufferTime="PT10.01S" mediaPresentationDuration="PT30.097S" type="static">
-  <!-- Created with Bento4 mp4-dash.py, VERSION=2.0.0-639 -->
-  <Period>
-    <!-- Video -->
-    <AdaptationSet mimeType="video/mp4" segmentAlignment="true" startWithSAP="1" maxWidth="768" maxHeight="432">
-      <Representation id="video-avc1" codecs="avc1.4D401E" width="768" height="432" scanType="progressive" frameRate="30000/1001" bandwidth="699597">
-        <SegmentList timescale="1000" duration="10010">
-          <Initialization sourceURL="video-frag.mp4" range="36-746"/>
-          <SegmentURL media="video-frag.mp4" mediaRange="747-876117"/>
-          <SegmentURL media="video-frag.mp4" mediaRange="876118-1466913"/>
-          <SegmentURL media="video-frag.mp4" mediaRange="1466914-1953954"/>
-          <SegmentURL media="video-frag.mp4" mediaRange="1953955-1994652"/>
-        </SegmentList>
-      </Representation>
-    </AdaptationSet>
-    <!-- Audio -->
-    <AdaptationSet mimeType="audio/mp4" startWithSAP="1" segmentAlignment="true">
-      <Representation id="audio-und-mp4a.40.2" codecs="mp4a.40.2" bandwidth="98808" audioSamplingRate="48000">
-        <AudioChannelConfiguration schemeIdUri="urn:mpeg:mpegB:cicp:ChannelConfiguration" value="2"/>
-        <SegmentList timescale="1000" duration="10010">
-          <Initialization sourceURL="audio-frag.mp4" range="32-623"/>
-          <SegmentURL media="audio-frag.mp4" mediaRange="624-124199"/>
-          <SegmentURL media="audio-frag.mp4" mediaRange="124200-250303"/>
-          <SegmentURL media="audio-frag.mp4" mediaRange="250304-374365"/>
-          <SegmentURL media="audio-frag.mp4" mediaRange="374366-374836"/>
-        </SegmentList>
-      </Representation>
-    </AdaptationSet>
-  </Period>
-</MPD>
-

youtube_dl/YoutubeDL.py

@@ -4,10 +4,11 @@
 from __future__ import absolute_import, unicode_literals
 
 import collections
+import contextlib
 import copy
 import datetime
 import errno
-import functools
+import fileinput
 import io
 import itertools
 import json
@@ -25,39 +26,25 @@ import tokenize
 import traceback
 import random
 
-try:
-    from ssl import OPENSSL_VERSION
-except ImportError:
-    # Must be Python 2.6, should be built against 1.0.2
-    OPENSSL_VERSION = 'OpenSSL 1.0.2(?)'
 from string import ascii_letters
 
 from .compat import (
     compat_basestring,
-    compat_collections_chain_map as ChainMap,
+    compat_cookiejar,
-    compat_filter as filter,
     compat_get_terminal_size,
     compat_http_client,
-    compat_http_cookiejar_Cookie,
-    compat_http_cookies_SimpleCookie,
-    compat_integer_types,
     compat_kwargs,
-    compat_map as map,
     compat_numeric_types,
-    compat_open as open,
     compat_os_name,
     compat_str,
     compat_tokenize_tokenize,
     compat_urllib_error,
-    compat_urllib_parse,
     compat_urllib_request,
     compat_urllib_request_DataHandler,
 )
 from .utils import (
-    _UnsafeExtensionError,
     age_restricted,
     args_to_str,
-    bug_reports_message,
     ContentTooShortError,
     date_from_str,
     DateRange,
@@ -75,9 +62,7 @@ from .utils import (
     GeoRestrictedError,
     int_or_none,
     ISO3166Utils,
-    join_nonempty,
     locked_file,
-    LazyList,
     make_HTTPS_handler,
     MaxDownloadsReached,
     orderedSet,
@@ -88,7 +73,6 @@ from .utils import (
     PostProcessingError,
     preferredencoding,
     prepend_extension,
-    process_communicate_or_kill,
     register_socks_protocols,
     render_table,
     replace_extension,
@@ -100,7 +84,6 @@ from .utils import (
     std_headers,
     str_or_none,
     subtitles_filename,
-    traverse_obj,
     UnavailableVideoError,
     url_basename,
     version_tuple,
@@ -110,7 +93,6 @@ from .utils import (
     YoutubeDLCookieProcessor,
     YoutubeDLHandler,
     YoutubeDLRedirectHandler,
-    ytdl_is_updateable,
 )
 from .cache import Cache
 from .extractor import get_info_extractor, gen_extractor_classes, _LAZY_LOADER
@@ -131,20 +113,6 @@ if compat_os_name == 'nt':
     import ctypes
 
 
-def _catch_unsafe_file_extension(func):
-    @functools.wraps(func)
-    def wrapper(self, *args, **kwargs):
-        try:
-            return func(self, *args, **kwargs)
-        except _UnsafeExtensionError as error:
-            self.report_error(
-                '{0} found; to avoid damaging your system, this value is disallowed.'
-                ' If you believe this is an error{1}'.format(
-                    error_to_compat_str(error), bug_reports_message(',')))
-
-    return wrapper
-
-
 class YoutubeDL(object):
     """YoutubeDL class.
 
@@ -394,9 +362,6 @@ class YoutubeDL(object):
         self.params.update(params)
         self.cache = Cache(self)
 
-        self._header_cookies = []
-        self._load_cookies_from_headers(self.params.get('http_headers'))
-
         def check_deprecated(param, option, suggestion):
             if self.params.get(param) is not None:
                 self.report_warning(
@@ -603,7 +568,7 @@ class YoutubeDL(object):
         if self.params.get('cookiefile') is not None:
             self.cookiejar.save(ignore_discard=True, ignore_expires=True)
 
-    def trouble(self, *args, **kwargs):
+    def trouble(self, message=None, tb=None):
         """Determine action to take when a download problem appears.
 
         Depending on if the downloader has been configured to ignore
@@ -612,11 +577,6 @@ class YoutubeDL(object):
 
         tb, if given, is additional traceback information.
         """
-        # message=None, tb=None, is_error=True
-        message = args[0] if len(args) > 0 else kwargs.get('message', None)
-        tb = args[1] if len(args) > 1 else kwargs.get('tb', None)
-        is_error = args[2] if len(args) > 2 else kwargs.get('is_error', True)
-
         if message is not None:
             self.to_stderr(message)
         if self.params.get('verbose'):
@@ -629,10 +589,7 @@ class YoutubeDL(object):
                 else:
                     tb_data = traceback.format_list(traceback.extract_stack())
                     tb = ''.join(tb_data)
-            if tb:
+            self.to_stderr(tb)
-                self.to_stderr(tb)
-        if not is_error:
-            return
         if not self.params.get('ignoreerrors', False):
             if sys.exc_info()[0] and hasattr(sys.exc_info()[1], 'exc_info') and sys.exc_info()[1].exc_info[0]:
                 exc_info = sys.exc_info()[1].exc_info
@@ -641,18 +598,11 @@ class YoutubeDL(object):
             raise DownloadError(message, exc_info)
         self._download_retcode = 1
 
-    def report_warning(self, message, only_once=False, _cache={}):
+    def report_warning(self, message):
         '''
         Print the message to stderr, it will be prefixed with 'WARNING:'
         If stderr is a tty file the 'WARNING:' will be colored
         '''
-        if only_once:
-            m_hash = hash((self, message))
-            m_cnt = _cache.setdefault(m_hash, 0)
-            _cache[m_hash] = m_cnt + 1
-            if m_cnt > 0:
-                return
-
         if self.params.get('logger') is not None:
             self.params['logger'].warning(message)
         else:
@@ -665,7 +615,7 @@ class YoutubeDL(object):
             warning_message = '%s %s' % (_msg_header, message)
             self.to_stderr(warning_message)
 
-    def report_error(self, message, *args, **kwargs):
+    def report_error(self, message, tb=None):
         '''
         Do the same as trouble, but prefixes the message with 'ERROR:', colored
         in red if stderr is a tty file.
@@ -674,18 +624,8 @@ class YoutubeDL(object):
             _msg_header = '\033[0;31mERROR:\033[0m'
         else:
             _msg_header = 'ERROR:'
-        kwargs['message'] = '%s %s' % (_msg_header, message)
+        error_message = '%s %s' % (_msg_header, message)
-        self.trouble(*args, **kwargs)
+        self.trouble(error_message, tb)
-
-    def report_unscoped_cookies(self, *args, **kwargs):
-        # message=None, tb=False, is_error=False
-        if len(args) <= 2:
-            kwargs.setdefault('is_error', False)
-            if len(args) <= 0:
-                kwargs.setdefault(
-                    'message',
-                    'Unscoped cookies are not allowed: please specify some sort of scoping')
-        self.report_error(*args, **kwargs)
 
     def report_file_already_downloaded(self, file_name):
         """Report file has already been fully downloaded."""
@@ -780,7 +720,7 @@ class YoutubeDL(object):
                 filename = encodeFilename(filename, True).decode(preferredencoding())
             return sanitize_path(filename)
         except ValueError as err:
-            self.report_error('Error in output template: ' + error_to_compat_str(err) + ' (encoding: ' + repr(preferredencoding()) + ')')
+            self.report_error('Error in output template: ' + str(err) + ' (encoding: ' + repr(preferredencoding()) + ')')
             return None
 
     def _match_entry(self, info_dict, incomplete):
@@ -833,20 +773,11 @@ class YoutubeDL(object):
 
     def extract_info(self, url, download=True, ie_key=None, extra_info={},
                      process=True, force_generic_extractor=False):
-        """
+        '''
-        Return a list with a dictionary for each video extracted.
+        Returns a list with a dictionary for each video we find.
-
+        If 'download', also downloads the videos.
-        Arguments:
+        extra_info is a dict containing the extra values to add to each result
-        url -- URL to extract
+        '''
-
-        Keyword arguments:
-        download -- whether to download videos during extraction
-        ie_key -- extractor key hint
-        extra_info -- dictionary containing the extra values to add to each result
-        process -- whether to resolve all unresolved references (URLs, playlist items),
-            must be True for download to work.
-        force_generic_extractor -- force using the generic extractor
-        """
 
         if not ie_key and force_generic_extractor:
             ie_key = 'Generic'
@@ -881,7 +812,7 @@ class YoutubeDL(object):
                 msg += '\nYou might want to use a VPN or a proxy server (with --proxy) to workaround.'
                 self.report_error(msg)
             except ExtractorError as e:  # An error we somewhat expected
-                self.report_error(compat_str(e), tb=e.format_traceback())
+                self.report_error(compat_str(e), e.format_traceback())
             except MaxDownloadsReached:
                 raise
             except Exception as e:
@@ -891,83 +822,8 @@ class YoutubeDL(object):
                     raise
         return wrapper
 
-    def _remove_cookie_header(self, http_headers):
-        """Filters out `Cookie` header from an `http_headers` dict
-        The `Cookie` header is removed to prevent leaks as a result of unscoped cookies.
-        See: https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-v8mc-9377-rwjj
-
-        @param http_headers     An `http_headers` dict from which any `Cookie` header
-                                should be removed, or None
-        """
-        return dict(filter(lambda pair: pair[0].lower() != 'cookie', (http_headers or {}).items()))
-
-    def _load_cookies(self, data, **kwargs):
-        """Loads cookies from a `Cookie` header
-
-        This tries to work around the security vulnerability of passing cookies to every domain.
-
-        @param data         The Cookie header as a string to load the cookies from
-        @param autoscope    If `False`, scope cookies using Set-Cookie syntax and error for cookie without domains
-                            If `True`, save cookies for later to be stored in the jar with a limited scope
-                            If a URL, save cookies in the jar with the domain of the URL
-        """
-        # autoscope=True (kw-only)
-        autoscope = kwargs.get('autoscope', True)
-
-        for cookie in compat_http_cookies_SimpleCookie(data).values() if data else []:
-            if autoscope and any(cookie.values()):
-                raise ValueError('Invalid syntax in Cookie Header')
-
-            domain = cookie.get('domain') or ''
-            expiry = cookie.get('expires')
-            if expiry == '':  # 0 is valid so we check for `''` explicitly
-                expiry = None
-            prepared_cookie = compat_http_cookiejar_Cookie(
-                cookie.get('version') or 0, cookie.key, cookie.value, None, False,
-                domain, True, True, cookie.get('path') or '', bool(cookie.get('path')),
-                bool(cookie.get('secure')), expiry, False, None, None, {})
-
-            if domain:
-                self.cookiejar.set_cookie(prepared_cookie)
-            elif autoscope is True:
-                self.report_warning(
-                    'Passing cookies as a header is a potential security risk; '
-                    'they will be scoped to the domain of the downloaded urls. '
-                    'Please consider loading cookies from a file or browser instead.',
-                    only_once=True)
-                self._header_cookies.append(prepared_cookie)
-            elif autoscope:
-                self.report_warning(
-                    'The extractor result contains an unscoped cookie as an HTTP header. '
-                    'If you are specifying an input URL, ' + bug_reports_message(),
-                    only_once=True)
-                self._apply_header_cookies(autoscope, [prepared_cookie])
-            else:
-                self.report_unscoped_cookies()
-
-    def _load_cookies_from_headers(self, headers):
-        self._load_cookies(traverse_obj(headers, 'cookie', casesense=False))
-
-    def _apply_header_cookies(self, url, cookies=None):
-        """This method applies stray header cookies to the provided url
-
-        This loads header cookies and scopes them to the domain provided in `url`.
-        While this is not ideal, it helps reduce the risk of them being sent to
-        an unintended destination.
-        """
-        parsed = compat_urllib_parse.urlparse(url)
-        if not parsed.hostname:
-            return
-
-        for cookie in map(copy.copy, cookies or self._header_cookies):
-            cookie.domain = '.' + parsed.hostname
-            self.cookiejar.set_cookie(cookie)
-
     @__handle_extraction_exceptions
     def __extract_info(self, url, ie, download, extra_info, process):
-        # Compat with passing cookies in http headers
-        self._apply_header_cookies(url)
-
         ie_result = ie.extract(url)
         if ie_result is None:  # Finished already (backwards compatibility; listformats and friends should be moved here)
             return
@@ -993,7 +849,7 @@ class YoutubeDL(object):
 
     def process_ie_result(self, ie_result, download=True, extra_info={}):
         """
-        Take the result of the ie (may be modified) and resolve all unresolved
+        Take the result of the ie(may be modified) and resolve all unresolved
         references (URLs, playlist items).
 
         It will also download the videos if 'download'.
@@ -1055,8 +911,8 @@ class YoutubeDL(object):
         elif result_type in ('playlist', 'multi_video'):
             # Protect from infinite recursion due to recursively nested playlists
             # (see https://github.com/ytdl-org/youtube-dl/issues/27833)
-            webpage_url = ie_result.get('webpage_url')  # not all pl/mv have this
+            webpage_url = ie_result['webpage_url']
-            if webpage_url and webpage_url in self._playlist_urls:
+            if webpage_url in self._playlist_urls:
                 self.to_screen(
                     '[download] Skipping already downloaded playlist: %s'
                     % ie_result.get('title') or ie_result.get('id'))
@@ -1064,10 +920,6 @@ class YoutubeDL(object):
 
             self._playlist_level += 1
             self._playlist_urls.add(webpage_url)
-            new_result = dict((k, v) for k, v in extra_info.items() if k not in ie_result)
-            if new_result:
-                new_result.update(ie_result)
-                ie_result = new_result
             try:
                 return self.__process_playlist(ie_result, download)
             finally:
@@ -1524,16 +1376,17 @@ class YoutubeDL(object):
                         'abr': formats_info[1].get('abr'),
                         'ext': output_ext,
                     }
+                video_selector, audio_selector = map(_build_selector_function, selector.selector)
 
                 def selector_function(ctx):
-                    selector_fn = lambda x: _build_selector_function(x)(ctx)
+                    for pair in itertools.product(
-                    for pair in itertools.product(*map(selector_fn, selector.selector)):
+                            video_selector(copy.deepcopy(ctx)), audio_selector(copy.deepcopy(ctx))):
                         yield _merge(pair)
 
             filters = [self._build_format_filter(f) for f in selector.filters]
 
             def final_selector(ctx):
-                ctx_copy = dict(ctx)
+                ctx_copy = copy.deepcopy(ctx)
                 for _filter in filters:
                     ctx_copy['formats'] = list(filter(_filter, ctx_copy['formats']))
                 return selector_function(ctx_copy)
@@ -1568,73 +1421,29 @@ class YoutubeDL(object):
         parsed_selector = _parse_format_selection(iter(TokenIterator(tokens)))
         return _build_selector_function(parsed_selector)
 
-    def _calc_headers(self, info_dict, load_cookies=False):
+    def _calc_headers(self, info_dict):
-        if load_cookies:  # For --load-info-json
-            # load cookies from http_headers in legacy info.json
-            self._load_cookies(traverse_obj(info_dict, ('http_headers', 'Cookie'), casesense=False),
-                               autoscope=info_dict['url'])
-            # load scoped cookies from info.json
-            self._load_cookies(info_dict.get('cookies'), autoscope=False)
-
-        cookies = self.cookiejar.get_cookies_for_url(info_dict['url'])
-        if cookies:
-            # Make a string like name1=val1; attr1=a_val1; ...name2=val2; ...
-            # By convention a cookie name can't be a well-known attribute name
-            # so this syntax is unambiguous and can be parsed by (eg) SimpleCookie
-            encoder = compat_http_cookies_SimpleCookie()
-            values = []
-            attributes = (('Domain', '='), ('Path', '='), ('Secure',), ('Expires', '='), ('Version', '='))
-            attributes = tuple([x[0].lower()] + list(x) for x in attributes)
-            for cookie in cookies:
-                _, value = encoder.value_encode(cookie.value)
-                # Py 2 '' --> '', Py 3 '' --> '""'
-                if value == '':
-                    value = '""'
-                values.append('='.join((cookie.name, value)))
-                for attr in attributes:
-                    value = getattr(cookie, attr[0], None)
-                    if value:
-                        values.append('%s%s' % (''.join(attr[1:]), value if len(attr) == 3 else ''))
-            info_dict['cookies'] = '; '.join(values)
-
         res = std_headers.copy()
-        res.update(info_dict.get('http_headers') or {})
+
-        res = self._remove_cookie_header(res)
+        add_headers = info_dict.get('http_headers')
+        if add_headers:
+            res.update(add_headers)
+
+        cookies = self._calc_cookies(info_dict)
+        if cookies:
+            res['Cookie'] = cookies
 
         if 'X-Forwarded-For' not in res:
             x_forwarded_for_ip = info_dict.get('__x_forwarded_for_ip')
             if x_forwarded_for_ip:
                 res['X-Forwarded-For'] = x_forwarded_for_ip
 
-        return res or None
+        return res
 
     def _calc_cookies(self, info_dict):
         pr = sanitized_Request(info_dict['url'])
         self.cookiejar.add_cookie_header(pr)
         return pr.get_header('Cookie')
 
-    def _fill_common_fields(self, info_dict, final=True):
-
-        for ts_key, date_key in (
-                ('timestamp', 'upload_date'),
-                ('release_timestamp', 'release_date'),
-        ):
-            if info_dict.get(date_key) is None and info_dict.get(ts_key) is not None:
-                # Working around out-of-range timestamp values (e.g. negative ones on Windows,
-                # see http://bugs.python.org/issue1646728)
-                try:
-                    upload_date = datetime.datetime.utcfromtimestamp(info_dict[ts_key])
-                    info_dict[date_key] = compat_str(upload_date.strftime('%Y%m%d'))
-                except (ValueError, OverflowError, OSError):
-                    pass
-
-        # Auto generate title fields corresponding to the *_number fields when missing
-        # in order to always have clean titles. This is very common for TV series.
-        if final:
-            for field in ('chapter', 'season', 'episode'):
-                if info_dict.get('%s_number' % field) is not None and not info_dict.get(field):
-                    info_dict[field] = '%s %d' % (field.capitalize(), info_dict['%s_number' % field])
-
     def process_video_result(self, info_dict, download=True):
         assert info_dict.get('_type', 'video') == 'video'
 
@@ -1702,7 +1511,24 @@ class YoutubeDL(object):
         if 'display_id' not in info_dict and 'id' in info_dict:
             info_dict['display_id'] = info_dict['id']
 
-        self._fill_common_fields(info_dict)
+        for ts_key, date_key in (
+                ('timestamp', 'upload_date'),
+                ('release_timestamp', 'release_date'),
+        ):
+            if info_dict.get(date_key) is None and info_dict.get(ts_key) is not None:
+                # Working around out-of-range timestamp values (e.g. negative ones on Windows,
+                # see http://bugs.python.org/issue1646728)
+                try:
+                    upload_date = datetime.datetime.utcfromtimestamp(info_dict[ts_key])
+                    info_dict[date_key] = upload_date.strftime('%Y%m%d')
+                except (ValueError, OverflowError, OSError):
+                    pass
+
+        # Auto generate title fields corresponding to the *_number fields when missing
+        # in order to always have clean titles. This is very common for TV series.
+        for field in ('chapter', 'season', 'episode'):
+            if info_dict.get('%s_number' % field) is not None and not info_dict.get(field):
+                info_dict[field] = '%s %d' % (field.capitalize(), info_dict['%s_number' % field])
 
         for cc_kind in ('subtitles', 'automatic_captions'):
             cc = info_dict.get(cc_kind)
@@ -1734,6 +1560,9 @@ class YoutubeDL(object):
         else:
             formats = info_dict['formats']
 
+        if not formats:
+            raise ExtractorError('No video formats found!')
+
         def is_wellformed(f):
             url = f.get('url')
             if not url:
@@ -1746,10 +1575,7 @@ class YoutubeDL(object):
             return True
 
         # Filter out malformed formats for better extraction robustness
-        formats = list(filter(is_wellformed, formats or []))
+        formats = list(filter(is_wellformed, formats))
-
-        if not formats:
-            raise ExtractorError('No video formats found!')
 
         formats_dict = {}
 
@@ -1790,13 +1616,10 @@ class YoutubeDL(object):
                 format['protocol'] = determine_protocol(format)
             # Add HTTP headers, so that external programs can use them from the
             # json output
-            format['http_headers'] = self._calc_headers(ChainMap(format, info_dict), load_cookies=True)
+            full_format_info = info_dict.copy()
-
+            full_format_info.update(format)
-        # Safeguard against old/insecure infojson when using --load-info-json
+            format['http_headers'] = self._calc_headers(full_format_info)
-        info_dict['http_headers'] = self._remove_cookie_header(
+        # Remove private housekeeping stuff
-            info_dict.get('http_headers') or {}) or None
-
-        # Remove private housekeeping stuff (copied to http_headers in _calc_headers())
         if '__x_forwarded_for_ip' in info_dict:
             del info_dict['__x_forwarded_for_ip']
 
@@ -1939,17 +1762,17 @@ class YoutubeDL(object):
             self.to_stdout(formatSeconds(info_dict['duration']))
         print_mandatory('format')
         if self.params.get('forcejson', False):
-            self.to_stdout(json.dumps(self.sanitize_info(info_dict)))
+            self.to_stdout(json.dumps(info_dict))
 
-    @_catch_unsafe_file_extension
     def process_info(self, info_dict):
         """Process a single resolved IE result."""
 
         assert info_dict.get('_type', 'video') == 'video'
 
-        max_downloads = int_or_none(self.params.get('max_downloads')) or float('inf')
+        max_downloads = self.params.get('max_downloads')
-        if self._num_downloads >= max_downloads:
+        if max_downloads is not None:
-            raise MaxDownloadsReached()
+            if self._num_downloads >= int(max_downloads):
+                raise MaxDownloadsReached()
 
         # TODO: backward compatibility, to be removed
         info_dict['fulltitle'] = info_dict['title']
@@ -2000,7 +1823,7 @@ class YoutubeDL(object):
             else:
                 try:
                     self.to_screen('[info] Writing video description to: ' + descfn)
-                    with open(encodeFilename(descfn), 'w', encoding='utf-8') as descfile:
+                    with io.open(encodeFilename(descfn), 'w', encoding='utf-8') as descfile:
                         descfile.write(info_dict['description'])
                 except (OSError, IOError):
                     self.report_error('Cannot write description file ' + descfn)
@@ -2015,7 +1838,7 @@ class YoutubeDL(object):
             else:
                 try:
                     self.to_screen('[info] Writing video annotations to: ' + annofn)
-                    with open(encodeFilename(annofn), 'w', encoding='utf-8') as annofile:
+                    with io.open(encodeFilename(annofn), 'w', encoding='utf-8') as annofile:
                         annofile.write(info_dict['annotations'])
                 except (KeyError, TypeError):
                     self.report_warning('There are no annotations to write.')
@@ -2042,7 +1865,7 @@ class YoutubeDL(object):
                         try:
                             # Use newline='' to prevent conversion of newline characters
                             # See https://github.com/ytdl-org/youtube-dl/issues/10268
-                            with open(encodeFilename(sub_filename), 'w', encoding='utf-8', newline='') as subfile:
+                            with io.open(encodeFilename(sub_filename), 'w', encoding='utf-8', newline='') as subfile:
                                 subfile.write(sub_info['data'])
                         except (OSError, IOError):
                             self.report_error('Cannot write subtitles file ' + sub_filename)
@@ -2051,41 +1874,36 @@ class YoutubeDL(object):
                         try:
                             sub_data = ie._request_webpage(
                                 sub_info['url'], info_dict['id'], note=False).read()
-                            with open(encodeFilename(sub_filename), 'wb') as subfile:
+                            with io.open(encodeFilename(sub_filename), 'wb') as subfile:
                                 subfile.write(sub_data)
                         except (ExtractorError, IOError, OSError, ValueError) as err:
                             self.report_warning('Unable to download subtitle for "%s": %s' %
                                                 (sub_lang, error_to_compat_str(err)))
                             continue
 
-        self._write_info_json(
+        if self.params.get('writeinfojson', False):
-            'video description', info_dict,
+            infofn = replace_extension(filename, 'info.json', info_dict.get('ext'))
-            replace_extension(filename, 'info.json', info_dict.get('ext')))
+            if self.params.get('nooverwrites', False) and os.path.exists(encodeFilename(infofn)):
+                self.to_screen('[info] Video description metadata is already present')
+            else:
+                self.to_screen('[info] Writing video description metadata as JSON to: ' + infofn)
+                try:
+                    write_json_file(self.filter_requested_info(info_dict), infofn)
+                except (OSError, IOError):
+                    self.report_error('Cannot write metadata to JSON file ' + infofn)
+                    return
 
         self._write_thumbnails(info_dict, filename)
 
         if not self.params.get('skip_download', False):
             try:
-                def checked_get_suitable_downloader(info_dict, params):
-                    ed_args = params.get('external_downloader_args')
-                    dler = get_suitable_downloader(info_dict, params)
-                    if ed_args and not params.get('external_downloader_args'):
-                        # external_downloader_args was cleared because external_downloader was rejected
-                        self.report_warning('Requested external downloader cannot be used: '
-                                            'ignoring --external-downloader-args.')
-                    return dler
-
                 def dl(name, info):
-                    fd = checked_get_suitable_downloader(info, self.params)(self, self.params)
+                    fd = get_suitable_downloader(info, self.params)(self, self.params)
                     for ph in self._progress_hooks:
                         fd.add_progress_hook(ph)
                     if self.params.get('verbose'):
                         self.to_screen('[debug] Invoking downloader on %r' % info.get('url'))
-
+                    return fd.download(name, info)
-                    new_info = dict((k, v) for k, v in info.items() if not k.startswith('__p'))
-                    new_info['http_headers'] = self._calc_headers(new_info)
-
-                    return fd.download(name, new_info)
 
                 if info_dict.get('requested_formats') is not None:
                     downloaded = []
@@ -2114,26 +1932,18 @@ class YoutubeDL(object):
                         # TODO: Check acodec/vcodec
                         return False
 
-                    exts = [info_dict['ext']]
+                    filename_real_ext = os.path.splitext(filename)[1][1:]
+                    filename_wo_ext = (
+                        os.path.splitext(filename)[0]
+                        if filename_real_ext == info_dict['ext']
+                        else filename)
                     requested_formats = info_dict['requested_formats']
                     if self.params.get('merge_output_format') is None and not compatible_formats(requested_formats):
                         info_dict['ext'] = 'mkv'
                         self.report_warning(
                             'Requested formats are incompatible for merge and will be merged into mkv.')
-                    exts.append(info_dict['ext'])
-
                     # Ensure filename always has a correct extension for successful merge
-                    def correct_ext(filename, ext=exts[1]):
+                    filename = '%s.%s' % (filename_wo_ext, info_dict['ext'])
-                        if filename == '-':
-                            return filename
-                        f_name, f_real_ext = os.path.splitext(filename)
-                        f_real_ext = f_real_ext[1:]
-                        filename_wo_ext = f_name if f_real_ext in exts else filename
-                        if ext is None:
-                            ext = f_real_ext or None
-                        return join_nonempty(filename_wo_ext, ext, delim='.')
-
-                    filename = correct_ext(filename)
                     if os.path.exists(encodeFilename(filename)):
                         self.to_screen(
                             '[download] %s has already been downloaded and '
@@ -2143,9 +1953,8 @@ class YoutubeDL(object):
                             new_info = dict(info_dict)
                             new_info.update(f)
                             fname = prepend_extension(
-                                correct_ext(
+                                self.prepare_filename(new_info),
-                                    self.prepare_filename(new_info), new_info['ext']),
+                                'f%s' % f['format_id'], new_info['ext'])
-                                'f%s' % (f['format_id'],), new_info['ext'])
                             if not ensure_dir_exists(fname):
                                 return
                             downloaded.append(fname)
@@ -2231,12 +2040,9 @@ class YoutubeDL(object):
                 try:
                     self.post_process(filename, info_dict)
                 except (PostProcessingError) as err:
-                    self.report_error('postprocessing: %s' % error_to_compat_str(err))
+                    self.report_error('postprocessing: %s' % str(err))
                     return
                 self.record_download_archive(info_dict)
-                # avoid possible nugatory search for further items (PR #26638)
-                if self._num_downloads >= max_downloads:
-                    raise MaxDownloadsReached()
 
     def download(self, url_list):
         """Download a given list of URLs."""
@@ -2259,13 +2065,16 @@ class YoutubeDL(object):
                 raise
             else:
                 if self.params.get('dump_single_json', False):
-                    self.to_stdout(json.dumps(self.sanitize_info(res)))
+                    self.to_stdout(json.dumps(res))
 
         return self._download_retcode
 
     def download_with_info_file(self, info_filename):
-        with open(info_filename, encoding='utf-8') as f:
+        with contextlib.closing(fileinput.FileInput(
-            info = self.filter_requested_info(json.load(f))
+                [info_filename], mode='r',
+                openhook=fileinput.hook_encoded('utf-8'))) as f:
+            # FileInput doesn't have a read method, we can't call json.load
+            info = self.filter_requested_info(json.loads('\n'.join(f)))
         try:
             self.process_ie_result(info, download=True)
         except DownloadError:
@@ -2278,36 +2087,10 @@ class YoutubeDL(object):
         return self._download_retcode
 
     @staticmethod
-    def sanitize_info(info_dict, remove_private_keys=False):
+    def filter_requested_info(info_dict):
-        ''' Sanitize the infodict for converting to json '''
+        return dict(
-        if info_dict is None:
+            (k, v) for k, v in info_dict.items()
-            return info_dict
+            if k not in ['requested_formats', 'requested_subtitles'])
-
-        if remove_private_keys:
-            reject = lambda k, v: (v is None
-                                   or k.startswith('__')
-                                   or k in ('requested_formats',
-                                            'requested_subtitles'))
-        else:
-            reject = lambda k, v: False
-
-        def filter_fn(obj):
-            if isinstance(obj, dict):
-                return dict((k, filter_fn(v)) for k, v in obj.items() if not reject(k, v))
-            elif isinstance(obj, (list, tuple, set, LazyList)):
-                return list(map(filter_fn, obj))
-            elif obj is None or any(isinstance(obj, c)
-                                    for c in (compat_integer_types,
-                                              (compat_str, float, bool))):
-                return obj
-            else:
-                return repr(obj)
-
-        return filter_fn(info_dict)
-
-    @classmethod
-    def filter_requested_info(cls, info_dict):
-        return cls.sanitize_info(info_dict, True)
 
     def post_process(self, filename, ie_info):
         """Run all the postprocessors on the given file."""
@@ -2514,21 +2297,18 @@ class YoutubeDL(object):
                 self.get_encoding()))
         write_string(encoding_str, encoding=None)
 
-        writeln_debug = lambda *s: self._write_string('[debug] %s\n' % (''.join(s), ))
+        self._write_string('[debug] youtube-dl version ' + __version__ + '\n')
-        writeln_debug('youtube-dl version ', __version__)
         if _LAZY_LOADER:
-            writeln_debug('Lazy loading extractors enabled')
+            self._write_string('[debug] Lazy loading extractors enabled' + '\n')
-        if ytdl_is_updateable():
-            writeln_debug('Single file build')
         try:
             sp = subprocess.Popen(
                 ['git', 'rev-parse', '--short', 'HEAD'],
                 stdout=subprocess.PIPE, stderr=subprocess.PIPE,
                 cwd=os.path.dirname(os.path.abspath(__file__)))
-            out, err = process_communicate_or_kill(sp)
+            out, err = sp.communicate()
             out = out.decode().strip()
             if re.match('[0-9a-f]+', out):
-                writeln_debug('Git HEAD: ', out)
+                self._write_string('[debug] Git HEAD: ' + out + '\n')
         except Exception:
             try:
                 sys.exc_clear()
@@ -2541,22 +2321,9 @@ class YoutubeDL(object):
                 return impl_name + ' version %d.%d.%d' % sys.pypy_version_info[:3]
             return impl_name
 
-        def libc_ver():
+        self._write_string('[debug] Python version %s (%s) - %s\n' % (
-            try:
+            platform.python_version(), python_implementation(),
-                return platform.libc_ver()
+            platform_name()))
-            except OSError:  # We may not have access to the executable
-                return []
-
-        libc = join_nonempty(*libc_ver(), delim=' ')
-        writeln_debug('Python %s (%s %s %s) - %s - %s%s' % (
-            platform.python_version(),
-            python_implementation(),
-            platform.machine(),
-            platform.architecture()[0],
-            platform_name(),
-            OPENSSL_VERSION,
-            (' - %s' % (libc, )) if libc else ''
-        ))
 
         exe_versions = FFmpegPostProcessor.get_versions(self)
         exe_versions['rtmpdump'] = rtmpdump_version()
@@ -2568,17 +2335,17 @@ class YoutubeDL(object):
         )
         if not exe_str:
             exe_str = 'none'
-        writeln_debug('exe versions: %s' % (exe_str, ))
+        self._write_string('[debug] exe versions: %s\n' % exe_str)
 
         proxy_map = {}
         for handler in self._opener.handlers:
             if hasattr(handler, 'proxies'):
                 proxy_map.update(handler.proxies)
-        writeln_debug('Proxy map: ', compat_str(proxy_map))
+        self._write_string('[debug] Proxy map: ' + compat_str(proxy_map) + '\n')
 
         if self.params.get('call_home', False):
             ipaddr = self.urlopen('https://yt-dl.org/ip').read().decode('utf-8')
-            writeln_debug('Public IP address: %s' % (ipaddr, ))
+            self._write_string('[debug] Public IP address: %s\n' % ipaddr)
             latest_version = self.urlopen(
                 'https://yt-dl.org/latest/version').read().decode('utf-8')
             if version_tuple(latest_version) > version_tuple(__version__):
@@ -2595,7 +2362,7 @@ class YoutubeDL(object):
         opts_proxy = self.params.get('proxy')
 
         if opts_cookiefile is None:
-            self.cookiejar = YoutubeDLCookieJar()
+            self.cookiejar = compat_cookiejar.CookieJar()
         else:
             opts_cookiefile = expand_path(opts_cookiefile)
             self.cookiejar = YoutubeDLCookieJar(opts_cookiefile)
@@ -2656,28 +2423,6 @@ class YoutubeDL(object):
             encoding = preferredencoding()
         return encoding
 
-    def _write_info_json(self, label, info_dict, infofn, overwrite=None):
-        if not self.params.get('writeinfojson', False):
-            return False
-
-        def msg(fmt, lbl):
-            return fmt % (lbl + ' metadata',)
-
-        if overwrite is None:
-            overwrite = not self.params.get('nooverwrites', False)
-
-        if not overwrite and os.path.exists(encodeFilename(infofn)):
-            self.to_screen(msg('[info] %s is already present', label.title()))
-            return 'exists'
-        else:
-            self.to_screen(msg('[info] Writing %s as JSON to: ', label) + infofn)
-            try:
-                write_json_file(self.filter_requested_info(info_dict), infofn)
-                return True
-            except (OSError, IOError):
-                self.report_error(msg('Cannot write %s to JSON file ', label) + infofn)
-                return
-
     def _write_thumbnails(self, info_dict, filename):
         if self.params.get('writethumbnail', False):
             thumbnails = info_dict.get('thumbnails')

youtube_dl/__init__.py

@@ -5,6 +5,7 @@ from __future__ import unicode_literals
 
 __license__ = 'Public Domain'
 
+import codecs
 import io
 import os
 import random
@@ -16,12 +17,10 @@ from .options import (
 )
 from .compat import (
     compat_getpass,
-    compat_register_utf8,
     compat_shlex_split,
     workaround_optparse_bug9161,
 )
 from .utils import (
-    _UnsafeExtensionError,
     DateRange,
     decodeOption,
     DEFAULT_OUTTMPL,
@@ -47,8 +46,10 @@ from .YoutubeDL import YoutubeDL
 
 
 def _real_main(argv=None):
-    # Compatibility fix for Windows
+    # Compatibility fixes for Windows
-    compat_register_utf8()
+    if sys.platform == 'win32':
+        # https://github.com/ytdl-org/youtube-dl/issues/820
+        codecs.register(lambda name: codecs.lookup('utf-8') if name == 'cp65001' else None)
 
     workaround_optparse_bug9161()
 
@@ -174,9 +175,6 @@ def _real_main(argv=None):
     if opts.ap_mso and opts.ap_mso not in MSO_INFO:
         parser.error('Unsupported TV Provider, use --ap-list-mso to get a list of supported TV Providers')
 
-    if opts.no_check_extensions:
-        _UnsafeExtensionError.lenient = True
-
     def parse_retries(retries):
         if retries in ('inf', 'infinite'):
             parsed_retries = float('inf')

youtube_dl/aes.py

@@ -8,18 +8,6 @@ from .utils import bytes_to_intlist, intlist_to_bytes
 BLOCK_SIZE_BYTES = 16
 
 
-def pkcs7_padding(data):
-    """
-    PKCS#7 padding
-
-    @param {int[]} data        cleartext
-    @returns {int[]}           padding data
-    """
-
-    remaining_length = BLOCK_SIZE_BYTES - len(data) % BLOCK_SIZE_BYTES
-    return data + [remaining_length] * remaining_length
-
-
 def aes_ctr_decrypt(data, key, counter):
     """
     Decrypt with aes in counter mode
@@ -88,7 +76,8 @@ def aes_cbc_encrypt(data, key, iv):
     previous_cipher_block = iv
     for i in range(block_count):
         block = data[i * BLOCK_SIZE_BYTES: (i + 1) * BLOCK_SIZE_BYTES]
-        block = pkcs7_padding(block)
+        remaining_length = BLOCK_SIZE_BYTES - len(block)
+        block += [remaining_length] * remaining_length
         mixed_block = xor(block, previous_cipher_block)
 
         encrypted_block = aes_encrypt(mixed_block, expanded_key)
@@ -99,28 +88,6 @@ def aes_cbc_encrypt(data, key, iv):
     return encrypted_data
 
 
-def aes_ecb_encrypt(data, key):
-    """
-    Encrypt with aes in ECB mode. Using PKCS#7 padding
-
-    @param {int[]} data        cleartext
-    @param {int[]} key         16/24/32-Byte cipher key
-    @returns {int[]}           encrypted data
-    """
-    expanded_key = key_expansion(key)
-    block_count = int(ceil(float(len(data)) / BLOCK_SIZE_BYTES))
-
-    encrypted_data = []
-    for i in range(block_count):
-        block = data[i * BLOCK_SIZE_BYTES: (i + 1) * BLOCK_SIZE_BYTES]
-        block = pkcs7_padding(block)
-
-        encrypted_block = aes_encrypt(block, expanded_key)
-        encrypted_data += encrypted_block
-
-    return encrypted_data
-
-
 def key_expansion(data):
     """
     Generate key schedule
@@ -336,7 +303,7 @@ def xor(data1, data2):
 
 
 def rijndael_mul(a, b):
-    if (a == 0 or b == 0):
+    if(a == 0 or b == 0):
         return 0
     return RIJNDAEL_EXP_TABLE[(RIJNDAEL_LOG_TABLE[a] + RIJNDAEL_LOG_TABLE[b]) % 0xFF]
 

youtube_dl/cache.py

@@ -1,32 +1,21 @@
 from __future__ import unicode_literals
 
 import errno
+import io
 import json
 import os
 import re
 import shutil
 import traceback
 
-from .compat import (
+from .compat import compat_getenv
-    compat_getenv,
-    compat_open as open,
-)
 from .utils import (
-    error_to_compat_str,
     expand_path,
-    is_outdated_version,
-    try_get,
     write_json_file,
 )
-from .version import __version__
 
 
 class Cache(object):
-
-    _YTDL_DIR = 'youtube-dl'
-    _VERSION_KEY = _YTDL_DIR + '_version'
-    _DEFAULT_VERSION = '2021.12.17'
-
     def __init__(self, ydl):
         self._ydl = ydl
 
@@ -34,7 +23,7 @@ class Cache(object):
         res = self._ydl.params.get('cachedir')
         if res is None:
             cache_root = compat_getenv('XDG_CACHE_HOME', '~/.cache')
-            res = os.path.join(cache_root, self._YTDL_DIR)
+            res = os.path.join(cache_root, 'youtube-dl')
         return expand_path(res)
 
     def _get_cache_fn(self, section, key, dtype):
@@ -61,22 +50,13 @@ class Cache(object):
             except OSError as ose:
                 if ose.errno != errno.EEXIST:
                     raise
-            write_json_file({self._VERSION_KEY: __version__, 'data': data}, fn)
+            write_json_file(data, fn)
         except Exception:
             tb = traceback.format_exc()
             self._ydl.report_warning(
                 'Writing cache to %r failed: %s' % (fn, tb))
 
-    def _validate(self, data, min_ver):
+    def load(self, section, key, dtype='json', default=None):
-        version = try_get(data, lambda x: x[self._VERSION_KEY])
-        if not version:  # Backward compatibility
-            data, version = {'data': data}, self._DEFAULT_VERSION
-        if not is_outdated_version(version, min_ver or '0', assume_new=False):
-            return data['data']
-        self._ydl.to_screen(
-            'Discarding old cache from version {version} (needs {min_ver})'.format(**locals()))
-
-    def load(self, section, key, dtype='json', default=None, min_ver=None):
         assert dtype in ('json',)
 
         if not self.enabled:
@@ -85,13 +65,13 @@ class Cache(object):
         cache_fn = self._get_cache_fn(section, key, dtype)
         try:
             try:
-                with open(cache_fn, 'r', encoding='utf-8') as cachef:
+                with io.open(cache_fn, 'r', encoding='utf-8') as cachef:
-                    return self._validate(json.load(cachef), min_ver)
+                    return json.load(cachef)
             except ValueError:
                 try:
                     file_size = os.path.getsize(cache_fn)
                 except (OSError, IOError) as oe:
-                    file_size = error_to_compat_str(oe)
+                    file_size = str(oe)
                 self._ydl.report_warning(
                     'Cache retrieval from %s failed (%s)' % (cache_fn, file_size))
         except IOError:

youtube_dl/compat.py

@@ -1,12 +1,10 @@
 # coding: utf-8
 from __future__ import unicode_literals
-from __future__ import division
 
 import base64
 import binascii
 import collections
 import ctypes
-import datetime
 import email
 import getpass
 import io
@@ -21,64 +19,14 @@ import socket
 import struct
 import subprocess
 import sys
-import types
 import xml.etree.ElementTree
 
-# naming convention
-# 'compat_' + Python3_name.replace('.', '_')
-# other aliases exist for convenience and/or legacy
-
-# deal with critical unicode/str things first
-try:
-    # Python 2
-    compat_str, compat_basestring, compat_chr = (
-        unicode, basestring, unichr
-    )
-except NameError:
-    compat_str, compat_basestring, compat_chr = (
-        str, (str, bytes), chr
-    )
-
-# casefold
-try:
-    compat_str.casefold
-    compat_casefold = lambda s: s.casefold()
-except AttributeError:
-    from .casefold import casefold as compat_casefold
-
-try:
-    import collections.abc as compat_collections_abc
-except ImportError:
-    import collections as compat_collections_abc
 
 try:
     import urllib.request as compat_urllib_request
 except ImportError:  # Python 2
     import urllib2 as compat_urllib_request
 
-# Also fix up lack of method arg in old Pythons
-try:
-    type(compat_urllib_request.Request('http://127.0.0.1', method='GET'))
-except TypeError:
-    def _add_init_method_arg(cls):
-
-        init = cls.__init__
-
-        def wrapped_init(self, *args, **kwargs):
-            method = kwargs.pop('method', 'GET')
-            init(self, *args, **kwargs)
-            if any(callable(x.__dict__.get('get_method')) for x in (self.__class__, self) if x != cls):
-                # allow instance or its subclass to override get_method()
-                return
-            if self.has_data() and method == 'GET':
-                method = 'POST'
-            self.get_method = types.MethodType(lambda _: method, self)
-
-        cls.__init__ = wrapped_init
-
-    _add_init_method_arg(compat_urllib_request.Request)
-    del _add_init_method_arg
-
 try:
     import urllib.error as compat_urllib_error
 except ImportError:  # Python 2
@@ -88,32 +36,26 @@ try:
     import urllib.parse as compat_urllib_parse
 except ImportError:  # Python 2
     import urllib as compat_urllib_parse
-    import urlparse as _urlparse
-    for a in dir(_urlparse):
-        if not hasattr(compat_urllib_parse, a):
-            setattr(compat_urllib_parse, a, getattr(_urlparse, a))
-    del _urlparse
 
-# unfavoured aliases
+try:
-compat_urlparse = compat_urllib_parse
+    from urllib.parse import urlparse as compat_urllib_parse_urlparse
-compat_urllib_parse_urlparse = compat_urllib_parse.urlparse
+except ImportError:  # Python 2
+    from urlparse import urlparse as compat_urllib_parse_urlparse
+
+try:
+    import urllib.parse as compat_urlparse
+except ImportError:  # Python 2
+    import urlparse as compat_urlparse
 
 try:
     import urllib.response as compat_urllib_response
 except ImportError:  # Python 2
     import urllib as compat_urllib_response
 
-try:
-    compat_urllib_response.addinfourl.status
-except AttributeError:
-    # .getcode() is deprecated in Py 3.
-    compat_urllib_response.addinfourl.status = property(lambda self: self.getcode())
-
 try:
     import http.cookiejar as compat_cookiejar
 except ImportError:  # Python 2
     import cookielib as compat_cookiejar
-compat_http_cookiejar = compat_cookiejar
 
 if sys.version_info[0] == 2:
     class compat_cookiejar_Cookie(compat_cookiejar.Cookie):
@@ -125,35 +67,11 @@ if sys.version_info[0] == 2:
             compat_cookiejar.Cookie.__init__(self, version, name, value, *args, **kwargs)
 else:
     compat_cookiejar_Cookie = compat_cookiejar.Cookie
-compat_http_cookiejar_Cookie = compat_cookiejar_Cookie
 
 try:
     import http.cookies as compat_cookies
 except ImportError:  # Python 2
     import Cookie as compat_cookies
-compat_http_cookies = compat_cookies
-
-if sys.version_info[0] == 2 or sys.version_info < (3, 3):
-    class compat_cookies_SimpleCookie(compat_cookies.SimpleCookie):
-        def load(self, rawdata):
-            must_have_value = 0
-            if not isinstance(rawdata, dict):
-                if sys.version_info[:2] != (2, 7) or sys.platform.startswith('java'):
-                    # attribute must have value for parsing
-                    rawdata, must_have_value = re.subn(
-                        r'(?i)(;\s*)(secure|httponly)(\s*(?:;|$))', r'\1\2=\2\3', rawdata)
-                if sys.version_info[0] == 2:
-                    if isinstance(rawdata, compat_str):
-                        rawdata = str(rawdata)
-            super(compat_cookies_SimpleCookie, self).load(rawdata)
-            if must_have_value > 0:
-                for morsel in self.values():
-                    for attr in ('secure', 'httponly'):
-                        if morsel.get(attr):
-                            morsel[attr] = True
-else:
-    compat_cookies_SimpleCookie = compat_cookies.SimpleCookie
-compat_http_cookies_SimpleCookie = compat_cookies_SimpleCookie
 
 try:
     import html.entities as compat_html_entities
@@ -2402,45 +2320,39 @@ try:
     import http.client as compat_http_client
 except ImportError:  # Python 2
     import httplib as compat_http_client
-try:
-    compat_http_client.HTTPResponse.getcode
-except AttributeError:
-    # Py < 3.1
-    compat_http_client.HTTPResponse.getcode = lambda self: self.status
 
 try:
     from urllib.error import HTTPError as compat_HTTPError
 except ImportError:  # Python 2
     from urllib2 import HTTPError as compat_HTTPError
-compat_urllib_HTTPError = compat_HTTPError
 
 try:
     from urllib.request import urlretrieve as compat_urlretrieve
 except ImportError:  # Python 2
     from urllib import urlretrieve as compat_urlretrieve
-compat_urllib_request_urlretrieve = compat_urlretrieve
 
 try:
-    from HTMLParser import (
-        HTMLParser as compat_HTMLParser,
-        HTMLParseError as compat_HTMLParseError)
-except ImportError:  # Python 3
     from html.parser import HTMLParser as compat_HTMLParser
+except ImportError:  # Python 2
+    from HTMLParser import HTMLParser as compat_HTMLParser
+
+try:  # Python 2
+    from HTMLParser import HTMLParseError as compat_HTMLParseError
+except ImportError:  # Python <3.4
     try:
         from html.parser import HTMLParseError as compat_HTMLParseError
     except ImportError:  # Python >3.4
-        # HTMLParseError was deprecated in Python 3.3 and removed in
+
+        # HTMLParseError has been deprecated in Python 3.3 and removed in
         # Python 3.5. Introducing dummy exception for Python >3.5 for compatible
         # and uniform cross-version exception handling
         class compat_HTMLParseError(Exception):
             pass
-compat_html_parser_HTMLParser = compat_HTMLParser
-compat_html_parser_HTMLParseError = compat_HTMLParseError
 
 try:
-    _DEVNULL = subprocess.DEVNULL
+    from subprocess import DEVNULL
-    compat_subprocess_get_DEVNULL = lambda: _DEVNULL
+    compat_subprocess_get_DEVNULL = lambda: DEVNULL
-except AttributeError:
+except ImportError:
     compat_subprocess_get_DEVNULL = lambda: open(os.path.devnull, 'w')
 
 try:
@@ -2448,12 +2360,15 @@ try:
 except ImportError:
     import BaseHTTPServer as compat_http_server
 
+try:
+    compat_str = unicode  # Python 2
+except NameError:
+    compat_str = str
+
 try:
     from urllib.parse import unquote_to_bytes as compat_urllib_parse_unquote_to_bytes
     from urllib.parse import unquote as compat_urllib_parse_unquote
     from urllib.parse import unquote_plus as compat_urllib_parse_unquote_plus
-    from urllib.parse import urlencode as compat_urllib_parse_urlencode
-    from urllib.parse import parse_qs as compat_parse_qs
 except ImportError:  # Python 2
     _asciire = (compat_urllib_parse._asciire if hasattr(compat_urllib_parse, '_asciire')
                 else re.compile(r'([\x00-\x7f]+)'))
@@ -2520,6 +2435,9 @@ except ImportError:  # Python 2
         string = string.replace('+', ' ')
         return compat_urllib_parse_unquote(string, encoding, errors)
 
+try:
+    from urllib.parse import urlencode as compat_urllib_parse_urlencode
+except ImportError:  # Python 2
     # Python 2 will choke in urlencode on mixture of byte and unicode strings.
     # Possible solutions are to either port it from python 3 with all
     # the friends or manually ensure input query contains only byte strings.
@@ -2541,62 +2459,7 @@ except ImportError:  # Python 2
         def encode_list(l):
             return [encode_elem(e) for e in l]
 
-        return compat_urllib_parse._urlencode(encode_elem(query), doseq=doseq)
+        return compat_urllib_parse.urlencode(encode_elem(query), doseq=doseq)
-
-    # HACK: The following is the correct parse_qs implementation from cpython 3's stdlib.
-    # Python 2's version is apparently totally broken
-    def _parse_qsl(qs, keep_blank_values=False, strict_parsing=False,
-                   encoding='utf-8', errors='replace'):
-        qs, _coerce_result = qs, compat_str
-        pairs = [s2 for s1 in qs.split('&') for s2 in s1.split(';')]
-        r = []
-        for name_value in pairs:
-            if not name_value and not strict_parsing:
-                continue
-            nv = name_value.split('=', 1)
-            if len(nv) != 2:
-                if strict_parsing:
-                    raise ValueError('bad query field: %r' % (name_value,))
-                # Handle case of a control-name with no equal sign
-                if keep_blank_values:
-                    nv.append('')
-                else:
-                    continue
-            if len(nv[1]) or keep_blank_values:
-                name = nv[0].replace('+', ' ')
-                name = compat_urllib_parse_unquote(
-                    name, encoding=encoding, errors=errors)
-                name = _coerce_result(name)
-                value = nv[1].replace('+', ' ')
-                value = compat_urllib_parse_unquote(
-                    value, encoding=encoding, errors=errors)
-                value = _coerce_result(value)
-                r.append((name, value))
-        return r
-
-    def compat_parse_qs(qs, keep_blank_values=False, strict_parsing=False,
-                        encoding='utf-8', errors='replace'):
-        parsed_result = {}
-        pairs = _parse_qsl(qs, keep_blank_values, strict_parsing,
-                           encoding=encoding, errors=errors)
-        for name, value in pairs:
-            if name in parsed_result:
-                parsed_result[name].append(value)
-            else:
-                parsed_result[name] = [value]
-        return parsed_result
-
-    setattr(compat_urllib_parse, '_urlencode',
-            getattr(compat_urllib_parse, 'urlencode'))
-    for name, fix in (
-            ('unquote_to_bytes', compat_urllib_parse_unquote_to_bytes),
-            ('parse_unquote', compat_urllib_parse_unquote),
-            ('unquote_plus', compat_urllib_parse_unquote_plus),
-            ('urlencode', compat_urllib_parse_urlencode),
-            ('parse_qs', compat_parse_qs)):
-        setattr(compat_urllib_parse, name, fix)
-
-compat_urllib_parse_parse_qs = compat_parse_qs
 
 try:
     from urllib.request import DataHandler as compat_urllib_request_DataHandler
@@ -2632,11 +2495,21 @@ except ImportError:  # Python < 3.4
 
             return compat_urllib_response.addinfourl(io.BytesIO(data), headers, url)
 
+try:
+    compat_basestring = basestring  # Python 2
+except NameError:
+    compat_basestring = str
+
+try:
+    compat_chr = unichr  # Python 2
+except NameError:
+    compat_chr = chr
+
 try:
     from xml.etree.ElementTree import ParseError as compat_xml_parse_error
 except ImportError:  # Python 2.6
     from xml.parsers.expat import ExpatError as compat_xml_parse_error
-compat_xml_etree_ElementTree_ParseError = compat_xml_parse_error
+
 
 etree = xml.etree.ElementTree
 
@@ -2650,11 +2523,10 @@ try:
     # xml.etree.ElementTree.Element is a method in Python <=2.6 and
     # the following will crash with:
     #  TypeError: isinstance() arg 2 must be a class, type, or tuple of classes and types
-    isinstance(None, etree.Element)
+    isinstance(None, xml.etree.ElementTree.Element)
     from xml.etree.ElementTree import Element as compat_etree_Element
 except TypeError:  # Python <=2.6
     from xml.etree.ElementTree import _ElementInterface as compat_etree_Element
-compat_xml_etree_ElementTree_Element = compat_etree_Element
 
 if sys.version_info[0] >= 3:
     def compat_etree_fromstring(text):
@@ -2710,7 +2582,6 @@ else:
             if k == uri or v == prefix:
                 del etree._namespace_map[k]
         etree._namespace_map[uri] = prefix
-compat_xml_etree_register_namespace = compat_etree_register_namespace
 
 if sys.version_info < (2, 7):
     # Here comes the crazy part: In 2.6, if the xpath is a unicode,
@@ -2719,222 +2590,55 @@ if sys.version_info < (2, 7):
         if isinstance(xpath, compat_str):
             xpath = xpath.encode('ascii')
         return xpath
-
-    # further code below based on CPython 2.7 source
-    import functools
-
-    _xpath_tokenizer_re = re.compile(r'''(?x)
-        (                                   # (1)
-            '[^']*'|"[^"]*"|                # quoted strings, or
-            ::|//?|\.\.|\(\)|[/.*:[\]()@=]  # navigation specials
-        )|                                  # or (2)
-        ((?:\{[^}]+\})?[^/[\]()@=\s]+)|     # token: optional {ns}, no specials
-        \s+                                 # or white space
-    ''')
-
-    def _xpath_tokenizer(pattern, namespaces=None):
-        for token in _xpath_tokenizer_re.findall(pattern):
-            tag = token[1]
-            if tag and tag[0] != "{" and ":" in tag:
-                try:
-                    if not namespaces:
-                        raise KeyError
-                    prefix, uri = tag.split(":", 1)
-                    yield token[0], "{%s}%s" % (namespaces[prefix], uri)
-                except KeyError:
-                    raise SyntaxError("prefix %r not found in prefix map" % prefix)
-            else:
-                yield token
-
-    def _get_parent_map(context):
-        parent_map = context.parent_map
-        if parent_map is None:
-            context.parent_map = parent_map = {}
-            for p in context.root.getiterator():
-                for e in p:
-                    parent_map[e] = p
-        return parent_map
-
-    def _select(context, result, filter_fn=lambda *_: True):
-        for elem in result:
-            for e in elem:
-                if filter_fn(e, elem):
-                    yield e
-
-    def _prepare_child(next_, token):
-        tag = token[1]
-        return functools.partial(_select, filter_fn=lambda e, _: e.tag == tag)
-
-    def _prepare_star(next_, token):
-        return _select
-
-    def _prepare_self(next_, token):
-        return lambda _, result: (e for e in result)
-
-    def _prepare_descendant(next_, token):
-        token = next(next_)
-        if token[0] == "*":
-            tag = "*"
-        elif not token[0]:
-            tag = token[1]
-        else:
-            raise SyntaxError("invalid descendant")
-
-        def select(context, result):
-            for elem in result:
-                for e in elem.getiterator(tag):
-                    if e is not elem:
-                        yield e
-        return select
-
-    def _prepare_parent(next_, token):
-        def select(context, result):
-            # FIXME: raise error if .. is applied at toplevel?
-            parent_map = _get_parent_map(context)
-            result_map = {}
-            for elem in result:
-                if elem in parent_map:
-                    parent = parent_map[elem]
-                    if parent not in result_map:
-                        result_map[parent] = None
-                        yield parent
-        return select
-
-    def _prepare_predicate(next_, token):
-        signature = []
-        predicate = []
-        for token in next_:
-            if token[0] == "]":
-                break
-            if token[0] and token[0][:1] in "'\"":
-                token = "'", token[0][1:-1]
-            signature.append(token[0] or "-")
-            predicate.append(token[1])
-
-        def select(context, result, filter_fn=lambda _: True):
-            for elem in result:
-                if filter_fn(elem):
-                    yield elem
-
-        signature = "".join(signature)
-        # use signature to determine predicate type
-        if signature == "@-":
-            # [@attribute] predicate
-            key = predicate[1]
-            return functools.partial(
-                select, filter_fn=lambda el: el.get(key) is not None)
-        if signature == "@-='":
-            # [@attribute='value']
-            key = predicate[1]
-            value = predicate[-1]
-            return functools.partial(
-                select, filter_fn=lambda el: el.get(key) == value)
-        if signature == "-" and not re.match(r"\d+$", predicate[0]):
-            # [tag]
-            tag = predicate[0]
-            return functools.partial(
-                select, filter_fn=lambda el: el.find(tag) is not None)
-        if signature == "-='" and not re.match(r"\d+$", predicate[0]):
-            # [tag='value']
-            tag = predicate[0]
-            value = predicate[-1]
-
-            def itertext(el):
-                for e in el.getiterator():
-                    e = e.text
-                    if e:
-                        yield e
-
-            def select(context, result):
-                for elem in result:
-                    for e in elem.findall(tag):
-                        if "".join(itertext(e)) == value:
-                            yield elem
-                            break
-            return select
-        if signature == "-" or signature == "-()" or signature == "-()-":
-            # [index] or [last()] or [last()-index]
-            if signature == "-":
-                index = int(predicate[0]) - 1
-            else:
-                if predicate[0] != "last":
-                    raise SyntaxError("unsupported function")
-                if signature == "-()-":
-                    try:
-                        index = int(predicate[2]) - 1
-                    except ValueError:
-                        raise SyntaxError("unsupported expression")
-                else:
-                    index = -1
-
-            def select(context, result):
-                parent_map = _get_parent_map(context)
-                for elem in result:
-                    try:
-                        parent = parent_map[elem]
-                        # FIXME: what if the selector is "*" ?
-                        elems = list(parent.findall(elem.tag))
-                        if elems[index] is elem:
-                            yield elem
-                    except (IndexError, KeyError):
-                        pass
-            return select
-        raise SyntaxError("invalid predicate")
-
-    ops = {
-        "": _prepare_child,
-        "*": _prepare_star,
-        ".": _prepare_self,
-        "..": _prepare_parent,
-        "//": _prepare_descendant,
-        "[": _prepare_predicate,
-    }
-
-    _cache = {}
-
-    class _SelectorContext:
-        parent_map = None
-
-        def __init__(self, root):
-            self.root = root
-
-    ##
-    # Generate all matching objects.
-
-    def compat_etree_iterfind(elem, path, namespaces=None):
-        # compile selector pattern
-        if path[-1:] == "/":
-            path = path + "*"  # implicit all (FIXME: keep this?)
-        try:
-            selector = _cache[path]
-        except KeyError:
-            if len(_cache) > 100:
-                _cache.clear()
-            if path[:1] == "/":
-                raise SyntaxError("cannot use absolute path on element")
-            tokens = _xpath_tokenizer(path, namespaces)
-            selector = []
-            for token in tokens:
-                if token[0] == "/":
-                    continue
-                try:
-                    selector.append(ops[token[0]](tokens, token))
-                except StopIteration:
-                    raise SyntaxError("invalid path")
-            _cache[path] = selector
-        # execute selector pattern
-        result = [elem]
-        context = _SelectorContext(elem)
-        for select in selector:
-            result = select(context, result)
-        return result
-
-    # end of code based on CPython 2.7 source
-
-
 else:
     compat_xpath = lambda xpath: xpath
-    compat_etree_iterfind = lambda element, match: element.iterfind(match)
+
+try:
+    from urllib.parse import parse_qs as compat_parse_qs
+except ImportError:  # Python 2
+    # HACK: The following is the correct parse_qs implementation from cpython 3's stdlib.
+    # Python 2's version is apparently totally broken
+
+    def _parse_qsl(qs, keep_blank_values=False, strict_parsing=False,
+                   encoding='utf-8', errors='replace'):
+        qs, _coerce_result = qs, compat_str
+        pairs = [s2 for s1 in qs.split('&') for s2 in s1.split(';')]
+        r = []
+        for name_value in pairs:
+            if not name_value and not strict_parsing:
+                continue
+            nv = name_value.split('=', 1)
+            if len(nv) != 2:
+                if strict_parsing:
+                    raise ValueError('bad query field: %r' % (name_value,))
+                # Handle case of a control-name with no equal sign
+                if keep_blank_values:
+                    nv.append('')
+                else:
+                    continue
+            if len(nv[1]) or keep_blank_values:
+                name = nv[0].replace('+', ' ')
+                name = compat_urllib_parse_unquote(
+                    name, encoding=encoding, errors=errors)
+                name = _coerce_result(name)
+                value = nv[1].replace('+', ' ')
+                value = compat_urllib_parse_unquote(
+                    value, encoding=encoding, errors=errors)
+                value = _coerce_result(value)
+                r.append((name, value))
+        return r
+
+    def compat_parse_qs(qs, keep_blank_values=False, strict_parsing=False,
+                        encoding='utf-8', errors='replace'):
+        parsed_result = {}
+        pairs = _parse_qsl(qs, keep_blank_values, strict_parsing,
+                           encoding=encoding, errors=errors)
+        for name, value in pairs:
+            if name in parsed_result:
+                parsed_result[name].append(value)
+            else:
+                parsed_result[name] = [value]
+        return parsed_result
 
 
 compat_os_name = os._name if os.name == 'java' else os.name
@@ -2970,7 +2674,7 @@ except (AssertionError, UnicodeEncodeError):
 
 
 def compat_ord(c):
-    if isinstance(c, int):
+    if type(c) is int:
         return c
     else:
         return ord(c)
@@ -3060,8 +2764,6 @@ else:
     else:
         compat_expanduser = os.path.expanduser
 
-compat_os_path_expanduser = compat_expanduser
-
 
 if compat_os_name == 'nt' and sys.version_info < (3, 8):
     # os.path.realpath on Windows does not follow symbolic links
@@ -3073,8 +2775,6 @@ if compat_os_name == 'nt' and sys.version_info < (3, 8):
 else:
     compat_realpath = os.path.realpath
 
-compat_os_path_realpath = compat_realpath
-
 
 if sys.version_info < (3, 0):
     def compat_print(s):
@@ -3095,15 +2795,11 @@ if sys.version_info < (3, 0) and sys.platform == 'win32':
 else:
     compat_getpass = getpass.getpass
 
-compat_getpass_getpass = compat_getpass
-
-
 try:
     compat_input = raw_input
 except NameError:  # Python 3
     compat_input = input
 
-
 # Python < 2.6.5 require kwargs to be bytes
 try:
     def _testfunc(x):
@@ -3154,51 +2850,6 @@ else:
     compat_socket_create_connection = socket.create_connection
 
 
-try:
-    from contextlib import suppress as compat_contextlib_suppress
-except ImportError:
-    class compat_contextlib_suppress(object):
-        _exceptions = None
-
-        def __init__(self, *exceptions):
-            super(compat_contextlib_suppress, self).__init__()
-            # TODO: [Base]ExceptionGroup (3.12+)
-            self._exceptions = exceptions
-
-        def __enter__(self):
-            return self
-
-        def __exit__(self, exc_type, exc_val, exc_tb):
-            return exc_type is not None and issubclass(exc_type, self._exceptions or tuple())
-
-
-# subprocess.Popen context manager
-# avoids leaking handles if .communicate() is not called
-try:
-    _Popen = subprocess.Popen
-    # check for required context manager attributes
-    _Popen.__enter__ and _Popen.__exit__
-    compat_subprocess_Popen = _Popen
-except AttributeError:
-    # not a context manager - make one
-    from contextlib import contextmanager
-
-    @contextmanager
-    def compat_subprocess_Popen(*args, **kwargs):
-        popen = None
-        try:
-            popen = _Popen(*args, **kwargs)
-            yield popen
-        finally:
-            if popen:
-                for f in (popen.stdin, popen.stdout, popen.stderr):
-                    if f:
-                        # repeated .close() is OK, but just in case
-                        with compat_contextlib_suppress(EnvironmentError):
-                            f.close()
-                popen.wait()
-
-
 # Fix https://github.com/ytdl-org/youtube-dl/issues/4223
 # See http://bugs.python.org/issue9161 for what is broken
 def workaround_optparse_bug9161():
@@ -3226,7 +2877,6 @@ else:
     _terminal_size = collections.namedtuple('terminal_size', ['columns', 'lines'])
 
     def compat_get_terminal_size(fallback=(80, 24)):
-        from .utils import process_communicate_or_kill
         columns = compat_getenv('COLUMNS')
         if columns:
             columns = int(columns)
@@ -3243,7 +2893,7 @@ else:
                 sp = subprocess.Popen(
                     ['stty', 'size'],
                     stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-                out, err = process_communicate_or_kill(sp)
+                out, err = sp.communicate()
                 _lines, _columns = map(int, out.split())
             except Exception:
                 _columns, _lines = _terminal_size(*fallback)
@@ -3254,16 +2904,15 @@ else:
                 lines = _lines
         return _terminal_size(columns, lines)
 
-
 try:
     itertools.count(start=0, step=1)
     compat_itertools_count = itertools.count
 except TypeError:  # Python 2.6
     def compat_itertools_count(start=0, step=1):
+        n = start
         while True:
-            yield start
+            yield n
-            start += step
+            n += step
-
 
 if sys.version_info >= (3, 0):
     from tokenize import tokenize as compat_tokenize_tokenize
@@ -3304,24 +2953,6 @@ else:
         compat_Struct = struct.Struct
 
 
-# compat_map/filter() returning an iterator, supposedly the
-# same versioning as for zip below
-try:
-    from future_builtins import map as compat_map
-except ImportError:
-    try:
-        from itertools import imap as compat_map
-    except ImportError:
-        compat_map = map
-
-try:
-    from future_builtins import filter as compat_filter
-except ImportError:
-    try:
-        from itertools import ifilter as compat_filter
-    except ImportError:
-        compat_filter = filter
-
 try:
     from future_builtins import zip as compat_zip
 except ImportError:  # not 2.6+ or is 3.x
@@ -3331,82 +2962,6 @@ except ImportError:  # not 2.6+ or is 3.x
         compat_zip = zip
 
 
-# method renamed between Py2/3
-try:
-    from itertools import zip_longest as compat_itertools_zip_longest
-except ImportError:
-    from itertools import izip_longest as compat_itertools_zip_longest
-
-
-# new class in collections
-try:
-    from collections import ChainMap as compat_collections_chain_map
-    # Py3.3's ChainMap is deficient
-    if sys.version_info < (3, 4):
-        raise ImportError
-except ImportError:
-    # Py <= 3.3
-    class compat_collections_chain_map(compat_collections_abc.MutableMapping):
-
-        maps = [{}]
-
-        def __init__(self, *maps):
-            self.maps = list(maps) or [{}]
-
-        def __getitem__(self, k):
-            for m in self.maps:
-                if k in m:
-                    return m[k]
-            raise KeyError(k)
-
-        def __setitem__(self, k, v):
-            self.maps[0].__setitem__(k, v)
-            return
-
-        def __contains__(self, k):
-            return any((k in m) for m in self.maps)
-
-        def __delitem(self, k):
-            if k in self.maps[0]:
-                del self.maps[0][k]
-                return
-            raise KeyError(k)
-
-        def __delitem__(self, k):
-            self.__delitem(k)
-
-        def __iter__(self):
-            return itertools.chain(*reversed(self.maps))
-
-        def __len__(self):
-            return len(iter(self))
-
-        # to match Py3, don't del directly
-        def pop(self, k, *args):
-            if self.__contains__(k):
-                off = self.__getitem__(k)
-                self.__delitem(k)
-                return off
-            elif len(args) > 0:
-                return args[0]
-            raise KeyError(k)
-
-        def new_child(self, m=None, **kwargs):
-            m = m or {}
-            m.update(kwargs)
-            return compat_collections_chain_map(m, *self.maps)
-
-        @property
-        def parents(self):
-            return compat_collections_chain_map(*(self.maps[1:]))
-
-
-# Pythons disagree on the type of a pattern (RegexObject, _sre.SRE_Pattern, Pattern, ...?)
-compat_re_Pattern = type(re.compile(''))
-# and on the type of a match
-compat_re_Match = type(re.match('a', 'a'))
-
-
 if sys.version_info < (3, 3):
     def compat_b64decode(s, *args, **kwargs):
         if isinstance(s, compat_str):
@@ -3415,8 +2970,6 @@ if sys.version_info < (3, 3):
 else:
     compat_b64decode = base64.b64decode
 
-compat_base64_b64decode = compat_b64decode
-
 
 if platform.python_implementation() == 'PyPy' and sys.pypy_version_info < (5, 4, 0):
     # PyPy2 prior to version 5.4.0 expects byte strings as Windows function
@@ -3436,97 +2989,25 @@ else:
         return ctypes.WINFUNCTYPE(*args, **kwargs)
 
 
-if sys.version_info < (3, 0):
+__all__ = [
-    # open(file, mode='r', buffering=- 1, encoding=None, errors=None, newline=None, closefd=True) not: opener=None
-    def compat_open(file_, *args, **kwargs):
-        if len(args) > 6 or 'opener' in kwargs:
-            raise ValueError('open: unsupported argument "opener"')
-        return io.open(file_, *args, **kwargs)
-else:
-    compat_open = open
-
-
-# compat_register_utf8
-def compat_register_utf8():
-    if sys.platform == 'win32':
-        # https://github.com/ytdl-org/youtube-dl/issues/820
-        from codecs import register, lookup
-        register(
-            lambda name: lookup('utf-8') if name == 'cp65001' else None)
-
-
-# compat_datetime_timedelta_total_seconds
-try:
-    compat_datetime_timedelta_total_seconds = datetime.timedelta.total_seconds
-except AttributeError:
-    # Py 2.6
-    def compat_datetime_timedelta_total_seconds(td):
-        return (td.microseconds + (td.seconds + td.days * 24 * 3600) * 10**6) / 10**6
-
-# optional decompression packages
-# PyPi brotli package implements 'br' Content-Encoding
-try:
-    import brotli as compat_brotli
-except ImportError:
-    compat_brotli = None
-# PyPi ncompress package implements 'compress' Content-Encoding
-try:
-    import ncompress as compat_ncompress
-except ImportError:
-    compat_ncompress = None
-
-
-legacy = [
     'compat_HTMLParseError',
     'compat_HTMLParser',
     'compat_HTTPError',
+    'compat_Struct',
     'compat_b64decode',
+    'compat_basestring',
+    'compat_chr',
     'compat_cookiejar',
     'compat_cookiejar_Cookie',
     'compat_cookies',
-    'compat_cookies_SimpleCookie',
+    'compat_ctypes_WINFUNCTYPE',
     'compat_etree_Element',
+    'compat_etree_fromstring',
     'compat_etree_register_namespace',
     'compat_expanduser',
-    'compat_getpass',
-    'compat_parse_qs',
-    'compat_realpath',
-    'compat_urllib_parse_parse_qs',
-    'compat_urllib_parse_unquote',
-    'compat_urllib_parse_unquote_plus',
-    'compat_urllib_parse_unquote_to_bytes',
-    'compat_urllib_parse_urlencode',
-    'compat_urllib_parse_urlparse',
-    'compat_urlparse',
-    'compat_urlretrieve',
-    'compat_xml_parse_error',
-]
-
-
-__all__ = [
-    'compat_html_parser_HTMLParseError',
-    'compat_html_parser_HTMLParser',
-    'compat_Struct',
-    'compat_base64_b64decode',
-    'compat_basestring',
-    'compat_brotli',
-    'compat_casefold',
-    'compat_chr',
-    'compat_collections_abc',
-    'compat_collections_chain_map',
-    'compat_datetime_timedelta_total_seconds',
-    'compat_http_cookiejar',
-    'compat_http_cookiejar_Cookie',
-    'compat_http_cookies',
-    'compat_http_cookies_SimpleCookie',
-    'compat_contextlib_suppress',
-    'compat_ctypes_WINFUNCTYPE',
-    'compat_etree_fromstring',
-    'compat_etree_iterfind',
-    'compat_filter',
     'compat_get_terminal_size',
     'compat_getenv',
-    'compat_getpass_getpass',
+    'compat_getpass',
     'compat_html_entities',
     'compat_html_entities_html5',
     'compat_http_client',
@@ -3534,20 +3015,13 @@ __all__ = [
     'compat_input',
     'compat_integer_types',
     'compat_itertools_count',
-    'compat_itertools_zip_longest',
     'compat_kwargs',
-    'compat_map',
-    'compat_ncompress',
     'compat_numeric_types',
-    'compat_open',
     'compat_ord',
     'compat_os_name',
-    'compat_os_path_expanduser',
+    'compat_parse_qs',
-    'compat_os_path_realpath',
     'compat_print',
-    'compat_re_Match',
+    'compat_realpath',
-    'compat_re_Pattern',
-    'compat_register_utf8',
     'compat_setenv',
     'compat_shlex_quote',
     'compat_shlex_split',
@@ -3556,18 +3030,20 @@ __all__ = [
     'compat_struct_pack',
     'compat_struct_unpack',
     'compat_subprocess_get_DEVNULL',
-    'compat_subprocess_Popen',
     'compat_tokenize_tokenize',
     'compat_urllib_error',
     'compat_urllib_parse',
+    'compat_urllib_parse_unquote',
+    'compat_urllib_parse_unquote_plus',
+    'compat_urllib_parse_unquote_to_bytes',
+    'compat_urllib_parse_urlencode',
+    'compat_urllib_parse_urlparse',
     'compat_urllib_request',
     'compat_urllib_request_DataHandler',
     'compat_urllib_response',
-    'compat_urllib_request_urlretrieve',
+    'compat_urlparse',
-    'compat_urllib_HTTPError',
+    'compat_urlretrieve',
-    'compat_xml_etree_ElementTree_Element',
+    'compat_xml_parse_error',
-    'compat_xml_etree_ElementTree_ParseError',
-    'compat_xml_etree_register_namespace',
     'compat_xpath',
     'compat_zip',
     'workaround_optparse_bug9161',

youtube_dl/downloader/__init__.py

@@ -1,31 +1,22 @@
 from __future__ import unicode_literals
 
-from ..utils import (
-    determine_protocol,
-)
-
-
-def get_suitable_downloader(info_dict, params={}):
-    info_dict['protocol'] = determine_protocol(info_dict)
-    info_copy = info_dict.copy()
-    return _get_suitable_downloader(info_copy, params)
-
-
-# Some of these require get_suitable_downloader
 from .common import FileDownloader
-from .dash import DashSegmentsFD
 from .f4m import F4mFD
 from .hls import HlsFD
 from .http import HttpFD
 from .rtmp import RtmpFD
+from .dash import DashSegmentsFD
 from .rtsp import RtspFD
 from .ism import IsmFD
-from .niconico import NiconicoDmcFD
 from .external import (
     get_external_downloader,
     FFmpegFD,
 )
 
+from ..utils import (
+    determine_protocol,
+)
+
 PROTOCOL_MAP = {
     'rtmp': RtmpFD,
     'm3u8_native': HlsFD,
@@ -35,12 +26,13 @@ PROTOCOL_MAP = {
     'f4m': F4mFD,
     'http_dash_segments': DashSegmentsFD,
     'ism': IsmFD,
-    'niconico_dmc': NiconicoDmcFD,
 }
 
 
-def _get_suitable_downloader(info_dict, params={}):
+def get_suitable_downloader(info_dict, params={}):
     """Get the downloader class that can handle the info dict."""
+    protocol = determine_protocol(info_dict)
+    info_dict['protocol'] = protocol
 
     # if (info_dict.get('start_time') or info_dict.get('end_time')) and not info_dict.get('requested_formats') and FFmpegFD.can_download(info_dict):
     #     return FFmpegFD
@@ -50,11 +42,7 @@ def _get_suitable_downloader(info_dict, params={}):
         ed = get_external_downloader(external_downloader)
         if ed.can_download(info_dict):
             return ed
-        # Avoid using unwanted args since external_downloader was rejected
-        if params.get('external_downloader_args'):
-            params['external_downloader_args'] = None
 
-    protocol = info_dict['protocol']
     if protocol.startswith('m3u8') and info_dict.get('is_live'):
         return FFmpegFD
 

youtube_dl/downloader/common.py

@@ -88,21 +88,17 @@ class FileDownloader(object):
             return '---.-%'
         return '%6s' % ('%3.1f%%' % percent)
 
-    @classmethod
+    @staticmethod
-    def calc_eta(cls, start_or_rate, now_or_remaining, *args):
+    def calc_eta(start, now, total, current):
-        if len(args) < 2:
-            rate, remaining = (start_or_rate, now_or_remaining)
-            if None in (rate, remaining):
-                return None
-            return int(float(remaining) / rate)
-        start, now = (start_or_rate, now_or_remaining)
-        total, current = args[:2]
         if total is None:
             return None
         if now is None:
             now = time.time()
-        rate = cls.calc_speed(start, now, current)
+        dif = now - start
-        return rate and int((float(total) - float(current)) / rate)
+        if current == 0 or dif < 0.001:  # One millisecond
+            return None
+        rate = float(current) / dif
+        return int((float(total) - float(current)) / rate)
 
     @staticmethod
     def format_eta(eta):
@@ -127,12 +123,6 @@ class FileDownloader(object):
     def format_retries(retries):
         return 'inf' if retries == float('inf') else '%.0f' % retries
 
-    @staticmethod
-    def filesize_or_none(unencoded_filename):
-        fn = encodeFilename(unencoded_filename)
-        if os.path.isfile(fn):
-            return os.path.getsize(fn)
-
     @staticmethod
     def best_block_size(elapsed_time, bytes):
         new_min = max(bytes / 2.0, 1.0)
@@ -339,10 +329,6 @@ class FileDownloader(object):
     def download(self, filename, info_dict):
         """Download to a filename using the info from info_dict
         Return True on success and False otherwise
-
-        This method filters the `Cookie` header from the info_dict to prevent leaks.
-        Downloaders have their own way of handling cookies.
-        See: https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-v8mc-9377-rwjj
         """
 
         nooverwrites_and_exists = (

youtube_dl/downloader/dash.py

@@ -1,7 +1,5 @@
 from __future__ import unicode_literals
 
-import itertools
-
 from .fragment import FragmentFD
 from ..compat import compat_urllib_error
 from ..utils import (
@@ -32,28 +30,26 @@ class DashSegmentsFD(FragmentFD):
         fragment_retries = self.params.get('fragment_retries', 0)
         skip_unavailable_fragments = self.params.get('skip_unavailable_fragments', True)
 
-        for frag_index, fragment in enumerate(fragments, 1):
+        frag_index = 0
+        for i, fragment in enumerate(fragments):
+            frag_index += 1
             if frag_index <= ctx['fragment_index']:
                 continue
-            success = False
             # In DASH, the first segment contains necessary headers to
             # generate a valid MP4 file, so always abort for the first segment
-            fatal = frag_index == 1 or not skip_unavailable_fragments
+            fatal = i == 0 or not skip_unavailable_fragments
-            fragment_url = fragment.get('url')
+            count = 0
-            if not fragment_url:
+            while count <= fragment_retries:
-                assert fragment_base_url
-                fragment_url = urljoin(fragment_base_url, fragment['path'])
-            headers = info_dict.get('http_headers')
-            fragment_range = fragment.get('range')
-            if fragment_range:
-                headers = headers.copy() if headers else {}
-                headers['Range'] = 'bytes=%s' % (fragment_range,)
-            for count in itertools.count():
                 try:
-                    success, frag_content = self._download_fragment(ctx, fragment_url, info_dict, headers)
+                    fragment_url = fragment.get('url')
+                    if not fragment_url:
+                        assert fragment_base_url
+                        fragment_url = urljoin(fragment_base_url, fragment['path'])
+                    success, frag_content = self._download_fragment(ctx, fragment_url, info_dict)
                     if not success:
                         return False
                     self._append_fragment(ctx, frag_content)
+                    break
                 except compat_urllib_error.HTTPError as err:
                     # YouTube may often return 404 HTTP error for a fragment causing the
                     # whole download to fail. However if the same fragment is immediately
@@ -61,21 +57,22 @@ class DashSegmentsFD(FragmentFD):
                     # is usually enough) thus allowing to download the whole file successfully.
                     # To be future-proof we will retry all fragments that fail with any
                     # HTTP error.
-                    if count < fragment_retries:
+                    count += 1
-                        self.report_retry_fragment(err, frag_index, count + 1, fragment_retries)
+                    if count <= fragment_retries:
-                        continue
+                        self.report_retry_fragment(err, frag_index, count, fragment_retries)
                 except DownloadError:
                     # Don't retry fragment if error occurred during HTTP downloading
-                    # itself since it has its own retry settings
+                    # itself since it has own retry settings
-                    if fatal:
+                    if not fatal:
-                        raise
+                        self.report_skip_fragment(frag_index)
-                break
+                        break
+                    raise
 
-            if not success:
+            if count > fragment_retries:
                 if not fatal:
                     self.report_skip_fragment(frag_index)
                     continue
-                self.report_error('giving up after %s fragment retries' % count)
+                self.report_error('giving up after %s fragment retries' % fragment_retries)
                 return False
 
         self._finish_frag_download(ctx)

youtube_dl/downloader/external.py

@@ -1,24 +1,17 @@
 from __future__ import unicode_literals
 
-import os
+import os.path
 import re
 import subprocess
 import sys
-import tempfile
 import time
 
 from .common import FileDownloader
 from ..compat import (
     compat_setenv,
     compat_str,
-    compat_subprocess_Popen,
 )
-
+from ..postprocessor.ffmpeg import FFmpegPostProcessor, EXT_TO_OUT_FORMATS
-try:
-    from ..postprocessor.ffmpeg import FFmpegPostProcessor, EXT_TO_OUT_FORMATS
-except ImportError:
-    FFmpegPostProcessor = None
-
 from ..utils import (
     cli_option,
     cli_valueless_option,
@@ -29,9 +22,6 @@ from ..utils import (
     handle_youtubedl_headers,
     check_executable,
     is_outdated_version,
-    process_communicate_or_kill,
-    T,
-    traverse_obj,
 )
 
 
@@ -39,7 +29,6 @@ class ExternalFD(FileDownloader):
     def real_download(self, filename, info_dict):
         self.report_destination(filename)
         tmpfilename = self.temp_name(filename)
-        self._cookies_tempfile = None
 
         try:
             started = time.time()
@@ -52,13 +41,6 @@ class ExternalFD(FileDownloader):
             # should take place
             retval = 0
             self.to_screen('[%s] Interrupted by user' % self.get_basename())
-        finally:
-            if self._cookies_tempfile and os.path.isfile(self._cookies_tempfile):
-                try:
-                    os.remove(self._cookies_tempfile)
-                except OSError:
-                    self.report_warning(
-                        'Unable to delete temporary cookies file "{0}"'.format(self._cookies_tempfile))
 
         if retval == 0:
             status = {
@@ -114,16 +96,6 @@ class ExternalFD(FileDownloader):
     def _configuration_args(self, default=[]):
         return cli_configuration_args(self.params, 'external_downloader_args', default)
 
-    def _write_cookies(self):
-        if not self.ydl.cookiejar.filename:
-            tmp_cookies = tempfile.NamedTemporaryFile(suffix='.cookies', delete=False)
-            tmp_cookies.close()
-            self._cookies_tempfile = tmp_cookies.name
-            self.to_screen('[download] Writing temporary cookies file to "{0}"'.format(self._cookies_tempfile))
-        # real_download resets _cookies_tempfile; if it's None, save() will write to cookiejar.filename
-        self.ydl.cookiejar.save(self._cookies_tempfile, ignore_discard=True, ignore_expires=True)
-        return self.ydl.cookiejar.filename or self._cookies_tempfile
-
     def _call_downloader(self, tmpfilename, info_dict):
         """ Either overwrite this or implement _make_cmd """
         cmd = [encodeArgument(a) for a in self._make_cmd(tmpfilename, info_dict)]
@@ -132,26 +104,18 @@ class ExternalFD(FileDownloader):
 
         p = subprocess.Popen(
             cmd, stderr=subprocess.PIPE)
-        _, stderr = process_communicate_or_kill(p)
+        _, stderr = p.communicate()
         if p.returncode != 0:
             self.to_stderr(stderr.decode('utf-8', 'replace'))
         return p.returncode
 
-    @staticmethod
-    def _header_items(info_dict):
-        return traverse_obj(
-            info_dict, ('http_headers', T(dict.items), Ellipsis))
-
 
 class CurlFD(ExternalFD):
     AVAILABLE_OPT = '-V'
 
     def _make_cmd(self, tmpfilename, info_dict):
-        cmd = [self.exe, '--location', '-o', tmpfilename, '--compressed']
+        cmd = [self.exe, '--location', '-o', tmpfilename]
-        cookie_header = self.ydl.cookiejar.get_cookie_header(info_dict['url'])
+        for key, val in info_dict['http_headers'].items():
-        if cookie_header:
-            cmd += ['--cookie', cookie_header]
-        for key, val in self._header_items(info_dict):
             cmd += ['--header', '%s: %s' % (key, val)]
         cmd += self._bool_option('--continue-at', 'continuedl', '-', '0')
         cmd += self._valueless_option('--silent', 'noprogress')
@@ -177,7 +141,7 @@ class CurlFD(ExternalFD):
 
         # curl writes the progress to stderr so don't capture it.
         p = subprocess.Popen(cmd)
-        process_communicate_or_kill(p)
+        p.communicate()
         return p.returncode
 
 
@@ -186,11 +150,8 @@ class AxelFD(ExternalFD):
 
     def _make_cmd(self, tmpfilename, info_dict):
         cmd = [self.exe, '-o', tmpfilename]
-        for key, val in self._header_items(info_dict):
+        for key, val in info_dict['http_headers'].items():
             cmd += ['-H', '%s: %s' % (key, val)]
-        cookie_header = self.ydl.cookiejar.get_cookie_header(info_dict['url'])
-        if cookie_header:
-            cmd += ['-H', 'Cookie: {0}'.format(cookie_header), '--max-redirect=0']
         cmd += self._configuration_args()
         cmd += ['--', info_dict['url']]
         return cmd
@@ -200,10 +161,8 @@ class WgetFD(ExternalFD):
     AVAILABLE_OPT = '--version'
 
     def _make_cmd(self, tmpfilename, info_dict):
-        cmd = [self.exe, '-O', tmpfilename, '-nv', '--compression=auto']
+        cmd = [self.exe, '-O', tmpfilename, '-nv', '--no-cookies']
-        if self.ydl.cookiejar.get_cookie_header(info_dict['url']):
+        for key, val in info_dict['http_headers'].items():
-            cmd += ['--load-cookies', self._write_cookies()]
-        for key, val in self._header_items(info_dict):
             cmd += ['--header', '%s: %s' % (key, val)]
         cmd += self._option('--limit-rate', 'ratelimit')
         retry = self._option('--tries', 'retries')
@@ -212,10 +171,7 @@ class WgetFD(ExternalFD):
                 retry[1] = '0'
             cmd += retry
         cmd += self._option('--bind-address', 'source_address')
-        proxy = self.params.get('proxy')
+        cmd += self._option('--proxy', 'proxy')
-        if proxy:
-            for var in ('http_proxy', 'https_proxy'):
-                cmd += ['--execute', '%s=%s' % (var, proxy)]
         cmd += self._valueless_option('--no-check-certificate', 'nocheckcertificate')
         cmd += self._configuration_args()
         cmd += ['--', info_dict['url']]
@@ -225,121 +181,24 @@ class WgetFD(ExternalFD):
 class Aria2cFD(ExternalFD):
     AVAILABLE_OPT = '-v'
 
-    @staticmethod
-    def _aria2c_filename(fn):
-        return fn if os.path.isabs(fn) else os.path.join('.', fn)
-
     def _make_cmd(self, tmpfilename, info_dict):
-        cmd = [self.exe, '-c',
+        cmd = [self.exe, '-c']
-               '--console-log-level=warn', '--summary-interval=0', '--download-result=hide',
+        cmd += self._configuration_args([
-               '--http-accept-gzip=true', '--file-allocation=none', '-x16', '-j16', '-s16']
+            '--min-split-size', '1M', '--max-connection-per-server', '4'])
-        if 'fragments' in info_dict:
+        dn = os.path.dirname(tmpfilename)
-            cmd += ['--allow-overwrite=true', '--allow-piece-length-change=true']
+        if dn:
-        else:
+            cmd += ['--dir', dn]
-            cmd += ['--min-split-size', '1M']
-
-        if self.ydl.cookiejar.get_cookie_header(info_dict['url']):
-            cmd += ['--load-cookies={0}'.format(self._write_cookies())]
-        for key, val in self._header_items(info_dict):
-            cmd += ['--header', '%s: %s' % (key, val)]
-        cmd += self._configuration_args(['--max-connection-per-server', '4'])
         cmd += ['--out', os.path.basename(tmpfilename)]
-        cmd += self._option('--max-overall-download-limit', 'ratelimit')
+        for key, val in info_dict['http_headers'].items():
+            cmd += ['--header', '%s: %s' % (key, val)]
         cmd += self._option('--interface', 'source_address')
         cmd += self._option('--all-proxy', 'proxy')
         cmd += self._bool_option('--check-certificate', 'nocheckcertificate', 'false', 'true', '=')
         cmd += self._bool_option('--remote-time', 'updatetime', 'true', 'false', '=')
-        cmd += self._bool_option('--show-console-readout', 'noprogress', 'false', 'true', '=')
+        cmd += ['--', info_dict['url']]
-        cmd += self._configuration_args()
-
-        # aria2c strips out spaces from the beginning/end of filenames and paths.
-        # We work around this issue by adding a "./" to the beginning of the
-        # filename and relative path, and adding a "/" at the end of the path.
-        # See: https://github.com/yt-dlp/yt-dlp/issues/276
-        # https://github.com/ytdl-org/youtube-dl/issues/20312
-        # https://github.com/aria2/aria2/issues/1373
-        dn = os.path.dirname(tmpfilename)
-        if dn:
-            cmd += ['--dir', self._aria2c_filename(dn) + os.path.sep]
-        if 'fragments' not in info_dict:
-            cmd += ['--out', self._aria2c_filename(os.path.basename(tmpfilename))]
-        cmd += ['--auto-file-renaming=false']
-        if 'fragments' in info_dict:
-            cmd += ['--file-allocation=none', '--uri-selector=inorder']
-            url_list_file = '%s.frag.urls' % (tmpfilename, )
-            url_list = []
-            for frag_index, fragment in enumerate(info_dict['fragments']):
-                fragment_filename = '%s-Frag%d' % (os.path.basename(tmpfilename), frag_index)
-                url_list.append('%s\n\tout=%s' % (fragment['url'], self._aria2c_filename(fragment_filename)))
-            stream, _ = self.sanitize_open(url_list_file, 'wb')
-            stream.write('\n'.join(url_list).encode())
-            stream.close()
-            cmd += ['-i', self._aria2c_filename(url_list_file)]
-        else:
-            cmd += ['--', info_dict['url']]
         return cmd
 
 
-class Aria2pFD(ExternalFD):
-    ''' Aria2pFD class
-    This class support to use aria2p as downloader.
-    (Aria2p, a command-line tool and Python library to interact with an aria2c daemon process
-    through JSON-RPC.)
-    It can help you to get download progress more easily.
-    To use aria2p as downloader, you need to install aria2c and aria2p, aria2p can download with pip.
-    Then run aria2c in the background and enable with the --enable-rpc option.
-    '''
-    try:
-        import aria2p
-        __avail = True
-    except ImportError:
-        __avail = False
-
-    @classmethod
-    def available(cls):
-        return cls.__avail
-
-    def _call_downloader(self, tmpfilename, info_dict):
-        aria2 = self.aria2p.API(
-            self.aria2p.Client(
-                host='http://localhost',
-                port=6800,
-                secret=''
-            )
-        )
-
-        options = {
-            'min-split-size': '1M',
-            'max-connection-per-server': 4,
-            'auto-file-renaming': 'false',
-        }
-        options['dir'] = os.path.dirname(tmpfilename) or os.path.abspath('.')
-        options['out'] = os.path.basename(tmpfilename)
-        if self.ydl.cookiejar.get_cookie_header(info_dict['url']):
-            options['load-cookies'] = self._write_cookies()
-        options['header'] = []
-        for key, val in self._header_items(info_dict):
-            options['header'].append('{0}: {1}'.format(key, val))
-        download = aria2.add_uris([info_dict['url']], options)
-        status = {
-            'status': 'downloading',
-            'tmpfilename': tmpfilename,
-        }
-        started = time.time()
-        while download.status in ['active', 'waiting']:
-            download = aria2.get_download(download.gid)
-            status.update({
-                'downloaded_bytes': download.completed_length,
-                'total_bytes': download.total_length,
-                'elapsed': time.time() - started,
-                'eta': download.eta.total_seconds(),
-                'speed': download.download_speed,
-            })
-            self._hook_progress(status)
-            time.sleep(.5)
-        return download.status != 'complete'
-
-
 class HttpieFD(ExternalFD):
     @classmethod
     def available(cls):
@@ -347,34 +206,25 @@ class HttpieFD(ExternalFD):
 
     def _make_cmd(self, tmpfilename, info_dict):
         cmd = ['http', '--download', '--output', tmpfilename, info_dict['url']]
-        for key, val in self._header_items(info_dict):
+        for key, val in info_dict['http_headers'].items():
             cmd += ['%s:%s' % (key, val)]
-
-        # httpie 3.1.0+ removes the Cookie header on redirect, so this should be safe for now. [1]
-        # If we ever need cookie handling for redirects, we can export the cookiejar into a session. [2]
-        # 1: https://github.com/httpie/httpie/security/advisories/GHSA-9w4w-cpc8-h2fq
-        # 2: https://httpie.io/docs/cli/sessions
-        cookie_header = self.ydl.cookiejar.get_cookie_header(info_dict['url'])
-        if cookie_header:
-            cmd += ['Cookie:%s' % cookie_header]
         return cmd
 
 
 class FFmpegFD(ExternalFD):
     @classmethod
     def supports(cls, info_dict):
-        return info_dict['protocol'] in ('http', 'https', 'ftp', 'ftps', 'm3u8', 'rtsp', 'rtmp', 'mms', 'http_dash_segments')
+        return info_dict['protocol'] in ('http', 'https', 'ftp', 'ftps', 'm3u8', 'rtsp', 'rtmp', 'mms')
 
     @classmethod
     def available(cls):
-        # actual availability can only be confirmed for an instance
+        return FFmpegPostProcessor().available
-        return bool(FFmpegPostProcessor)
 
     def _call_downloader(self, tmpfilename, info_dict):
-        # `downloader` means the parent `YoutubeDL`
+        url = info_dict['url']
-        ffpp = FFmpegPostProcessor(downloader=self.ydl)
+        ffpp = FFmpegPostProcessor(downloader=self)
         if not ffpp.available:
-            self.report_error('ffmpeg required for download but no ffmpeg (nor avconv) executable could be found. Please install one.')
+            self.report_error('m3u8 download detected but ffmpeg or avconv could not be found. Please install one.')
             return False
         ffpp.check_version()
 
@@ -403,15 +253,7 @@ class FFmpegFD(ExternalFD):
         # if end_time:
         #     args += ['-t', compat_str(end_time - start_time)]
 
-        url = info_dict['url']
+        if info_dict['http_headers'] and re.match(r'^https?://', url):
-        cookies = self.ydl.cookiejar.get_cookies_for_url(url)
-        if cookies:
-            args.extend(['-cookies', ''.join(
-                '{0}={1}; path={2}; domain={3};\r\n'.format(
-                    cookie.name, cookie.value, cookie.path, cookie.domain)
-                for cookie in cookies)])
-
-        if info_dict.get('http_headers') and re.match(r'^https?://', url):
             # Trailing \r\n after each HTTP header is important to prevent warning from ffmpeg/avconv:
             # [http @ 00000000003d2fa0] No trailing CRLF found in HTTP header.
             headers = handle_youtubedl_headers(info_dict['http_headers'])
@@ -491,25 +333,18 @@ class FFmpegFD(ExternalFD):
 
         self._debug_cmd(args)
 
-        # From [1], a PIPE opened in Popen() should be closed, unless
+        proc = subprocess.Popen(args, stdin=subprocess.PIPE, env=env)
-        # .communicate() is called. Avoid leaking any PIPEs by using Popen
+        try:
-        # as a context manager (newer Python 3.x and compat)
+            retval = proc.wait()
-        # Fixes "Resource Warning" in test/test_downloader_external.py
+        except KeyboardInterrupt:
-        # [1] https://devpress.csdn.net/python/62fde12d7e66823466192e48.html
+            # subprocces.run would send the SIGKILL signal to ffmpeg and the
-        with compat_subprocess_Popen(args, stdin=subprocess.PIPE, env=env) as proc:
+            # mp4 file couldn't be played, but if we ask ffmpeg to quit it
-            try:
+            # produces a file that is playable (this is mostly useful for live
-                retval = proc.wait()
+            # streams). Note that Windows is not affected and produces playable
-            except BaseException as e:
+            # files (see https://github.com/ytdl-org/youtube-dl/issues/8300).
-                # subprocess.run would send the SIGKILL signal to ffmpeg and the
+            if sys.platform != 'win32':
-                # mp4 file couldn't be played, but if we ask ffmpeg to quit it
+                proc.communicate(b'q')
-                # produces a file that is playable (this is mostly useful for live
+            raise
-                # streams). Note that Windows is not affected and produces playable
-                # files (see https://github.com/ytdl-org/youtube-dl/issues/8300).
-                if isinstance(e, KeyboardInterrupt) and sys.platform != 'win32':
-                    process_communicate_or_kill(proc, b'q')
-                else:
-                    proc.kill()
-                raise
         return retval
 
 

youtube_dl/downloader/fragment.py

@@ -71,7 +71,7 @@ class FragmentFD(FileDownloader):
 
     @staticmethod
     def __do_ytdl_file(ctx):
-        return ctx['live'] is not True and ctx['tmpfilename'] != '-'
+        return not ctx['live'] and not ctx['tmpfilename'] == '-'
 
     def _read_ytdl_file(self, ctx):
         assert 'ytdl_corrupt' not in ctx
@@ -101,13 +101,6 @@ class FragmentFD(FileDownloader):
             'url': frag_url,
             'http_headers': headers or info_dict.get('http_headers'),
         }
-        frag_resume_len = 0
-        if ctx['dl'].params.get('continuedl', True):
-            frag_resume_len = self.filesize_or_none(
-                self.temp_name(fragment_filename))
-        fragment_info_dict['frag_resume_len'] = frag_resume_len
-        ctx['frag_resume_len'] = frag_resume_len or 0
-
         success = ctx['dl'].download(fragment_filename, fragment_info_dict)
         if not success:
             return False, None
@@ -131,7 +124,9 @@ class FragmentFD(FileDownloader):
             del ctx['fragment_filename_sanitized']
 
     def _prepare_frag_download(self, ctx):
-        if not ctx.setdefault('live', False):
+        if 'live' not in ctx:
+            ctx['live'] = False
+        if not ctx['live']:
             total_frags_str = '%d' % ctx['total_frags']
             ad_frags = ctx.get('ad_frags', 0)
             if ad_frags:
@@ -141,11 +136,10 @@ class FragmentFD(FileDownloader):
         self.to_screen(
             '[%s] Total fragments: %s' % (self.FD_NAME, total_frags_str))
         self.report_destination(ctx['filename'])
-        continuedl = self.params.get('continuedl', True)
         dl = HttpQuietDownloader(
             self.ydl,
             {
-                'continuedl': continuedl,
+                'continuedl': True,
                 'quiet': True,
                 'noprogress': True,
                 'ratelimit': self.params.get('ratelimit'),
@@ -156,11 +150,12 @@ class FragmentFD(FileDownloader):
         )
         tmpfilename = self.temp_name(ctx['filename'])
         open_mode = 'wb'
+        resume_len = 0
 
         # Establish possible resume length
-        resume_len = self.filesize_or_none(tmpfilename) or 0
+        if os.path.isfile(encodeFilename(tmpfilename)):
-        if resume_len > 0:
             open_mode = 'ab'
+            resume_len = os.path.getsize(encodeFilename(tmpfilename))
 
         # Should be initialized before ytdl file check
         ctx.update({
@@ -169,8 +164,7 @@ class FragmentFD(FileDownloader):
         })
 
         if self.__do_ytdl_file(ctx):
-            ytdl_file_exists = os.path.isfile(encodeFilename(self.ytdl_filename(ctx['filename'])))
+            if os.path.isfile(encodeFilename(self.ytdl_filename(ctx['filename']))):
-            if continuedl and ytdl_file_exists:
                 self._read_ytdl_file(ctx)
                 is_corrupt = ctx.get('ytdl_corrupt') is True
                 is_inconsistent = ctx['fragment_index'] > 0 and resume_len == 0
@@ -184,12 +178,7 @@ class FragmentFD(FileDownloader):
                     if 'ytdl_corrupt' in ctx:
                         del ctx['ytdl_corrupt']
                     self._write_ytdl_file(ctx)
-
             else:
-                if not continuedl:
-                    if ytdl_file_exists:
-                        self._read_ytdl_file(ctx)
-                    ctx['fragment_index'] = resume_len = 0
                 self._write_ytdl_file(ctx)
                 assert ctx['fragment_index'] == 0
 
@@ -220,7 +209,6 @@ class FragmentFD(FileDownloader):
         start = time.time()
         ctx.update({
             'started': start,
-            'fragment_started': start,
             # Amount of fragment's bytes downloaded by the time of the previous
             # frag progress hook invocation
             'prev_frag_downloaded_bytes': 0,
@@ -230,9 +218,6 @@ class FragmentFD(FileDownloader):
             if s['status'] not in ('downloading', 'finished'):
                 return
 
-            if not total_frags and ctx.get('fragment_count'):
-                state['fragment_count'] = ctx['fragment_count']
-
             time_now = time.time()
             state['elapsed'] = time_now - start
             frag_total_bytes = s.get('total_bytes') or 0
@@ -247,17 +232,16 @@ class FragmentFD(FileDownloader):
                 ctx['fragment_index'] = state['fragment_index']
                 state['downloaded_bytes'] += frag_total_bytes - ctx['prev_frag_downloaded_bytes']
                 ctx['complete_frags_downloaded_bytes'] = state['downloaded_bytes']
-                ctx['speed'] = state['speed'] = self.calc_speed(
-                    ctx['fragment_started'], time_now, frag_total_bytes)
-                ctx['fragment_started'] = time.time()
                 ctx['prev_frag_downloaded_bytes'] = 0
             else:
                 frag_downloaded_bytes = s['downloaded_bytes']
                 state['downloaded_bytes'] += frag_downloaded_bytes - ctx['prev_frag_downloaded_bytes']
-                ctx['speed'] = state['speed'] = self.calc_speed(
-                    ctx['fragment_started'], time_now, frag_downloaded_bytes - ctx['frag_resume_len'])
                 if not ctx['live']:
-                    state['eta'] = self.calc_eta(state['speed'], estimated_size - state['downloaded_bytes'])
+                    state['eta'] = self.calc_eta(
+                        start, time_now, estimated_size - resume_len,
+                        state['downloaded_bytes'] - resume_len)
+                state['speed'] = s.get('speed') or ctx.get('speed')
+                ctx['speed'] = state['speed']
                 ctx['prev_frag_downloaded_bytes'] = frag_downloaded_bytes
             self._hook_progress(state)
 
@@ -284,7 +268,7 @@ class FragmentFD(FileDownloader):
                         os.utime(ctx['filename'], (time.time(), filetime))
                     except Exception:
                         pass
-            downloaded_bytes = self.filesize_or_none(ctx['filename']) or 0
+            downloaded_bytes = os.path.getsize(encodeFilename(ctx['filename']))
 
         self._hook_progress({
             'downloaded_bytes': downloaded_bytes,

youtube_dl/downloader/http.py

@@ -58,9 +58,9 @@ class HttpFD(FileDownloader):
 
         if self.params.get('continuedl', True):
             # Establish possible resume length
-            ctx.resume_len = info_dict.get('frag_resume_len')
+            if os.path.isfile(encodeFilename(ctx.tmpfilename)):
-            if ctx.resume_len is None:
+                ctx.resume_len = os.path.getsize(
-                ctx.resume_len = self.filesize_or_none(ctx.tmpfilename) or 0
+                    encodeFilename(ctx.tmpfilename))
 
         ctx.is_resume = ctx.resume_len > 0
 
@@ -115,9 +115,9 @@ class HttpFD(FileDownloader):
                         raise RetryDownload(err)
                     raise err
                 # When trying to resume, Content-Range HTTP header of response has to be checked
-                # to match the value of requested Range HTTP header. This is due to webservers
+                # to match the value of requested Range HTTP header. This is due to a webservers
                 # that don't support resuming and serve a whole file with no Content-Range
-                # set in response despite requested Range (see
+                # set in response despite of requested Range (see
                 # https://github.com/ytdl-org/youtube-dl/issues/6057#issuecomment-126129799)
                 if has_range:
                     content_range = ctx.data.headers.get('Content-Range')
@@ -141,8 +141,7 @@ class HttpFD(FileDownloader):
                     # Content-Range is either not present or invalid. Assuming remote webserver is
                     # trying to send the whole file, resume is not possible, so wiping the local file
                     # and performing entire redownload
-                    if range_start > 0:
+                    self.report_unable_to_resume()
-                        self.report_unable_to_resume()
                     ctx.resume_len = 0
                     ctx.open_mode = 'wb'
                 ctx.data_len = int_or_none(ctx.data.info().get('Content-length', None))
@@ -294,7 +293,10 @@ class HttpFD(FileDownloader):
 
                 # Progress message
                 speed = self.calc_speed(start, now, byte_counter - ctx.resume_len)
-                eta = self.calc_eta(speed, ctx.data_len and (ctx.data_len - byte_counter))
+                if ctx.data_len is None:
+                    eta = None
+                else:
+                    eta = self.calc_eta(start, time.time(), ctx.data_len - ctx.resume_len, byte_counter - ctx.resume_len)
 
                 self._hook_progress({
                     'status': 'downloading',

youtube_dl/downloader/niconico.py

@@ -1,66 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-try:
-    import threading
-except ImportError:
-    threading = None
-
-from .common import FileDownloader
-from ..downloader import get_suitable_downloader
-from ..extractor.niconico import NiconicoIE
-from ..utils import sanitized_Request
-
-
-class NiconicoDmcFD(FileDownloader):
-    """ Downloading niconico douga from DMC with heartbeat """
-
-    FD_NAME = 'niconico_dmc'
-
-    def real_download(self, filename, info_dict):
-        self.to_screen('[%s] Downloading from DMC' % self.FD_NAME)
-
-        ie = NiconicoIE(self.ydl)
-        info_dict, heartbeat_info_dict = ie._get_heartbeat_info(info_dict)
-
-        fd = get_suitable_downloader(info_dict, params=self.params)(self.ydl, self.params)
-        for ph in self._progress_hooks:
-            fd.add_progress_hook(ph)
-
-        if not threading:
-            self.to_screen('[%s] Threading for Heartbeat not available' % self.FD_NAME)
-            return fd.real_download(filename, info_dict)
-
-        success = download_complete = False
-        timer = [None]
-        heartbeat_lock = threading.Lock()
-        heartbeat_url = heartbeat_info_dict['url']
-        heartbeat_data = heartbeat_info_dict['data'].encode()
-        heartbeat_interval = heartbeat_info_dict.get('interval', 30)
-
-        request = sanitized_Request(heartbeat_url, heartbeat_data)
-
-        def heartbeat():
-            try:
-                self.ydl.urlopen(request).read()
-            except Exception:
-                self.to_screen('[%s] Heartbeat failed' % self.FD_NAME)
-
-            with heartbeat_lock:
-                if not download_complete:
-                    timer[0] = threading.Timer(heartbeat_interval, heartbeat)
-                    timer[0].start()
-
-        heartbeat_info_dict['ping']()
-        self.to_screen('[%s] Heartbeat with %d second interval ...' % (self.FD_NAME, heartbeat_interval))
-        try:
-            heartbeat()
-            if type(fd).__name__ == 'HlsFD':
-                info_dict.update(ie._extract_m3u8_formats(info_dict['url'], info_dict['id'])[0])
-            success = fd.real_download(filename, info_dict)
-        finally:
-            if heartbeat_lock:
-                with heartbeat_lock:
-                    timer[0].cancel()
-                    download_complete = True
-            return success

youtube_dl/downloader/rtmp.py

@@ -89,13 +89,11 @@ class RtmpFD(FileDownloader):
                                 self.to_screen('')
                             cursor_in_new_line = True
                             self.to_screen('[rtmpdump] ' + line)
-                if not cursor_in_new_line:
+            finally:
-                    self.to_screen('')
-                return proc.wait()
-            except BaseException:  # Including KeyboardInterrupt
-                proc.kill()
                 proc.wait()
-                raise
+            if not cursor_in_new_line:
+                self.to_screen('')
+            return proc.returncode
 
         url = info_dict['url']
         player_url = info_dict.get('player_url')

youtube_dl/extractor/adn.py

@@ -31,34 +31,30 @@ from ..utils import (
 
 
 class ADNIE(InfoExtractor):
-    IE_DESC = 'Animation Digital Network'
+    IE_DESC = 'Anime Digital Network'
-    _VALID_URL = r'https?://(?:www\.)?(?:animation|anime)digitalnetwork\.fr/video/[^/]+/(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:www\.)?animedigitalnetwork\.fr/video/[^/]+/(?P<id>\d+)'
-    _TESTS = [{
+    _TEST = {
-        'url': 'https://animationdigitalnetwork.fr/video/fruits-basket/9841-episode-1-a-ce-soir',
+        'url': 'http://animedigitalnetwork.fr/video/blue-exorcist-kyoto-saga/7778-episode-1-debut-des-hostilites',
-        'md5': '1c9ef066ceb302c86f80c2b371615261',
+        'md5': '0319c99885ff5547565cacb4f3f9348d',
         'info_dict': {
-            'id': '9841',
+            'id': '7778',
             'ext': 'mp4',
-            'title': 'Fruits Basket - Episode 1',
+            'title': 'Blue Exorcist - Kyôto Saga - Episode 1',
-            'description': 'md5:14be2f72c3c96809b0ca424b0097d336',
+            'description': 'md5:2f7b5aa76edbc1a7a92cedcda8a528d5',
-            'series': 'Fruits Basket',
+            'series': 'Blue Exorcist - Kyôto Saga',
-            'duration': 1437,
+            'duration': 1467,
-            'release_date': '20190405',
+            'release_date': '20170106',
             'comment_count': int,
             'average_rating': float,
-            'season_number': 1,
+            'season_number': 2,
-            'episode': 'À ce soir !',
+            'episode': 'Début des hostilités',
             'episode_number': 1,
-        },
+        }
-        'skip': 'Only available in region (FR, ...)',
+    }
-    }, {
-        'url': 'http://animedigitalnetwork.fr/video/blue-exorcist-kyoto-saga/7778-episode-1-debut-des-hostilites',
-        'only_matching': True,
-    }]
 
-    _NETRC_MACHINE = 'animationdigitalnetwork'
+    _NETRC_MACHINE = 'animedigitalnetwork'
-    _BASE = 'animationdigitalnetwork.fr'
+    _BASE_URL = 'http://animedigitalnetwork.fr'
-    _API_BASE_URL = 'https://gw.api.' + _BASE + '/'
+    _API_BASE_URL = 'https://gw.api.animedigitalnetwork.fr/'
     _PLAYER_BASE_URL = _API_BASE_URL + 'player/'
     _HEADERS = {}
     _LOGIN_ERR_MESSAGE = 'Unable to log in'
@@ -86,14 +82,14 @@ class ADNIE(InfoExtractor):
         if subtitle_location:
             enc_subtitles = self._download_webpage(
                 subtitle_location, video_id, 'Downloading subtitles data',
-                fatal=False, headers={'Origin': 'https://' + self._BASE})
+                fatal=False, headers={'Origin': 'https://animedigitalnetwork.fr'})
         if not enc_subtitles:
             return None
 
-        # http://animationdigitalnetwork.fr/components/com_vodvideo/videojs/adn-vjs.min.js
+        # http://animedigitalnetwork.fr/components/com_vodvideo/videojs/adn-vjs.min.js
         dec_subtitles = intlist_to_bytes(aes_cbc_decrypt(
             bytes_to_intlist(compat_b64decode(enc_subtitles[24:])),
-            bytes_to_intlist(binascii.unhexlify(self._K + '7fac1178830cfe0c')),
+            bytes_to_intlist(binascii.unhexlify(self._K + 'ab9f52f5baae7c72')),
             bytes_to_intlist(compat_b64decode(enc_subtitles[:24]))
         ))
         subtitles_json = self._parse_json(
@@ -142,9 +138,9 @@ Format: Marked,Start,End,Style,Name,MarginL,MarginR,MarginV,Effect,Text'''
         if not username:
             return
         try:
-            url = self._API_BASE_URL + 'authentication/login'
             access_token = (self._download_json(
-                url, None, 'Logging in', self._LOGIN_ERR_MESSAGE, fatal=False,
+                self._API_BASE_URL + 'authentication/login', None,
+                'Logging in', self._LOGIN_ERR_MESSAGE, fatal=False,
                 data=urlencode_postdata({
                     'password': password,
                     'rememberMe': False,
@@ -157,8 +153,7 @@ Format: Marked,Start,End,Style,Name,MarginL,MarginR,MarginV,Effect,Text'''
             message = None
             if isinstance(e.cause, compat_HTTPError) and e.cause.code == 401:
                 resp = self._parse_json(
-                    self._webpage_read_content(e.cause, url, username),
+                    e.cause.read().decode(), None, fatal=False) or {}
-                    username, fatal=False) or {}
                 message = resp.get('message') or resp.get('code')
             self.report_warning(message or self._LOGIN_ERR_MESSAGE)
 
@@ -216,9 +211,7 @@ Format: Marked,Start,End,Style,Name,MarginL,MarginR,MarginV,Effect,Text'''
                     # This usually goes away with a different random pkcs1pad, so retry
                     continue
 
-                error = self._parse_json(
+                error = self._parse_json(e.cause.read(), video_id)
-                    self._webpage_read_content(e.cause, links_url, video_id),
-                    video_id, fatal=False) or {}
                 message = error.get('message')
                 if e.cause.code == 403 and error.get('code') == 'player-bad-geolocation-country':
                     self.raise_geo_restricted(msg=message)

youtube_dl/extractor/aenetworks.py

@@ -8,8 +8,6 @@ from ..utils import (
     ExtractorError,
     GeoRestrictedError,
     int_or_none,
-    remove_start,
-    traverse_obj,
     update_url_query,
     urlencode_postdata,
 )
@@ -22,8 +20,8 @@ class AENetworksBaseIE(ThePlatformIE):
             (?:history(?:vault)?|aetv|mylifetime|lifetimemovieclub)\.com|
             fyi\.tv
         )/'''
-    _THEPLATFORM_KEY = '43jXaGRQud'
+    _THEPLATFORM_KEY = 'crazyjava'
-    _THEPLATFORM_SECRET = 'S10BPXHMlb'
+    _THEPLATFORM_SECRET = 's3cr3t'
     _DOMAIN_MAP = {
         'history.com': ('HISTORY', 'history'),
         'aetv.com': ('AETV', 'aetv'),
@@ -35,17 +33,14 @@ class AENetworksBaseIE(ThePlatformIE):
     }
 
     def _extract_aen_smil(self, smil_url, video_id, auth=None):
-        query = {
+        query = {'mbr': 'true'}
-            'mbr': 'true',
-            'formats': 'M3U+none,MPEG-DASH+none,MPEG4,MP3',
-        }
         if auth:
             query['auth'] = auth
         TP_SMIL_QUERY = [{
             'assetTypes': 'high_video_ak',
-            'switch': 'hls_high_ak',
+            'switch': 'hls_high_ak'
         }, {
-            'assetTypes': 'high_video_s3',
+            'assetTypes': 'high_video_s3'
         }, {
             'assetTypes': 'high_video_s3',
             'switch': 'hls_high_fastly',
@@ -80,14 +75,7 @@ class AENetworksBaseIE(ThePlatformIE):
         requestor_id, brand = self._DOMAIN_MAP[domain]
         result = self._download_json(
             'https://feeds.video.aetnd.com/api/v2/%s/videos' % brand,
-            filter_value, query={'filter[%s]' % filter_key: filter_value})
+            filter_value, query={'filter[%s]' % filter_key: filter_value})['results'][0]
-        result = traverse_obj(
-            result, ('results',
-                     lambda k, v: k == 0 and v[filter_key] == filter_value),
-            get_all=False)
-        if not result:
-            raise ExtractorError('Show not found in A&E feed (too new?)', expected=True,
-                                 video_id=remove_start(filter_value, '/'))
         title = result['title']
         video_id = result['id']
         media_url = result['publicUrl']
@@ -138,7 +126,7 @@ class AENetworksIE(AENetworksBaseIE):
             'skip_download': True,
         },
         'add_ie': ['ThePlatform'],
-        'skip': 'Geo-restricted - This content is not available in your location.'
+        'skip': 'This video is only available for users of participating TV providers.',
     }, {
         'url': 'http://www.aetv.com/shows/duck-dynasty/season-9/episode-1',
         'info_dict': {
@@ -155,7 +143,6 @@ class AENetworksIE(AENetworksBaseIE):
             'skip_download': True,
         },
         'add_ie': ['ThePlatform'],
-        'skip': 'This video is only available for users of participating TV providers.',
     }, {
         'url': 'http://www.fyi.tv/shows/tiny-house-nation/season-1/episode-8',
         'only_matching': True

youtube_dl/extractor/aliexpress.py

@@ -18,7 +18,7 @@ class AliExpressLiveIE(InfoExtractor):
             'id': '2800002704436634',
             'ext': 'mp4',
             'title': 'CASIMA7.22',
-            'thumbnail': r're:https?://.*\.jpg',
+            'thumbnail': r're:http://.*\.jpg',
             'uploader': 'CASIMA Official Store',
             'timestamp': 1500717600,
             'upload_date': '20170722',

youtube_dl/extractor/alsace20tv.py

@@ -1,89 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-from .common import InfoExtractor
-from ..utils import (
-    clean_html,
-    dict_get,
-    get_element_by_class,
-    int_or_none,
-    unified_strdate,
-    url_or_none,
-)
-
-
-class Alsace20TVIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?alsace20\.tv/(?:[\w-]+/)+[\w-]+-(?P<id>[\w]+)'
-    _TESTS = [{
-        'url': 'https://www.alsace20.tv/VOD/Actu/JT/Votre-JT-jeudi-3-fevrier-lyNHCXpYJh.html',
-        # 'md5': 'd91851bf9af73c0ad9b2cdf76c127fbb',
-        'info_dict': {
-            'id': 'lyNHCXpYJh',
-            'ext': 'mp4',
-            'description': 'md5:fc0bc4a0692d3d2dba4524053de4c7b7',
-            'title': 'Votre JT du jeudi 3 février',
-            'upload_date': '20220203',
-            'thumbnail': r're:https?://.+\.jpg',
-            'duration': 1073,
-            'view_count': int,
-        },
-        'params': {
-            'format': 'bestvideo',
-        },
-    }]
-
-    def _extract_video(self, video_id, url=None):
-        info = self._download_json(
-            'https://www.alsace20.tv/visionneuse/visio_v9_js.php?key=%s&habillage=0&mode=html' % (video_id, ),
-            video_id) or {}
-        title = info['titre']
-
-        formats = []
-        for res, fmt_url in (info.get('files') or {}).items():
-            formats.extend(
-                self._extract_smil_formats(fmt_url, video_id, fatal=False)
-                if '/smil:_' in fmt_url
-                else self._extract_mpd_formats(fmt_url, video_id, mpd_id=res, fatal=False))
-        self._sort_formats(formats)
-
-        webpage = (url and self._download_webpage(url, video_id, fatal=False)) or ''
-        thumbnail = url_or_none(dict_get(info, ('image', 'preview', )) or self._og_search_thumbnail(webpage))
-        upload_date = self._search_regex(r'/(\d{6})_', thumbnail, 'upload_date', default=None)
-        upload_date = unified_strdate('20%s-%s-%s' % (upload_date[:2], upload_date[2:4], upload_date[4:])) if upload_date else None
-        return {
-            'id': video_id,
-            'title': title,
-            'formats': formats,
-            'description': clean_html(get_element_by_class('wysiwyg', webpage)),
-            'upload_date': upload_date,
-            'thumbnail': thumbnail,
-            'duration': int_or_none(self._og_search_property('video:duration', webpage) if webpage else None),
-            'view_count': int_or_none(info.get('nb_vues')),
-        }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        return self._extract_video(video_id, url)
-
-
-class Alsace20TVEmbedIE(Alsace20TVIE):
-    _VALID_URL = r'https?://(?:www\.)?alsace20\.tv/emb/(?P<id>[\w]+)'
-    _TESTS = [{
-        'url': 'https://www.alsace20.tv/emb/lyNHCXpYJh',
-        # 'md5': 'd91851bf9af73c0ad9b2cdf76c127fbb',
-        'info_dict': {
-            'id': 'lyNHCXpYJh',
-            'ext': 'mp4',
-            'title': 'Votre JT du jeudi 3 février',
-            'upload_date': '20220203',
-            'thumbnail': r're:https?://.+\.jpg',
-            'view_count': int,
-        },
-        'params': {
-            'format': 'bestvideo',
-        },
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        return self._extract_video(video_id)

youtube_dl/extractor/americastestkitchen.py

@@ -15,7 +15,7 @@ from ..utils import (
 
 
 class AmericasTestKitchenIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?(?:americastestkitchen|cooks(?:country|illustrated))\.com/(?:cooks(?:country|illustrated)/)?(?P<resource_type>episode|videos)/(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:www\.)?(?:americastestkitchen|cooks(?:country|illustrated))\.com/(?P<resource_type>episode|videos)/(?P<id>\d+)'
     _TESTS = [{
         'url': 'https://www.americastestkitchen.com/episode/582-weeknight-japanese-suppers',
         'md5': 'b861c3e365ac38ad319cfd509c30577f',
@@ -23,20 +23,15 @@ class AmericasTestKitchenIE(InfoExtractor):
             'id': '5b400b9ee338f922cb06450c',
             'title': 'Japanese Suppers',
             'ext': 'mp4',
-            'display_id': 'weeknight-japanese-suppers',
             'description': 'md5:64e606bfee910627efc4b5f050de92b3',
-            'timestamp': 1523304000,
+            'thumbnail': r're:^https?://',
-            'upload_date': '20180409',
+            'timestamp': 1523318400,
-            'release_date': '20180409',
+            'upload_date': '20180410',
+            'release_date': '20180410',
             'series': "America's Test Kitchen",
-            'season': 'Season 18',
             'season_number': 18,
             'episode': 'Japanese Suppers',
             'episode_number': 15,
-            'duration': 1376,
-            'thumbnail': r're:^https?://',
-            'average_rating': 0,
-            'view_count': int,
         },
         'params': {
             'skip_download': True,
@@ -49,20 +44,15 @@ class AmericasTestKitchenIE(InfoExtractor):
             'id': '5fbe8c61bda2010001c6763b',
             'title': 'Simple Chicken Dinner',
             'ext': 'mp4',
-            'display_id': 'atktv_2103_simple-chicken-dinner_full-episode_web-mp4',
             'description': 'md5:eb68737cc2fd4c26ca7db30139d109e7',
-            'timestamp': 1610737200,
+            'thumbnail': r're:^https?://',
-            'upload_date': '20210115',
+            'timestamp': 1610755200,
-            'release_date': '20210115',
+            'upload_date': '20210116',
+            'release_date': '20210116',
             'series': "America's Test Kitchen",
-            'season': 'Season 21',
             'season_number': 21,
             'episode': 'Simple Chicken Dinner',
             'episode_number': 3,
-            'duration': 1397,
-            'thumbnail': r're:^https?://',
-            'view_count': int,
-            'average_rating': 0,
         },
         'params': {
             'skip_download': True,
@@ -70,12 +60,6 @@ class AmericasTestKitchenIE(InfoExtractor):
     }, {
         'url': 'https://www.americastestkitchen.com/videos/3420-pan-seared-salmon',
         'only_matching': True,
-    }, {
-        'url': 'https://www.americastestkitchen.com/cookscountry/episode/564-when-only-chocolate-will-do',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.americastestkitchen.com/cooksillustrated/videos/4478-beef-wellington',
-        'only_matching': True,
     }, {
         'url': 'https://www.cookscountry.com/episode/564-when-only-chocolate-will-do',
         'only_matching': True,
@@ -110,7 +94,7 @@ class AmericasTestKitchenIE(InfoExtractor):
 
 
 class AmericasTestKitchenSeasonIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?(?P<show>americastestkitchen|(?P<cooks>cooks(?:country|illustrated)))\.com(?:(?:/(?P<show2>cooks(?:country|illustrated)))?(?:/?$|(?<!ated)(?<!ated\.com)/episodes/browse/season_(?P<season>\d+)))'
+    _VALID_URL = r'https?://(?:www\.)?(?P<show>americastestkitchen|cookscountry)\.com/episodes/browse/season_(?P<id>\d+)'
     _TESTS = [{
         # ATK Season
         'url': 'https://www.americastestkitchen.com/episodes/browse/season_1',
@@ -121,93 +105,48 @@ class AmericasTestKitchenSeasonIE(InfoExtractor):
         'playlist_count': 13,
     }, {
         # Cooks Country Season
-        'url': 'https://www.americastestkitchen.com/cookscountry/episodes/browse/season_12',
+        'url': 'https://www.cookscountry.com/episodes/browse/season_12',
         'info_dict': {
             'id': 'season_12',
             'title': 'Season 12',
         },
         'playlist_count': 13,
-    }, {
-        # America's Test Kitchen Series
-        'url': 'https://www.americastestkitchen.com/',
-        'info_dict': {
-            'id': 'americastestkitchen',
-            'title': 'America\'s Test Kitchen',
-        },
-        'playlist_count': 558,
-    }, {
-        # Cooks Country Series
-        'url': 'https://www.americastestkitchen.com/cookscountry',
-        'info_dict': {
-            'id': 'cookscountry',
-            'title': 'Cook\'s Country',
-        },
-        'playlist_count': 199,
-    }, {
-        'url': 'https://www.americastestkitchen.com/cookscountry/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.cookscountry.com/episodes/browse/season_12',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.cookscountry.com',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.americastestkitchen.com/cooksillustrated/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.cooksillustrated.com',
-        'only_matching': True,
     }]
 
     def _real_extract(self, url):
-        match = re.match(self._VALID_URL, url).groupdict()
+        show_name, season_number = re.match(self._VALID_URL, url).groups()
-        show = match.get('show2')
+        season_number = int(season_number)
-        show_path = ('/' + show) if show else ''
-        show = show or match['show']
-        season_number = int_or_none(match.get('season'))
 
-        slug, title = {
+        slug = 'atk' if show_name == 'americastestkitchen' else 'cco'
-            'americastestkitchen': ('atk', 'America\'s Test Kitchen'),
-            'cookscountry': ('cco', 'Cook\'s Country'),
-            'cooksillustrated': ('cio', 'Cook\'s Illustrated'),
-        }[show]
 
-        facet_filters = [
+        season = 'Season %d' % season_number
-            'search_document_klass:episode',
-            'search_show_slug:' + slug,
-        ]
-
-        if season_number:
-            playlist_id = 'season_%d' % season_number
-            playlist_title = 'Season %d' % season_number
-            facet_filters.append('search_season_list:' + playlist_title)
-        else:
-            playlist_id = show
-            playlist_title = title
 
         season_search = self._download_json(
             'https://y1fnzxui30-dsn.algolia.net/1/indexes/everest_search_%s_season_desc_production' % slug,
-            playlist_id, headers={
+            season, headers={
-                'Origin': 'https://www.americastestkitchen.com',
+                'Origin': 'https://www.%s.com' % show_name,
                 'X-Algolia-API-Key': '8d504d0099ed27c1b73708d22871d805',
                 'X-Algolia-Application-Id': 'Y1FNZXUI30',
             }, query={
-                'facetFilters': json.dumps(facet_filters),
+                'facetFilters': json.dumps([
-                'attributesToRetrieve': 'description,search_%s_episode_number,search_document_date,search_url,title,search_atk_episode_season' % slug,
+                    'search_season_list:' + season,
+                    'search_document_klass:episode',
+                    'search_show_slug:' + slug,
+                ]),
+                'attributesToRetrieve': 'description,search_%s_episode_number,search_document_date,search_url,title' % slug,
                 'attributesToHighlight': '',
                 'hitsPerPage': 1000,
             })
 
         def entries():
             for episode in (season_search.get('hits') or []):
-                search_url = episode.get('search_url')  # always formatted like '/episode/123-title-of-episode'
+                search_url = episode.get('search_url')
                 if not search_url:
                     continue
                 yield {
                     '_type': 'url',
-                    'url': 'https://www.americastestkitchen.com%s%s' % (show_path, search_url),
+                    'url': 'https://www.%s.com%s' % (show_name, search_url),
-                    'id': try_get(episode, lambda e: e['objectID'].rsplit('_', 1)[-1]),
+                    'id': try_get(episode, lambda e: e['objectID'].split('_')[-1]),
                     'title': episode.get('title'),
                     'description': episode.get('description'),
                     'timestamp': unified_timestamp(episode.get('search_document_date')),
@@ -217,4 +156,4 @@ class AmericasTestKitchenSeasonIE(InfoExtractor):
                 }
 
         return self.playlist_result(
-            entries(), playlist_id, playlist_title)
+            entries(), 'season_%d' % season_number, season)

youtube_dl/extractor/appleconnect.py

@@ -9,10 +9,10 @@ from ..utils import (
 
 
 class AppleConnectIE(InfoExtractor):
-    _VALID_URL = r'https?://itunes\.apple\.com/\w{0,2}/?post/(?:id)?sa\.(?P<id>[\w-]+)'
+    _VALID_URL = r'https?://itunes\.apple\.com/\w{0,2}/?post/idsa\.(?P<id>[\w-]+)'
-    _TESTS = [{
+    _TEST = {
         'url': 'https://itunes.apple.com/us/post/idsa.4ab17a39-2720-11e5-96c5-a5b38f6c42d3',
-        'md5': 'c1d41f72c8bcaf222e089434619316e4',
+        'md5': 'e7c38568a01ea45402570e6029206723',
         'info_dict': {
             'id': '4ab17a39-2720-11e5-96c5-a5b38f6c42d3',
             'ext': 'm4v',
@@ -22,10 +22,7 @@ class AppleConnectIE(InfoExtractor):
             'upload_date': '20150710',
             'timestamp': 1436545535,
         },
-    }, {
+    }
-        'url': 'https://itunes.apple.com/us/post/sa.0fe0229f-2457-11e5-9f40-1bb645f2d5d9',
-        'only_matching': True,
-    }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
@@ -39,7 +36,7 @@ class AppleConnectIE(InfoExtractor):
 
         video_data = self._parse_json(video_json, video_id)
         timestamp = str_to_int(self._html_search_regex(r'data-timestamp="(\d+)"', webpage, 'timestamp'))
-        like_count = str_to_int(self._html_search_regex(r'(\d+) Loves', webpage, 'like count', default=None))
+        like_count = str_to_int(self._html_search_regex(r'(\d+) Loves', webpage, 'like count'))
 
         return {
             'id': video_id,

youtube_dl/extractor/applepodcasts.py

@@ -3,11 +3,8 @@ from __future__ import unicode_literals
 
 from .common import InfoExtractor
 from ..utils import (
-    clean_html,
     clean_podcast_url,
-    get_element_by_class,
     int_or_none,
-    parse_codecs,
     parse_iso8601,
     try_get,
 )
@@ -17,17 +14,16 @@ class ApplePodcastsIE(InfoExtractor):
     _VALID_URL = r'https?://podcasts\.apple\.com/(?:[^/]+/)?podcast(?:/[^/]+){1,2}.*?\bi=(?P<id>\d+)'
     _TESTS = [{
         'url': 'https://podcasts.apple.com/us/podcast/207-whitney-webb-returns/id1135137367?i=1000482637777',
-        'md5': '41dc31cd650143e530d9423b6b5a344f',
+        'md5': 'df02e6acb11c10e844946a39e7222b08',
         'info_dict': {
             'id': '1000482637777',
             'ext': 'mp3',
             'title': '207 - Whitney Webb Returns',
-            'description': 'md5:75ef4316031df7b41ced4e7b987f79c6',
+            'description': 'md5:13a73bade02d2e43737751e3987e1399',
             'upload_date': '20200705',
-            'timestamp': 1593932400,
+            'timestamp': 1593921600,
-            'duration': 6454,
+            'duration': 6425,
             'series': 'The Tim Dillon Show',
-            'thumbnail': 're:.+[.](png|jpe?g|webp)',
         }
     }, {
         'url': 'https://podcasts.apple.com/podcast/207-whitney-webb-returns/id1135137367?i=1000482637777',
@@ -43,40 +39,19 @@ class ApplePodcastsIE(InfoExtractor):
     def _real_extract(self, url):
         episode_id = self._match_id(url)
         webpage = self._download_webpage(url, episode_id)
-        episode_data = {}
+        ember_data = self._parse_json(self._search_regex(
-        ember_data = {}
+            r'id="shoebox-ember-data-store"[^>]*>\s*({.+?})\s*<',
-        # new page type 2021-11
+            webpage, 'ember data'), episode_id)
-        amp_data = self._parse_json(self._search_regex(
+        ember_data = ember_data.get(episode_id) or ember_data
-            r'(?s)id="shoebox-media-api-cache-amp-podcasts"[^>]*>\s*({.+?})\s*<',
+        episode = ember_data['data']['attributes']
-            webpage, 'AMP data', default='{}'), episode_id, fatal=False) or {}
-        amp_data = try_get(amp_data,
-                           lambda a: self._parse_json(
-                               next(a[x] for x in iter(a) if episode_id in x),
-                               episode_id),
-                           dict) or {}
-        amp_data = amp_data.get('d') or []
-        episode_data = try_get(
-            amp_data,
-            lambda a: next(x for x in a
-                           if x['type'] == 'podcast-episodes' and x['id'] == episode_id),
-            dict)
-        if not episode_data:
-            # try pre 2021-11 page type: TODO: consider deleting if no longer used
-            ember_data = self._parse_json(self._search_regex(
-                r'(?s)id="shoebox-ember-data-store"[^>]*>\s*({.+?})\s*<',
-                webpage, 'ember data'), episode_id) or {}
-            ember_data = ember_data.get(episode_id) or ember_data
-            episode_data = try_get(ember_data, lambda x: x['data'], dict)
-        episode = episode_data['attributes']
         description = episode.get('description') or {}
 
         series = None
-        for inc in (amp_data or ember_data.get('included') or []):
+        for inc in (ember_data.get('included') or []):
             if inc.get('type') == 'media/podcast':
                 series = try_get(inc, lambda x: x['attributes']['name'])
-        series = series or clean_html(get_element_by_class('podcast-header__identity', webpage))
 
-        info = [{
+        return {
             'id': episode_id,
             'title': episode['name'],
             'url': clean_podcast_url(episode['assetUrl']),
@@ -84,10 +59,4 @@ class ApplePodcastsIE(InfoExtractor):
             'timestamp': parse_iso8601(episode.get('releaseDateTime')),
             'duration': int_or_none(episode.get('durationInMilliseconds'), 1000),
             'series': series,
-            'thumbnail': self._og_search_thumbnail(webpage),
+        }
-        }]
-        self._sort_formats(info)
-        info = info[0]
-        codecs = parse_codecs(info.get('ext', 'mp3'))
-        info.update(codecs)
-        return info

youtube_dl/extractor/ard.py

@@ -249,14 +249,14 @@ class ARDMediathekIE(ARDMediathekBaseIE):
 
 
 class ARDIE(InfoExtractor):
-    _VALID_URL = r'(?P<mainurl>https?://(?:www\.)?daserste\.de/(?:[^/?#&]+/)+(?P<id>[^/?#&]+))\.html'
+    _VALID_URL = r'(?P<mainurl>https?://(?:www\.)?daserste\.de/[^?#]+/videos(?:extern)?/(?P<display_id>[^/?#]+)-(?:video-?)?(?P<id>[0-9]+))\.html'
     _TESTS = [{
         # available till 7.01.2022
         'url': 'https://www.daserste.de/information/talk/maischberger/videos/maischberger-die-woche-video100.html',
         'md5': '867d8aa39eeaf6d76407c5ad1bb0d4c1',
         'info_dict': {
-            'id': 'maischberger-die-woche-video100',
+            'display_id': 'maischberger-die-woche',
-            'display_id': 'maischberger-die-woche-video100',
+            'id': '100',
             'ext': 'mp4',
             'duration': 3687.0,
             'title': 'maischberger. die woche vom 7. Januar 2021',
@@ -264,25 +264,16 @@ class ARDIE(InfoExtractor):
             'thumbnail': r're:^https?://.*\.jpg$',
         },
     }, {
-        'url': 'https://www.daserste.de/information/politik-weltgeschehen/morgenmagazin/videosextern/dominik-kahun-aus-der-nhl-direkt-zur-weltmeisterschaft-100.html',
+        'url': 'https://www.daserste.de/information/reportage-dokumentation/erlebnis-erde/videosextern/woelfe-und-herdenschutzhunde-ungleiche-brueder-102.html',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.daserste.de/information/nachrichten-wetter/tagesthemen/videosextern/tagesthemen-17736.html',
         'only_matching': True,
     }, {
         'url': 'http://www.daserste.de/information/reportage-dokumentation/dokus/videos/die-story-im-ersten-mission-unter-falscher-flagge-100.html',
         'only_matching': True,
-    }, {
-        'url': 'https://www.daserste.de/unterhaltung/serie/in-aller-freundschaft-die-jungen-aerzte/Drehpause-100.html',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.daserste.de/unterhaltung/film/filmmittwoch-im-ersten/videos/making-ofwendezeit-video-100.html',
-        'only_matching': True,
     }]
 
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)
-        display_id = mobj.group('id')
+        display_id = mobj.group('display_id')
 
         player_url = mobj.group('mainurl') + '~playerXml.xml'
         doc = self._download_xml(player_url, display_id)
@@ -332,24 +323,9 @@ class ARDIE(InfoExtractor):
             formats.append(f)
         self._sort_formats(formats)
 
-        _SUB_FORMATS = (
-            ('./dataTimedText', 'ttml'),
-            ('./dataTimedTextNoOffset', 'ttml'),
-            ('./dataTimedTextVtt', 'vtt'),
-        )
-
-        subtitles = {}
-        for subsel, subext in _SUB_FORMATS:
-            for node in video_node.findall(subsel):
-                subtitles.setdefault('de', []).append({
-                    'url': node.attrib['url'],
-                    'ext': subext,
-                })
-
         return {
-            'id': xpath_text(video_node, './videoId', default=display_id),
+            'id': mobj.group('id'),
             'formats': formats,
-            'subtitles': subtitles,
             'display_id': display_id,
             'title': video_node.find('./title').text,
             'duration': parse_duration(video_node.find('./duration').text),

youtube_dl/extractor/arnes.py

@@ -1,101 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-from .common import InfoExtractor
-from ..compat import (
-    compat_parse_qs,
-    compat_urllib_parse_urlparse,
-)
-from ..utils import (
-    float_or_none,
-    int_or_none,
-    parse_iso8601,
-    remove_start,
-)
-
-
-class ArnesIE(InfoExtractor):
-    IE_NAME = 'video.arnes.si'
-    IE_DESC = 'Arnes Video'
-    _VALID_URL = r'https?://video\.arnes\.si/(?:[a-z]{2}/)?(?:watch|embed|api/(?:asset|public/video))/(?P<id>[0-9a-zA-Z]{12})'
-    _TESTS = [{
-        'url': 'https://video.arnes.si/watch/a1qrWTOQfVoU?t=10',
-        'md5': '4d0f4d0a03571b33e1efac25fd4a065d',
-        'info_dict': {
-            'id': 'a1qrWTOQfVoU',
-            'ext': 'mp4',
-            'title': 'Linearna neodvisnost, definicija',
-            'description': 'Linearna neodvisnost, definicija',
-            'license': 'PRIVATE',
-            'creator': 'Polona Oblak',
-            'timestamp': 1585063725,
-            'upload_date': '20200324',
-            'channel': 'Polona Oblak',
-            'channel_id': 'q6pc04hw24cj',
-            'channel_url': 'https://video.arnes.si/?channel=q6pc04hw24cj',
-            'duration': 596.75,
-            'view_count': int,
-            'tags': ['linearna_algebra'],
-            'start_time': 10,
-        }
-    }, {
-        'url': 'https://video.arnes.si/api/asset/s1YjnV7hadlC/play.mp4',
-        'only_matching': True,
-    }, {
-        'url': 'https://video.arnes.si/embed/s1YjnV7hadlC',
-        'only_matching': True,
-    }, {
-        'url': 'https://video.arnes.si/en/watch/s1YjnV7hadlC',
-        'only_matching': True,
-    }, {
-        'url': 'https://video.arnes.si/embed/s1YjnV7hadlC?t=123&hideRelated=1',
-        'only_matching': True,
-    }, {
-        'url': 'https://video.arnes.si/api/public/video/s1YjnV7hadlC',
-        'only_matching': True,
-    }]
-    _BASE_URL = 'https://video.arnes.si'
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        video = self._download_json(
-            self._BASE_URL + '/api/public/video/' + video_id, video_id)['data']
-        title = video['title']
-
-        formats = []
-        for media in (video.get('media') or []):
-            media_url = media.get('url')
-            if not media_url:
-                continue
-            formats.append({
-                'url': self._BASE_URL + media_url,
-                'format_id': remove_start(media.get('format'), 'FORMAT_'),
-                'format_note': media.get('formatTranslation'),
-                'width': int_or_none(media.get('width')),
-                'height': int_or_none(media.get('height')),
-            })
-        self._sort_formats(formats)
-
-        channel = video.get('channel') or {}
-        channel_id = channel.get('url')
-        thumbnail = video.get('thumbnailUrl')
-
-        return {
-            'id': video_id,
-            'title': title,
-            'formats': formats,
-            'thumbnail': self._BASE_URL + thumbnail,
-            'description': video.get('description'),
-            'license': video.get('license'),
-            'creator': video.get('author'),
-            'timestamp': parse_iso8601(video.get('creationTime')),
-            'channel': channel.get('name'),
-            'channel_id': channel_id,
-            'channel_url': self._BASE_URL + '/?channel=' + channel_id if channel_id else None,
-            'duration': float_or_none(video.get('duration'), 1000),
-            'view_count': int_or_none(video.get('views')),
-            'tags': video.get('hashtags'),
-            'start_time': int_or_none(compat_parse_qs(
-                compat_urllib_parse_urlparse(url).query).get('t', [None])[0]),
-        }

youtube_dl/extractor/arte.py

@@ -12,7 +12,6 @@ from ..utils import (
     ExtractorError,
     int_or_none,
     qualities,
-    strip_or_none,
     try_get,
     unified_strdate,
     url_or_none,
@@ -253,49 +252,3 @@ class ArteTVPlaylistIE(ArteTVBaseIE):
         title = collection.get('title')
         description = collection.get('shortDescription') or collection.get('teaserText')
         return self.playlist_result(entries, playlist_id, title, description)
-
-
-class ArteTVCategoryIE(ArteTVBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?arte\.tv/(?P<lang>%s)/videos/(?P<id>[\w-]+(?:/[\w-]+)*)/?\s*$' % ArteTVBaseIE._ARTE_LANGUAGES
-    _TESTS = [{
-        'url': 'https://www.arte.tv/en/videos/politics-and-society/',
-        'info_dict': {
-            'id': 'politics-and-society',
-            'title': 'Politics and society',
-            'description': 'Investigative documentary series, geopolitical analysis, and international commentary',
-        },
-        'playlist_mincount': 13,
-    },
-    ]
-
-    @classmethod
-    def suitable(cls, url):
-        return (
-            not any(ie.suitable(url) for ie in (ArteTVIE, ArteTVPlaylistIE, ))
-            and super(ArteTVCategoryIE, cls).suitable(url))
-
-    def _real_extract(self, url):
-        lang, playlist_id = re.match(self._VALID_URL, url).groups()
-        webpage = self._download_webpage(url, playlist_id)
-
-        items = []
-        for video in re.finditer(
-                r'<a\b[^>]*?href\s*=\s*(?P<q>"|\'|\b)(?P<url>https?://www\.arte\.tv/%s/videos/[\w/-]+)(?P=q)' % lang,
-                webpage):
-            video = video.group('url')
-            if video == url:
-                continue
-            if any(ie.suitable(video) for ie in (ArteTVIE, ArteTVPlaylistIE, )):
-                items.append(video)
-
-        if items:
-            title = (self._og_search_title(webpage, default=None)
-                     or self._html_search_regex(r'<title\b[^>]*>([^<]+)</title>', default=None))
-            title = strip_or_none(title.rsplit('|', 1)[0]) or self._generic_title(url)
-
-            result = self.playlist_from_matches(items, playlist_id=playlist_id, playlist_title=title)
-            if result:
-                description = self._og_search_description(webpage, default=None)
-                if description:
-                    result['description'] = description
-                return result

youtube_dl/extractor/audiomack.py

@@ -14,7 +14,7 @@ from ..utils import (
 
 
 class AudiomackIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?audiomack\.com/(?:song/|(?=.+/song/))(?P<id>[\w/-]+)'
+    _VALID_URL = r'https?://(?:www\.)?audiomack\.com/song/(?P<id>[\w/-]+)'
     IE_NAME = 'audiomack'
     _TESTS = [
         # hosted on audiomack
@@ -29,27 +29,25 @@ class AudiomackIE(InfoExtractor):
             }
         },
         # audiomack wrapper around soundcloud song
-        # Needs new test URL.
         {
             'add_ie': ['Soundcloud'],
             'url': 'http://www.audiomack.com/song/hip-hop-daily/black-mamba-freestyle',
-            'only_matching': True,
+            'info_dict': {
-            # 'info_dict': {
+                'id': '258901379',
-                # 'id': '258901379',
+                'ext': 'mp3',
-                # 'ext': 'mp3',
+                'description': 'mamba day freestyle for the legend Kobe Bryant ',
-                # 'description': 'mamba day freestyle for the legend Kobe Bryant ',
+                'title': 'Black Mamba Freestyle [Prod. By Danny Wolf]',
-                # 'title': 'Black Mamba Freestyle [Prod. By Danny Wolf]',
+                'uploader': 'ILOVEMAKONNEN',
-                # 'uploader': 'ILOVEMAKONNEN',
+                'upload_date': '20160414',
-                # 'upload_date': '20160414',
+            }
-            # }
         },
     ]
 
     def _real_extract(self, url):
-        # URLs end with [uploader name]/song/[uploader title]
+        # URLs end with [uploader name]/[uploader title]
         # this title is whatever the user types in, and is rarely
         # the proper song title.  Real metadata is in the api response
-        album_url_tag = self._match_id(url).replace('/song/', '/')
+        album_url_tag = self._match_id(url)
 
         # Request the extended version of the api for extra fields like artist and title
         api_response = self._download_json(
@@ -75,13 +73,13 @@ class AudiomackIE(InfoExtractor):
 
 
 class AudiomackAlbumIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?audiomack\.com/(?:album/|(?=.+/album/))(?P<id>[\w/-]+)'
+    _VALID_URL = r'https?://(?:www\.)?audiomack\.com/album/(?P<id>[\w/-]+)'
     IE_NAME = 'audiomack:album'
     _TESTS = [
         # Standard album playlist
         {
             'url': 'http://www.audiomack.com/album/flytunezcom/tha-tour-part-2-mixtape',
-            'playlist_count': 11,
+            'playlist_count': 15,
             'info_dict':
             {
                 'id': '812251',
@@ -97,24 +95,24 @@ class AudiomackAlbumIE(InfoExtractor):
             },
             'playlist': [{
                 'info_dict': {
-                    'title': 'PPP (Pistol P Project) - 10. 4 Minutes Of Hell Part 4 (prod by DY OF 808 MAFIA)',
+                    'title': 'PPP (Pistol P Project) - 9. Heaven or Hell (CHIMACA) ft Zuse (prod by DJ FU)',
-                    'id': '837580',
+                    'id': '837577',
                     'ext': 'mp3',
                     'uploader': 'Lil Herb a.k.a. G Herbo',
                 }
             }],
             'params': {
-                'playliststart': 2,
+                'playliststart': 9,
-                'playlistend': 2,
+                'playlistend': 9,
             }
         }
     ]
 
     def _real_extract(self, url):
-        # URLs end with [uploader name]/album/[uploader title]
+        # URLs end with [uploader name]/[uploader title]
         # this title is whatever the user types in, and is rarely
         # the proper song title.  Real metadata is in the api response
-        album_url_tag = self._match_id(url).replace('/album/', '/')
+        album_url_tag = self._match_id(url)
         result = {'_type': 'playlist', 'entries': []}
         # There is no one endpoint for album metadata - instead it is included/repeated in each song's metadata
         # Therefore we don't know how many songs the album has and must infi-loop until failure
@@ -136,7 +134,7 @@ class AudiomackAlbumIE(InfoExtractor):
                 # Pull out the album metadata and add to result (if it exists)
                 for resultkey, apikey in [('id', 'album_id'), ('title', 'album_title')]:
                     if apikey in api_response and resultkey not in result:
-                        result[resultkey] = compat_str(api_response[apikey])
+                        result[resultkey] = api_response[apikey]
                 song_id = url_basename(api_response['url']).rpartition('.')[0]
                 result['entries'].append({
                     'id': compat_str(api_response.get('id', song_id)),

youtube_dl/extractor/bbc.py

@@ -11,8 +11,6 @@ from ..compat import (
     compat_etree_Element,
     compat_HTTPError,
     compat_parse_qs,
-    compat_str,
-    compat_urllib_error,
     compat_urllib_parse_urlparse,
     compat_urlparse,
 )
@@ -27,10 +25,8 @@ from ..utils import (
     js_to_json,
     parse_duration,
     parse_iso8601,
-    strip_or_none,
     try_get,
     unescapeHTML,
-    unified_timestamp,
     url_or_none,
     urlencode_postdata,
     urljoin,
@@ -40,7 +36,7 @@ from ..utils import (
 class BBCCoUkIE(InfoExtractor):
     IE_NAME = 'bbc.co.uk'
     IE_DESC = 'BBC iPlayer'
-    _ID_REGEX = r'(?:[pbml][\da-z]{7}|w[\da-z]{7,14})'
+    _ID_REGEX = r'(?:[pbm][\da-z]{7}|w[\da-z]{7,14})'
     _VALID_URL = r'''(?x)
                     https?://
                         (?:www\.)?bbc\.co\.uk/
@@ -396,17 +392,9 @@ class BBCCoUkIE(InfoExtractor):
                         formats.extend(self._extract_mpd_formats(
                             href, programme_id, mpd_id=format_id, fatal=False))
                     elif transfer_format == 'hls':
-                        # TODO: let expected_status be passed into _extract_xxx_formats() instead
+                        formats.extend(self._extract_m3u8_formats(
-                        try:
+                            href, programme_id, ext='mp4', entry_protocol='m3u8_native',
-                            fmts = self._extract_m3u8_formats(
+                            m3u8_id=format_id, fatal=False))
-                                href, programme_id, ext='mp4', entry_protocol='m3u8_native',
-                                m3u8_id=format_id, fatal=False)
-                        except ExtractorError as e:
-                            if not (isinstance(e.exc_info[1], compat_urllib_error.HTTPError)
-                                    and e.exc_info[1].code in (403, 404)):
-                                raise
-                            fmts = []
-                        formats.extend(fmts)
                     elif transfer_format == 'hds':
                         formats.extend(self._extract_f4m_formats(
                             href, programme_id, f4m_id=format_id, fatal=False))
@@ -773,44 +761,23 @@ class BBCIE(BBCCoUkIE):
         'only_matching': True,
     }, {
         # custom redirection to www.bbc.com
-        # also, video with window.__INITIAL_DATA__
         'url': 'http://www.bbc.co.uk/news/science-environment-33661876',
-        'info_dict': {
+        'only_matching': True,
-            'id': 'p02xzws1',
-            'ext': 'mp4',
-            'title': "Pluto may have 'nitrogen glaciers'",
-            'description': 'md5:6a95b593f528d7a5f2605221bc56912f',
-            'thumbnail': r're:https?://.+/.+\.jpg',
-            'timestamp': 1437785037,
-            'upload_date': '20150725',
-        },
-    }, {
-        # video with window.__INITIAL_DATA__ and value as JSON string
-        'url': 'https://www.bbc.com/news/av/world-europe-59468682',
-        'info_dict': {
-            'id': 'p0b71qth',
-            'ext': 'mp4',
-            'title': 'Why France is making this woman a national hero',
-            'description': 'md5:7affdfab80e9c3a1f976230a1ff4d5e4',
-            'thumbnail': r're:https?://.+/.+\.jpg',
-            'timestamp': 1638230731,
-            'upload_date': '20211130',
-        },
     }, {
         # single video article embedded with data-media-vpid
         'url': 'http://www.bbc.co.uk/sport/rowing/35908187',
         'only_matching': True,
     }, {
-        # bbcthreeConfig
         'url': 'https://www.bbc.co.uk/bbcthree/clip/73d0bbd0-abc3-4cea-b3c0-cdae21905eb1',
         'info_dict': {
             'id': 'p06556y7',
             'ext': 'mp4',
-            'title': 'Things Not To Say to people that live on council estates',
+            'title': 'Transfers: Cristiano Ronaldo to Man Utd, Arsenal to spend?',
-            'description': "From being labelled a 'chav', to the presumption that they're 'scroungers', people who live on council estates encounter all kinds of prejudices and false assumptions about themselves, their families, and their lifestyles. Here, eight people discuss the common statements, misconceptions, and clichés that they're tired of hearing.",
+            'description': 'md5:4b7dfd063d5a789a1512e99662be3ddd',
-            'duration': 360,
-            'thumbnail': r're:https?://.+/.+\.jpg',
         },
+        'params': {
+            'skip_download': True,
+        }
     }, {
         # window.__PRELOADED_STATE__
         'url': 'https://www.bbc.co.uk/radio/play/b0b9z4yl',
@@ -1183,16 +1150,9 @@ class BBCIE(BBCCoUkIE):
                 return self.playlist_result(
                     entries, playlist_id, playlist_title, playlist_description)
 
-        initial_data = self._search_regex(
+        initial_data = self._parse_json(self._search_regex(
-            r'window\.__INITIAL_DATA__\s*=\s*("{.+?}")\s*;', webpage,
+            r'window\.__INITIAL_DATA__\s*=\s*({.+?});', webpage,
-            'quoted preload state', default=None)
+            'preload state', default='{}'), playlist_id, fatal=False)
-        if initial_data is None:
-            initial_data = self._search_regex(
-                r'window\.__INITIAL_DATA__\s*=\s*({.+?})\s*;', webpage,
-                'preload state', default={})
-        else:
-            initial_data = self._parse_json(initial_data or '"{}"', playlist_id, fatal=False)
-        initial_data = self._parse_json(initial_data, playlist_id, fatal=False)
         if initial_data:
             def parse_media(media):
                 if not media:
@@ -1204,39 +1164,19 @@ class BBCIE(BBCCoUkIE):
                         continue
                     formats, subtitles = self._download_media_selector(item_id)
                     self._sort_formats(formats)
-                    item_desc = None
-                    blocks = try_get(media, lambda x: x['summary']['blocks'], list)
-                    if blocks:
-                        summary = []
-                        for block in blocks:
-                            text = try_get(block, lambda x: x['model']['text'], compat_str)
-                            if text:
-                                summary.append(text)
-                        if summary:
-                            item_desc = '\n\n'.join(summary)
-                    item_time = None
-                    for meta in try_get(media, lambda x: x['metadata']['items'], list) or []:
-                        if try_get(meta, lambda x: x['label']) == 'Published':
-                            item_time = unified_timestamp(meta.get('timestamp'))
-                            break
                     entries.append({
                         'id': item_id,
                         'title': item_title,
                         'thumbnail': item.get('holdingImageUrl'),
                         'formats': formats,
                         'subtitles': subtitles,
-                        'timestamp': item_time,
-                        'description': strip_or_none(item_desc),
                     })
             for resp in (initial_data.get('data') or {}).values():
                 name = resp.get('name')
                 if name == 'media-experience':
                     parse_media(try_get(resp, lambda x: x['data']['initialItem']['mediaItem'], dict))
                 elif name == 'article':
-                    for block in (try_get(resp,
+                    for block in (try_get(resp, lambda x: x['data']['blocks'], list) or []):
-                                          (lambda x: x['data']['blocks'],
-                                           lambda x: x['data']['content']['model']['blocks'],),
-                                          list) or []):
                         if block.get('type') != 'media':
                             continue
                         parse_media(block.get('model'))

youtube_dl/extractor/bigo.py

@@ -1,59 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-from .common import InfoExtractor
-from ..utils import ExtractorError, urlencode_postdata
-
-
-class BigoIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?bigo\.tv/(?:[a-z]{2,}/)?(?P<id>[^/]+)'
-
-    _TESTS = [{
-        'url': 'https://www.bigo.tv/ja/221338632',
-        'info_dict': {
-            'id': '6576287577575737440',
-            'title': '土よ〜💁‍♂️ 休憩室/REST room',
-            'thumbnail': r're:https?://.+',
-            'uploader': '✨Shin💫',
-            'uploader_id': '221338632',
-            'is_live': True,
-        },
-        'skip': 'livestream',
-    }, {
-        'url': 'https://www.bigo.tv/th/Tarlerm1304',
-        'only_matching': True,
-    }, {
-        'url': 'https://bigo.tv/115976881',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        user_id = self._match_id(url)
-
-        info_raw = self._download_json(
-            'https://bigo.tv/studio/getInternalStudioInfo',
-            user_id, data=urlencode_postdata({'siteId': user_id}))
-
-        if not isinstance(info_raw, dict):
-            raise ExtractorError('Received invalid JSON data')
-        if info_raw.get('code'):
-            raise ExtractorError(
-                'Bigo says: %s (code %s)' % (info_raw.get('msg'), info_raw.get('code')), expected=True)
-        info = info_raw.get('data') or {}
-
-        if not info.get('alive'):
-            raise ExtractorError('This user is offline.', expected=True)
-
-        return {
-            'id': info.get('roomId') or user_id,
-            'title': info.get('roomTopic') or info.get('nick_name') or user_id,
-            'formats': [{
-                'url': info.get('hls_src'),
-                'ext': 'mp4',
-                'protocol': 'm3u8',
-            }],
-            'thumbnail': info.get('snapshot'),
-            'uploader': info.get('nick_name'),
-            'uploader_id': user_id,
-            'is_live': True,
-        }

youtube_dl/extractor/bilibili.py

@@ -233,7 +233,7 @@ class BiliBiliIE(InfoExtractor):
             webpage)
         if uploader_mobj:
             info.update({
-                'uploader': uploader_mobj.group('name').strip(),
+                'uploader': uploader_mobj.group('name'),
                 'uploader_id': uploader_mobj.group('id'),
             })
         if not info.get('uploader'):
@@ -369,11 +369,6 @@ class BilibiliAudioIE(BilibiliAudioBaseIE):
             'filesize': int_or_none(play_data.get('size')),
         }]
 
-        for a_format in formats:
-            a_format.setdefault('http_headers', {}).update({
-                'Referer': url,
-            })
-
         song = self._call_api('song/info', au_id)
         title = song['title']
         statistic = song.get('statistic') or {}

youtube_dl/extractor/blerp.py

@@ -1,173 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-import json
-
-from ..utils import (
-    strip_or_none,
-    traverse_obj,
-)
-from .common import InfoExtractor
-
-
-class BlerpIE(InfoExtractor):
-    IE_NAME = 'blerp'
-    _VALID_URL = r'https?://(?:www\.)?blerp\.com/soundbites/(?P<id>[0-9a-zA-Z]+)'
-    _TESTS = [{
-        'url': 'https://blerp.com/soundbites/6320fe8745636cb4dd677a5a',
-        'info_dict': {
-            'id': '6320fe8745636cb4dd677a5a',
-            'title': 'Samsung Galaxy S8 Over the Horizon Ringtone 2016',
-            'uploader': 'luminousaj',
-            'uploader_id': '5fb81e51aa66ae000c395478',
-            'ext': 'mp3',
-            'tags': ['samsung', 'galaxy', 's8', 'over the horizon', '2016', 'ringtone'],
-        }
-    }, {
-        'url': 'https://blerp.com/soundbites/5bc94ef4796001000498429f',
-        'info_dict': {
-            'id': '5bc94ef4796001000498429f',
-            'title': 'Yee',
-            'uploader': '179617322678353920',
-            'uploader_id': '5ba99cf71386730004552c42',
-            'ext': 'mp3',
-            'tags': ['YEE', 'YEET', 'wo ha haah catchy tune yee', 'yee']
-        }
-    }]
-
-    _GRAPHQL_OPERATIONNAME = "webBitePageGetBite"
-    _GRAPHQL_QUERY = (
-        '''query webBitePageGetBite($_id: MongoID!) {
-            web {
-                biteById(_id: $_id) {
-                    ...bitePageFrag
-                    __typename
-                }
-                __typename
-            }
-        }
-
-        fragment bitePageFrag on Bite {
-            _id
-            title
-            userKeywords
-            keywords
-            color
-            visibility
-            isPremium
-            owned
-            price
-            extraReview
-            isAudioExists
-            image {
-                filename
-                original {
-                    url
-                    __typename
-                }
-                __typename
-            }
-            userReactions {
-                _id
-                reactions
-                createdAt
-                __typename
-            }
-            topReactions
-            totalSaveCount
-            saved
-            blerpLibraryType
-            license
-            licenseMetaData
-            playCount
-            totalShareCount
-            totalFavoriteCount
-            totalAddedToBoardCount
-            userCategory
-            userAudioQuality
-            audioCreationState
-            transcription
-            userTranscription
-            description
-            createdAt
-            updatedAt
-            author
-            listingType
-            ownerObject {
-                _id
-                username
-                profileImage {
-                    filename
-                    original {
-                        url
-                        __typename
-                    }
-                    __typename
-                }
-                __typename
-            }
-            transcription
-            favorited
-            visibility
-            isCurated
-            sourceUrl
-            audienceRating
-            strictAudienceRating
-            ownerId
-            reportObject {
-                reportedContentStatus
-                __typename
-            }
-            giphy {
-                mp4
-                gif
-                __typename
-            }
-            audio {
-                filename
-                original {
-                    url
-                    __typename
-                }
-                mp3 {
-                    url
-                    __typename
-                }
-                __typename
-            }
-            __typename
-        }
-
-        ''')
-
-    def _real_extract(self, url):
-        audio_id = self._match_id(url)
-
-        data = {
-            'operationName': self._GRAPHQL_OPERATIONNAME,
-            'query': self._GRAPHQL_QUERY,
-            'variables': {
-                '_id': audio_id
-            }
-        }
-
-        headers = {
-            'Content-Type': 'application/json'
-        }
-
-        json_result = self._download_json('https://api.blerp.com/graphql',
-                                          audio_id, data=json.dumps(data).encode('utf-8'), headers=headers)
-
-        bite_json = json_result['data']['web']['biteById']
-
-        info_dict = {
-            'id': bite_json['_id'],
-            'url': bite_json['audio']['mp3']['url'],
-            'title': bite_json['title'],
-            'uploader': traverse_obj(bite_json, ('ownerObject', 'username'), expected_type=strip_or_none),
-            'uploader_id': traverse_obj(bite_json, ('ownerObject', '_id'), expected_type=strip_or_none),
-            'ext': 'mp3',
-            'tags': list(filter(None, map(strip_or_none, (traverse_obj(bite_json, 'userKeywords', expected_type=list) or []))) or None)
-        }
-
-        return info_dict

youtube_dl/extractor/blinkx.py

@@ -0,0 +1,86 @@
+from __future__ import unicode_literals
+
+import json
+
+from .common import InfoExtractor
+from ..utils import (
+    remove_start,
+    int_or_none,
+)
+
+
+class BlinkxIE(InfoExtractor):
+    _VALID_URL = r'(?:https?://(?:www\.)blinkx\.com/#?ce/|blinkx:)(?P<id>[^?]+)'
+    IE_NAME = 'blinkx'
+
+    _TEST = {
+        'url': 'http://www.blinkx.com/ce/Da0Gw3xc5ucpNduzLuDDlv4WC9PuI4fDi1-t6Y3LyfdY2SZS5Urbvn-UPJvrvbo8LTKTc67Wu2rPKSQDJyZeeORCR8bYkhs8lI7eqddznH2ofh5WEEdjYXnoRtj7ByQwt7atMErmXIeYKPsSDuMAAqJDlQZ-3Ff4HJVeH_s3Gh8oQ',
+        'md5': '337cf7a344663ec79bf93a526a2e06c7',
+        'info_dict': {
+            'id': 'Da0Gw3xc',
+            'ext': 'mp4',
+            'title': 'No Daily Show for John Oliver; HBO Show Renewed - IGN News',
+            'uploader': 'IGN News',
+            'upload_date': '20150217',
+            'timestamp': 1424215740,
+            'description': 'HBO has renewed Last Week Tonight With John Oliver for two more seasons.',
+            'duration': 47.743333,
+        },
+    }
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        display_id = video_id[:8]
+
+        api_url = ('https://apib4.blinkx.com/api.php?action=play_video&'
+                   + 'video=%s' % video_id)
+        data_json = self._download_webpage(api_url, display_id)
+        data = json.loads(data_json)['api']['results'][0]
+        duration = None
+        thumbnails = []
+        formats = []
+        for m in data['media']:
+            if m['type'] == 'jpg':
+                thumbnails.append({
+                    'url': m['link'],
+                    'width': int(m['w']),
+                    'height': int(m['h']),
+                })
+            elif m['type'] == 'original':
+                duration = float(m['d'])
+            elif m['type'] == 'youtube':
+                yt_id = m['link']
+                self.to_screen('Youtube video detected: %s' % yt_id)
+                return self.url_result(yt_id, 'Youtube', video_id=yt_id)
+            elif m['type'] in ('flv', 'mp4'):
+                vcodec = remove_start(m['vcodec'], 'ff')
+                acodec = remove_start(m['acodec'], 'ff')
+                vbr = int_or_none(m.get('vbr') or m.get('vbitrate'), 1000)
+                abr = int_or_none(m.get('abr') or m.get('abitrate'), 1000)
+                tbr = vbr + abr if vbr and abr else None
+                format_id = '%s-%sk-%s' % (vcodec, tbr, m['w'])
+                formats.append({
+                    'format_id': format_id,
+                    'url': m['link'],
+                    'vcodec': vcodec,
+                    'acodec': acodec,
+                    'abr': abr,
+                    'vbr': vbr,
+                    'tbr': tbr,
+                    'width': int_or_none(m.get('w')),
+                    'height': int_or_none(m.get('h')),
+                })
+
+        self._sort_formats(formats)
+
+        return {
+            'id': display_id,
+            'fullid': video_id,
+            'title': data['title'],
+            'formats': formats,
+            'uploader': data['channel_name'],
+            'timestamp': data['pubdate_epoch'],
+            'description': data.get('description'),
+            'thumbnails': thumbnails,
+            'duration': duration,
+        }

youtube_dl/extractor/bongacams.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 from __future__ import unicode_literals
 
 import re
@@ -13,28 +12,13 @@ from ..utils import (
 
 
 class BongaCamsIE(InfoExtractor):
-    _VALID_URL = r'https?://(?P<host>(?:[^/]+\.)?bongacams\d*\.(?:com|net))/(?P<id>[^/?&#]+)'
+    _VALID_URL = r'https?://(?P<host>(?:[^/]+\.)?bongacams\d*\.com)/(?P<id>[^/?&#]+)'
     _TESTS = [{
         'url': 'https://de.bongacams.com/azumi-8',
         'only_matching': True,
     }, {
         'url': 'https://cn.bongacams.com/azumi-8',
         'only_matching': True,
-    }, {
-        'url': 'https://de.bongacams.net/claireashton',
-        'info_dict': {
-            'id': 'claireashton',
-            'ext': 'mp4',
-            'title': r're:ClaireAshton \d{4}-\d{2}-\d{2} \d{2}:\d{2}',
-            'age_limit': 18,
-            'uploader_id': 'ClaireAshton',
-            'uploader': 'ClaireAshton',
-            'like_count': int,
-            'is_live': True,
-        },
-        'params': {
-            'skip_download': True,
-        },
     }]
 
     def _real_extract(self, url):

youtube_dl/extractor/caffeine.py

@@ -1,79 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-from .common import InfoExtractor
-from ..utils import (
-    determine_ext,
-    int_or_none,
-    merge_dicts,
-    parse_iso8601,
-    T,
-    traverse_obj,
-    txt_or_none,
-    urljoin,
-)
-
-
-class CaffeineTVIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?caffeine\.tv/[^/]+/video/(?P<id>[0-9a-f-]+)'
-    _TESTS = [{
-        'url': 'https://www.caffeine.tv/TsuSurf/video/cffc0a00-e73f-11ec-8080-80017d29f26e',
-        'info_dict': {
-            'id': 'cffc0a00-e73f-11ec-8080-80017d29f26e',
-            'ext': 'mp4',
-            'title': 'GOOOOD MORNINNNNN #highlights',
-            'timestamp': 1654702180,
-            'upload_date': '20220608',
-            'uploader': 'TsuSurf',
-            'duration': 3145,
-            'age_limit': 17,
-        },
-        'params': {
-            'format': 'bestvideo',
-        },
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        json_data = self._download_json(
-            'https://api.caffeine.tv/social/public/activity/' + video_id,
-            video_id)
-        broadcast_info = traverse_obj(json_data, ('broadcast_info', T(dict))) or {}
-        title = broadcast_info['broadcast_title']
-        video_url = broadcast_info['video_url']
-
-        ext = determine_ext(video_url)
-        if ext == 'm3u8':
-            formats = self._extract_m3u8_formats(
-                video_url, video_id, 'mp4', entry_protocol='m3u8',
-                fatal=False)
-        else:
-            formats = [{'url': video_url}]
-        self._sort_formats(formats)
-
-        return merge_dicts({
-            'id': video_id,
-            'title': title,
-            'formats': formats,
-        }, traverse_obj(json_data, {
-            'uploader': ((None, 'user'), 'username'),
-        }, get_all=False), traverse_obj(json_data, {
-            'like_count': ('like_count', T(int_or_none)),
-            'view_count': ('view_count', T(int_or_none)),
-            'comment_count': ('comment_count', T(int_or_none)),
-            'tags': ('tags', Ellipsis, T(txt_or_none)),
-            'is_live': 'is_live',
-            'uploader': ('user', 'name'),
-        }), traverse_obj(broadcast_info, {
-            'duration': ('content_duration', T(int_or_none)),
-            'timestamp': ('broadcast_start_time', T(parse_iso8601)),
-            'thumbnail': ('preview_image_path', T(lambda u: urljoin(url, u))),
-            'age_limit': ('content_rating', T(lambda r: r and {
-                # assume Apple Store ratings [1]
-                # 1. https://en.wikipedia.org/wiki/Mobile_software_content_rating_system
-                'FOUR_PLUS': 0,
-                'NINE_PLUS': 9,
-                'TWELVE_PLUS': 12,
-                'SEVENTEEN_PLUS': 17,
-            }.get(r, 17))),
-        }))

youtube_dl/extractor/callin.py

@@ -1,74 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-from .common import InfoExtractor
-from ..compat import compat_str
-from ..utils import (
-    ExtractorError,
-    traverse_obj,
-    try_get,
-)
-
-
-class CallinIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?callin\.com/episode/(?:[^/#?-]+-)*(?P<id>[^/#?-]+)'
-    _TESTS = [{
-        'url': 'https://www.callin.com/episode/fcc-commissioner-brendan-carr-on-elons-PrumRdSQJW',
-        'md5': '14ede27ee2c957b7e4db93140fc0745c',
-        'info_dict': {
-            'id': 'PrumRdSQJW',
-            'ext': 'mp4',
-            'title': 'FCC Commissioner Brendan Carr on Elon’s Starlink',
-            'description': 'Or, why the government doesn’t like SpaceX',
-            'channel': 'The Pull Request',
-            'channel_url': 'https://callin.com/show/the-pull-request-ucnDJmEKAa',
-        }
-    }, {
-        'url': 'https://www.callin.com/episode/episode-81-elites-melt-down-over-student-debt-lzxMidUnjA',
-        'md5': '16f704ddbf82a27e3930533b12062f07',
-        'info_dict': {
-            'id': 'lzxMidUnjA',
-            'ext': 'mp4',
-            'title': 'Episode 81- Elites MELT DOWN over Student Debt Victory? Rumble in NYC?',
-            'description': 'Let’s talk todays episode about the primary election shake up in NYC and the elites melting down over student debt cancelation.',
-            'channel': 'The DEBRIEF With Briahna Joy Gray',
-            'channel_url': 'https://callin.com/show/the-debrief-with-briahna-joy-gray-siiFDzGegm',
-        }
-    }]
-
-    def _search_nextjs_data(self, webpage, video_id, transform_source=None, fatal=True, **kw):
-        return self._parse_json(
-            self._search_regex(
-                r'(?s)<script[^>]+id=[\'"]__NEXT_DATA__[\'"][^>]*>([^<]+)</script>',
-                webpage, 'next.js data', fatal=fatal, **kw),
-            video_id, transform_source=transform_source, fatal=fatal)
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-
-        next_data = self._search_nextjs_data(webpage, video_id)
-        episode = traverse_obj(next_data, ('props', 'pageProps', 'episode'), expected_type=dict)
-        if not episode:
-            raise ExtractorError('Failed to find episode data')
-
-        title = episode.get('title') or self._og_search_title(webpage)
-        description = episode.get('description') or self._og_search_description(webpage)
-
-        formats = []
-        formats.extend(self._extract_m3u8_formats(
-            episode.get('m3u8'), video_id, 'mp4',
-            entry_protocol='m3u8_native', fatal=False))
-        self._sort_formats(formats)
-
-        channel = try_get(episode, lambda x: x['show']['title'], compat_str)
-        channel_url = try_get(episode, lambda x: x['show']['linkObj']['resourceUrl'], compat_str)
-
-        return {
-            'id': video_id,
-            'title': title,
-            'description': description,
-            'formats': formats,
-            'channel': channel,
-            'channel_url': channel_url,
-        }

youtube_dl/extractor/cammodels.py

@@ -3,6 +3,7 @@ from __future__ import unicode_literals
 
 from .common import InfoExtractor
 from ..utils import (
+    ExtractorError,
     int_or_none,
     url_or_none,
 )
@@ -19,11 +20,32 @@ class CamModelsIE(InfoExtractor):
     def _real_extract(self, url):
         user_id = self._match_id(url)
 
+        webpage = self._download_webpage(
+            url, user_id, headers=self.geo_verification_headers())
+
+        manifest_root = self._html_search_regex(
+            r'manifestUrlRoot=([^&\']+)', webpage, 'manifest', default=None)
+
+        if not manifest_root:
+            ERRORS = (
+                ("I'm offline, but let's stay connected", 'This user is currently offline'),
+                ('in a private show', 'This user is in a private show'),
+                ('is currently performing LIVE', 'This model is currently performing live'),
+            )
+            for pattern, message in ERRORS:
+                if pattern in webpage:
+                    error = message
+                    expected = True
+                    break
+            else:
+                error = 'Unable to find manifest URL root'
+                expected = False
+            raise ExtractorError(error, expected=expected)
+
         manifest = self._download_json(
-            'https://manifest-server.naiadsystems.com/live/s:%s.json' % user_id, user_id)
+            '%s%s.json' % (manifest_root, user_id), user_id)
 
         formats = []
-        thumbnails = []
         for format_id, format_dict in manifest['formats'].items():
             if not isinstance(format_dict, dict):
                 continue
@@ -63,13 +85,6 @@ class CamModelsIE(InfoExtractor):
                         'preference': -1,
                     })
                 else:
-                    if format_id == 'jpeg':
-                        thumbnails.append({
-                            'url': f['url'],
-                            'width': f['width'],
-                            'height': f['height'],
-                            'format_id': f['format_id'],
-                        })
                     continue
                 formats.append(f)
         self._sort_formats(formats)
@@ -77,7 +92,6 @@ class CamModelsIE(InfoExtractor):
         return {
             'id': user_id,
             'title': self._live_title(user_id),
-            'thumbnails': thumbnails,
             'is_live': True,
             'formats': formats,
             'age_limit': 18

youtube_dl/extractor/cbsnews.py

@@ -26,7 +26,7 @@ class CBSNewsEmbedIE(CBSIE):
     def _real_extract(self, url):
         item = self._parse_json(zlib.decompress(compat_b64decode(
             compat_urllib_parse_unquote(self._match_id(url))),
-            -zlib.MAX_WBITS).decode('utf-8'), None)['video']['items'][0]
+            -zlib.MAX_WBITS), None)['video']['items'][0]
         return self._extract_video_info(item['mpxRefId'], 'cbsnews')
 
 

youtube_dl/extractor/cbssports.py

@@ -1,113 +1,38 @@
 from __future__ import unicode_literals
 
-import re
+from .cbs import CBSBaseIE
-
-# from .cbs import CBSBaseIE
-from .common import InfoExtractor
-from ..utils import (
-    int_or_none,
-    try_get,
-)
 
 
-# class CBSSportsEmbedIE(CBSBaseIE):
+class CBSSportsIE(CBSBaseIE):
-class CBSSportsEmbedIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?cbssports\.com/[^/]+/(?:video|news)/(?P<id>[^/?#&]+)'
-    IE_NAME = 'cbssports:embed'
+
-    _VALID_URL = r'''(?ix)https?://(?:(?:www\.)?cbs|embed\.247)sports\.com/player/embed.+?
-        (?:
-            ids%3D(?P<id>[\da-f]{8}-(?:[\da-f]{4}-){3}[\da-f]{12})|
-            pcid%3D(?P<pcid>\d+)
-        )'''
     _TESTS = [{
-        'url': 'https://www.cbssports.com/player/embed/?args=player_id%3Db56c03a6-231a-4bbe-9c55-af3c8a8e9636%26ids%3Db56c03a6-231a-4bbe-9c55-af3c8a8e9636%26resizable%3D1%26autoplay%3Dtrue%26domain%3Dcbssports.com%26comp_ads_enabled%3Dfalse%26watchAndRead%3D0%26startTime%3D0%26env%3Dprod',
+        'url': 'https://www.cbssports.com/nba/video/donovan-mitchell-flashes-star-potential-in-game-2-victory-over-thunder/',
-        'only_matching': True,
+        'info_dict': {
+            'id': '1214315075735',
+            'ext': 'mp4',
+            'title': 'Donovan Mitchell flashes star potential in Game 2 victory over Thunder',
+            'description': 'md5:df6f48622612c2d6bd2e295ddef58def',
+            'timestamp': 1524111457,
+            'upload_date': '20180419',
+            'uploader': 'CBSI-NEW',
+        },
+        'params': {
+            # m3u8 download
+            'skip_download': True,
+        }
     }, {
-        'url': 'https://embed.247sports.com/player/embed/?args=%3fplayer_id%3d1827823171591%26channel%3dcollege-football-recruiting%26pcid%3d1827823171591%26width%3d640%26height%3d360%26autoplay%3dTrue%26comp_ads_enabled%3dFalse%26uvpc%3dhttps%253a%252f%252fwww.cbssports.com%252fapi%252fcontent%252fvideo%252fconfig%252f%253fcfg%253duvp_247sports_v4%2526partner%253d247%26uvpc_m%3dhttps%253a%252f%252fwww.cbssports.com%252fapi%252fcontent%252fvideo%252fconfig%252f%253fcfg%253duvp_247sports_m_v4%2526partner_m%253d247_mobile%26utag%3d247sportssite%26resizable%3dTrue',
+        'url': 'https://www.cbssports.com/nba/news/nba-playoffs-2018-watch-76ers-vs-heat-game-3-series-schedule-tv-channel-online-stream/',
         'only_matching': True,
     }]
 
-    # def _extract_video_info(self, filter_query, video_id):
+    def _extract_video_info(self, filter_query, video_id):
-    #     return self._extract_feed_info('dJ5BDC', 'VxxJg8Ymh8sE', filter_query, video_id)
+        return self._extract_feed_info('dJ5BDC', 'VxxJg8Ymh8sE', filter_query, video_id)
 
-    def _real_extract(self, url):
-        uuid, pcid = re.match(self._VALID_URL, url).groups()
-        query = {'id': uuid} if uuid else {'pcid': pcid}
-        video = self._download_json(
-            'https://www.cbssports.com/api/content/video/',
-            uuid or pcid, query=query)[0]
-        video_id = video['id']
-        title = video['title']
-        metadata = video.get('metaData') or {}
-        # return self._extract_video_info('byId=%d' % metadata['mpxOutletId'], video_id)
-        # return self._extract_video_info('byGuid=' + metadata['mpxRefId'], video_id)
-
-        formats = self._extract_m3u8_formats(
-            metadata['files'][0]['url'], video_id, 'mp4',
-            'm3u8_native', m3u8_id='hls', fatal=False)
-        self._sort_formats(formats)
-
-        image = video.get('image')
-        thumbnails = None
-        if image:
-            image_path = image.get('path')
-            if image_path:
-                thumbnails = [{
-                    'url': image_path,
-                    'width': int_or_none(image.get('width')),
-                    'height': int_or_none(image.get('height')),
-                    'filesize': int_or_none(image.get('size')),
-                }]
-
-        return {
-            'id': video_id,
-            'title': title,
-            'formats': formats,
-            'thumbnails': thumbnails,
-            'description': video.get('description'),
-            'timestamp': int_or_none(try_get(video, lambda x: x['dateCreated']['epoch'])),
-            'duration': int_or_none(metadata.get('duration')),
-        }
-
-
-class CBSSportsBaseIE(InfoExtractor):
     def _real_extract(self, url):
         display_id = self._match_id(url)
         webpage = self._download_webpage(url, display_id)
-        iframe_url = self._search_regex(
+        video_id = self._search_regex(
-            r'<iframe[^>]+(?:data-)?src="(https?://[^/]+/player/embed[^"]+)"',
+            [r'(?:=|%26)pcid%3D(\d+)', r'embedVideo(?:Container)?_(\d+)'],
-            webpage, 'embed url')
+            webpage, 'video id')
-        return self.url_result(iframe_url, CBSSportsEmbedIE.ie_key())
+        return self._extract_video_info('byId=%s' % video_id, video_id)
-
-
-class CBSSportsIE(CBSSportsBaseIE):
-    IE_NAME = 'cbssports'
-    _VALID_URL = r'https?://(?:www\.)?cbssports\.com/[^/]+/video/(?P<id>[^/?#&]+)'
-    _TESTS = [{
-        'url': 'https://www.cbssports.com/college-football/video/cover-3-stanford-spring-gleaning/',
-        'info_dict': {
-            'id': 'b56c03a6-231a-4bbe-9c55-af3c8a8e9636',
-            'ext': 'mp4',
-            'title': 'Cover 3: Stanford Spring Gleaning',
-            'description': 'The Cover 3 crew break down everything you need to know about the Stanford Cardinal this spring.',
-            'timestamp': 1617218398,
-            'upload_date': '20210331',
-            'duration': 502,
-        },
-    }]
-
-
-class TwentyFourSevenSportsIE(CBSSportsBaseIE):
-    IE_NAME = '247sports'
-    _VALID_URL = r'https?://(?:www\.)?247sports\.com/Video/(?:[^/?#&]+-)?(?P<id>\d+)'
-    _TESTS = [{
-        'url': 'https://247sports.com/Video/2021-QB-Jake-Garcia-senior-highlights-through-five-games-10084854/',
-        'info_dict': {
-            'id': '4f1265cb-c3b5-44a8-bb1d-1914119a0ccc',
-            'ext': 'mp4',
-            'title': '2021 QB Jake Garcia senior highlights through five games',
-            'description': 'md5:8cb67ebed48e2e6adac1701e0ff6e45b',
-            'timestamp': 1607114223,
-            'upload_date': '20201204',
-            'duration': 208,
-        },
-    }]

youtube_dl/extractor/cda.py

@@ -133,8 +133,6 @@ class CDAIE(InfoExtractor):
             'age_limit': 18 if need_confirm_age else 0,
         }
 
-        info = self._search_json_ld(webpage, video_id, default={})
-
         # Source: https://www.cda.pl/js/player.js?t=1606154898
         def decrypt_file(a):
             for p in ('_XDDD', '_CDA', '_ADC', '_CXD', '_QWE', '_Q5', '_IKSDE'):
@@ -199,7 +197,7 @@ class CDAIE(InfoExtractor):
                 handler = self._download_webpage
 
             webpage = handler(
-                urljoin(self._BASE_URL, href), video_id,
+                self._BASE_URL + href, video_id,
                 'Downloading %s version information' % resolution, fatal=False)
             if not webpage:
                 # Manually report warning because empty page is returned when
@@ -211,4 +209,6 @@ class CDAIE(InfoExtractor):
 
         self._sort_formats(formats)
 
+        info = self._search_json_ld(webpage, video_id, default={})
+
         return merge_dicts(info_dict, info)

youtube_dl/extractor/ceskatelevize.py

@@ -12,21 +12,35 @@ from ..utils import (
     ExtractorError,
     float_or_none,
     sanitized_Request,
-    str_or_none,
+    unescapeHTML,
-    traverse_obj,
+    update_url_query,
     urlencode_postdata,
     USER_AGENTS,
 )
 
 
 class CeskaTelevizeIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?ceskatelevize\.cz/(?:ivysilani|porady|zive)/(?:[^/?#&]+/)*(?P<id>[^/#?]+)'
+    _VALID_URL = r'https?://(?:www\.)?ceskatelevize\.cz/ivysilani/(?:[^/?#&]+/)*(?P<id>[^/#?]+)'
     _TESTS = [{
+        'url': 'http://www.ceskatelevize.cz/ivysilani/ivysilani/10441294653-hyde-park-civilizace/214411058091220',
+        'info_dict': {
+            'id': '61924494877246241',
+            'ext': 'mp4',
+            'title': 'Hyde Park Civilizace: Život v Grónsku',
+            'description': 'md5:3fec8f6bb497be5cdb0c9e8781076626',
+            'thumbnail': r're:^https?://.*\.jpg',
+            'duration': 3350,
+        },
+        'params': {
+            # m3u8 download
+            'skip_download': True,
+        },
+    }, {
         'url': 'http://www.ceskatelevize.cz/ivysilani/10441294653-hyde-park-civilizace/215411058090502/bonus/20641-bonus-01-en',
         'info_dict': {
             'id': '61924494877028507',
             'ext': 'mp4',
-            'title': 'Bonus 01 - En - Hyde Park Civilizace',
+            'title': 'Hyde Park Civilizace: Bonus 01 - En',
             'description': 'English Subtittles',
             'thumbnail': r're:^https?://.*\.jpg',
             'duration': 81.3,
@@ -37,111 +51,31 @@ class CeskaTelevizeIE(InfoExtractor):
         },
     }, {
         # live stream
-        'url': 'http://www.ceskatelevize.cz/zive/ct1/',
-        'info_dict': {
-            'id': '102',
-            'ext': 'mp4',
-            'title': r'ČT1 - živé vysílání online',
-            'description': 'Sledujte živé vysílání kanálu ČT1 online. Vybírat si můžete i z dalších kanálů České televize na kterémkoli z vašich zařízení.',
-            'is_live': True,
-        },
-        'params': {
-            # m3u8 download
-            'skip_download': True,
-        },
-    }, {
-        # another
         'url': 'http://www.ceskatelevize.cz/ivysilani/zive/ct4/',
-        'only_matching': True,
         'info_dict': {
             'id': 402,
             'ext': 'mp4',
             'title': r're:^ČT Sport \d{4}-\d{2}-\d{2} \d{2}:\d{2}$',
             'is_live': True,
         },
-        # 'skip': 'Georestricted to Czech Republic',
-    }, {
-        'url': 'http://www.ceskatelevize.cz/ivysilani/embed/iFramePlayer.php?hash=d6a3e1370d2e4fa76296b90bad4dfc19673b641e&IDEC=217 562 22150/0004&channelID=1&width=100%25',
-        'only_matching': True,
-    }, {
-        # video with 18+ caution trailer
-        'url': 'http://www.ceskatelevize.cz/porady/10520528904-queer/215562210900007-bogotart/',
-        'info_dict': {
-            'id': '215562210900007-bogotart',
-            'title': 'Bogotart - Queer',
-            'description': 'Hlavní město Kolumbie v doprovodu queer umělců. Vroucí svět plný vášně, sebevědomí, ale i násilí a bolesti',
-        },
-        'playlist': [{
-            'info_dict': {
-                'id': '61924494877311053',
-                'ext': 'mp4',
-                'title': 'Bogotart - Queer (Varování 18+)',
-                'duration': 11.9,
-            },
-        }, {
-            'info_dict': {
-                'id': '61924494877068022',
-                'ext': 'mp4',
-                'title': 'Bogotart - Queer (Queer)',
-                'thumbnail': r're:^https?://.*\.jpg',
-                'duration': 1558.3,
-            },
-        }],
         'params': {
             # m3u8 download
             'skip_download': True,
         },
+        'skip': 'Georestricted to Czech Republic',
     }, {
-        # iframe embed
+        'url': 'http://www.ceskatelevize.cz/ivysilani/embed/iFramePlayer.php?hash=d6a3e1370d2e4fa76296b90bad4dfc19673b641e&IDEC=217 562 22150/0004&channelID=1&width=100%25',
-        'url': 'http://www.ceskatelevize.cz/porady/10614999031-neviditelni/21251212048/',
         'only_matching': True,
     }]
 
-    def _search_nextjs_data(self, webpage, video_id, **kw):
-        return self._parse_json(
-            self._search_regex(
-                r'(?s)<script[^>]+id=[\'"]__NEXT_DATA__[\'"][^>]*>([^<]+)</script>',
-                webpage, 'next.js data', **kw),
-            video_id, **kw)
-
     def _real_extract(self, url):
         playlist_id = self._match_id(url)
-        webpage, urlh = self._download_webpage_handle(url, playlist_id)
-        parsed_url = compat_urllib_parse_urlparse(urlh.geturl())
-        site_name = self._og_search_property('site_name', webpage, fatal=False, default='Česká televize')
-        playlist_title = self._og_search_title(webpage, default=None)
-        if site_name and playlist_title:
-            playlist_title = re.split(r'\s*[—|]\s*%s' % (site_name, ), playlist_title, 1)[0]
-        playlist_description = self._og_search_description(webpage, default=None)
-        if playlist_description:
-            playlist_description = playlist_description.replace('\xa0', ' ')
 
-        type_ = 'IDEC'
+        webpage = self._download_webpage(url, playlist_id)
-        if re.search(r'(^/porady|/zive)/', parsed_url.path):
-            next_data = self._search_nextjs_data(webpage, playlist_id)
-            if '/zive/' in parsed_url.path:
-                idec = traverse_obj(next_data, ('props', 'pageProps', 'data', 'liveBroadcast', 'current', 'idec'), get_all=False)
-            else:
-                idec = traverse_obj(next_data, ('props', 'pageProps', 'data', ('show', 'mediaMeta'), 'idec'), get_all=False)
-                if not idec:
-                    idec = traverse_obj(next_data, ('props', 'pageProps', 'data', 'videobonusDetail', 'bonusId'), get_all=False)
-                    if idec:
-                        type_ = 'bonus'
-            if not idec:
-                raise ExtractorError('Failed to find IDEC id')
-            iframe_hash = self._download_webpage(
-                'https://www.ceskatelevize.cz/v-api/iframe-hash/',
-                playlist_id, note='Getting IFRAME hash')
-            query = {'hash': iframe_hash, 'origin': 'iVysilani', 'autoStart': 'true', type_: idec, }
-            webpage = self._download_webpage(
-                'https://www.ceskatelevize.cz/ivysilani/embed/iFramePlayer.php',
-                playlist_id, note='Downloading player', query=query)
 
         NOT_AVAILABLE_STRING = 'This content is not available at your territory due to limited copyright.'
         if '%s</p>' % NOT_AVAILABLE_STRING in webpage:
-            self.raise_geo_restricted(NOT_AVAILABLE_STRING)
+            raise ExtractorError(NOT_AVAILABLE_STRING, expected=True)
-        if any(not_found in webpage for not_found in ('Neplatný parametr pro videopřehrávač', 'IDEC nebyl nalezen', )):
-            raise ExtractorError('no video with IDEC available', video_id=idec, expected=True)
 
         type_ = None
         episode_id = None
@@ -166,7 +100,7 @@ class CeskaTelevizeIE(InfoExtractor):
         data = {
             'playlist[0][type]': type_,
             'playlist[0][id]': episode_id,
-            'requestUrl': parsed_url.path,
+            'requestUrl': compat_urllib_parse_urlparse(url).path,
             'requestSource': 'iVysilani',
         }
 
@@ -174,7 +108,7 @@ class CeskaTelevizeIE(InfoExtractor):
 
         for user_agent in (None, USER_AGENTS['Safari']):
             req = sanitized_Request(
-                'https://www.ceskatelevize.cz/ivysilani/ajax/get-client-playlist/',
+                'https://www.ceskatelevize.cz/ivysilani/ajax/get-client-playlist',
                 data=urlencode_postdata(data))
 
             req.add_header('Content-type', 'application/x-www-form-urlencoded')
@@ -196,6 +130,9 @@ class CeskaTelevizeIE(InfoExtractor):
             req = sanitized_Request(compat_urllib_parse_unquote(playlist_url))
             req.add_header('Referer', url)
 
+            playlist_title = self._og_search_title(webpage, default=None)
+            playlist_description = self._og_search_description(webpage, default=None)
+
             playlist = self._download_json(req, playlist_id, fatal=False)
             if not playlist:
                 continue
@@ -230,7 +167,7 @@ class CeskaTelevizeIE(InfoExtractor):
                     entries[num]['formats'].extend(formats)
                     continue
 
-                item_id = str_or_none(item.get('id') or item['assetId'])
+                item_id = item.get('id') or item['assetId']
                 title = item['title']
 
                 duration = float_or_none(item.get('duration'))
@@ -244,6 +181,8 @@ class CeskaTelevizeIE(InfoExtractor):
 
                 if playlist_len == 1:
                     final_title = playlist_title or title
+                    if is_live:
+                        final_title = self._live_title(final_title)
                 else:
                     final_title = '%s (%s)' % (playlist_title, title)
 
@@ -261,8 +200,6 @@ class CeskaTelevizeIE(InfoExtractor):
         for e in entries:
             self._sort_formats(e['formats'])
 
-        if len(entries) == 1:
-            return entries[0]
         return self.playlist_result(entries, playlist_id, playlist_title, playlist_description)
 
     def _get_subtitles(self, episode_id, subs):
@@ -299,3 +236,54 @@ class CeskaTelevizeIE(InfoExtractor):
                     yield line
 
         return '\r\n'.join(_fix_subtitle(subtitles))
+
+
+class CeskaTelevizePoradyIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?ceskatelevize\.cz/porady/(?:[^/?#&]+/)*(?P<id>[^/#?]+)'
+    _TESTS = [{
+        # video with 18+ caution trailer
+        'url': 'http://www.ceskatelevize.cz/porady/10520528904-queer/215562210900007-bogotart/',
+        'info_dict': {
+            'id': '215562210900007-bogotart',
+            'title': 'Queer: Bogotart',
+            'description': 'Alternativní průvodce současným queer světem',
+        },
+        'playlist': [{
+            'info_dict': {
+                'id': '61924494876844842',
+                'ext': 'mp4',
+                'title': 'Queer: Bogotart (Varování 18+)',
+                'duration': 10.2,
+            },
+        }, {
+            'info_dict': {
+                'id': '61924494877068022',
+                'ext': 'mp4',
+                'title': 'Queer: Bogotart (Queer)',
+                'thumbnail': r're:^https?://.*\.jpg',
+                'duration': 1558.3,
+            },
+        }],
+        'params': {
+            # m3u8 download
+            'skip_download': True,
+        },
+    }, {
+        # iframe embed
+        'url': 'http://www.ceskatelevize.cz/porady/10614999031-neviditelni/21251212048/',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+
+        webpage = self._download_webpage(url, video_id)
+
+        data_url = update_url_query(unescapeHTML(self._search_regex(
+            (r'<span[^>]*\bdata-url=(["\'])(?P<url>(?:(?!\1).)+)\1',
+             r'<iframe[^>]+\bsrc=(["\'])(?P<url>(?:https?:)?//(?:www\.)?ceskatelevize\.cz/ivysilani/embed/iFramePlayer\.php.*?)\1'),
+            webpage, 'iframe player url', group='url')), query={
+                'autoStart': 'true',
+        })
+
+        return self.url_result(data_url, ie=CeskaTelevizeIE.ie_key())

youtube_dl/extractor/clipchamp.py

@@ -1,69 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-from .common import InfoExtractor
-from ..compat import compat_str
-from ..utils import (
-    ExtractorError,
-    merge_dicts,
-    T,
-    traverse_obj,
-    unified_timestamp,
-    url_or_none,
-)
-
-
-class ClipchampIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?clipchamp\.com/watch/(?P<id>[\w-]+)'
-    _TESTS = [{
-        'url': 'https://clipchamp.com/watch/gRXZ4ZhdDaU',
-        'info_dict': {
-            'id': 'gRXZ4ZhdDaU',
-            'ext': 'mp4',
-            'title': 'Untitled video',
-            'uploader': 'Alexander Schwartz',
-            'timestamp': 1680805580,
-            'upload_date': '20230406',
-            'thumbnail': r're:^https?://.+\.jpg',
-        },
-        'params': {
-            'skip_download': 'm3u8',
-            'format': 'bestvideo',
-        },
-    }]
-
-    _STREAM_URL_TMPL = 'https://%s.cloudflarestream.com/%s/manifest/video.%s'
-    _STREAM_URL_QUERY = {'parentOrigin': 'https://clipchamp.com'}
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-        data = self._search_nextjs_data(webpage, video_id)['props']['pageProps']['video']
-
-        storage_location = data.get('storage_location')
-        if storage_location != 'cf_stream':
-            raise ExtractorError('Unsupported clip storage location "%s"' % (storage_location,))
-
-        path = data['download_url']
-        iframe = self._download_webpage(
-            'https://iframe.cloudflarestream.com/' + path, video_id, 'Downloading player iframe')
-        subdomain = self._search_regex(
-            r'''\bcustomer-domain-prefix\s*=\s*("|')(?P<sd>[\w-]+)\1''', iframe,
-            'subdomain', group='sd', fatal=False) or 'customer-2ut9yn3y6fta1yxe'
-
-        formats = self._extract_mpd_formats(
-            self._STREAM_URL_TMPL % (subdomain, path, 'mpd'), video_id,
-            query=self._STREAM_URL_QUERY, fatal=False, mpd_id='dash')
-        formats.extend(self._extract_m3u8_formats(
-            self._STREAM_URL_TMPL % (subdomain, path, 'm3u8'), video_id, 'mp4',
-            query=self._STREAM_URL_QUERY, fatal=False, m3u8_id='hls'))
-
-        return merge_dicts({
-            'id': video_id,
-            'formats': formats,
-            'uploader': ' '.join(traverse_obj(data, ('creator', ('first_name', 'last_name'), T(compat_str)))) or None,
-        }, traverse_obj(data, {
-            'title': ('project', 'project_name', T(compat_str)),
-            'timestamp': ('created_at', T(unified_timestamp)),
-            'thumbnail': ('thumbnail_url', T(url_or_none)),
-        }), rev=True)

youtube_dl/extractor/cpac.py

@@ -1,148 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-from .common import InfoExtractor
-from ..compat import compat_str
-from ..utils import (
-    int_or_none,
-    str_or_none,
-    try_get,
-    unified_timestamp,
-    update_url_query,
-    urljoin,
-)
-
-# compat_range
-try:
-    if callable(xrange):
-        range = xrange
-except (NameError, TypeError):
-    pass
-
-
-class CPACIE(InfoExtractor):
-    IE_NAME = 'cpac'
-    _VALID_URL = r'https?://(?:www\.)?cpac\.ca/(?P<fr>l-)?episode\?id=(?P<id>[\da-f]{8}(?:-[\da-f]{4}){3}-[\da-f]{12})'
-    _TEST = {
-        # 'url': 'http://www.cpac.ca/en/programs/primetime-politics/episodes/65490909',
-        'url': 'https://www.cpac.ca/episode?id=fc7edcae-4660-47e1-ba61-5b7f29a9db0f',
-        'md5': 'e46ad699caafd7aa6024279f2614e8fa',
-        'info_dict': {
-            'id': 'fc7edcae-4660-47e1-ba61-5b7f29a9db0f',
-            'ext': 'mp4',
-            'upload_date': '20220215',
-            'title': 'News Conference to Celebrate National Kindness Week – February 15, 2022',
-            'description': 'md5:466a206abd21f3a6f776cdef290c23fb',
-            'timestamp': 1644901200,
-        },
-        'params': {
-            'format': 'bestvideo',
-            'hls_prefer_native': True,
-        },
-    }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        url_lang = 'fr' if '/l-episode?' in url else 'en'
-
-        content = self._download_json(
-            'https://www.cpac.ca/api/1/services/contentModel.json?url=/site/website/episode/index.xml&crafterSite=cpacca&id=' + video_id,
-            video_id)
-        video_url = try_get(content, lambda x: x['page']['details']['videoUrl'], compat_str)
-        formats = []
-        if video_url:
-            content = content['page']
-            title = str_or_none(content['details']['title_%s_t' % (url_lang, )])
-            formats = self._extract_m3u8_formats(video_url, video_id, m3u8_id='hls', ext='mp4')
-            for fmt in formats:
-                # prefer language to match URL
-                fmt_lang = fmt.get('language')
-                if fmt_lang == url_lang:
-                    fmt['language_preference'] = 10
-                elif not fmt_lang:
-                    fmt['language_preference'] = -1
-                else:
-                    fmt['language_preference'] = -10
-
-        self._sort_formats(formats)
-
-        category = str_or_none(content['details']['category_%s_t' % (url_lang, )])
-
-        def is_live(v_type):
-            return (v_type == 'live') if v_type is not None else None
-
-        return {
-            'id': video_id,
-            'formats': formats,
-            'title': title,
-            'description': str_or_none(content['details'].get('description_%s_t' % (url_lang, ))),
-            'timestamp': unified_timestamp(content['details'].get('liveDateTime')),
-            'category': [category] if category else None,
-            'thumbnail': urljoin(url, str_or_none(content['details'].get('image_%s_s' % (url_lang, )))),
-            'is_live': is_live(content['details'].get('type')),
-        }
-
-
-class CPACPlaylistIE(InfoExtractor):
-    IE_NAME = 'cpac:playlist'
-    _VALID_URL = r'(?i)https?://(?:www\.)?cpac\.ca/(?:program|search|(?P<fr>emission|rechercher))\?(?:[^&]+&)*?(?P<id>(?:id=\d+|programId=\d+|key=[^&]+))'
-
-    _TESTS = [{
-        'url': 'https://www.cpac.ca/program?id=6',
-        'info_dict': {
-            'id': 'id=6',
-            'title': 'Headline Politics',
-            'description': 'Watch CPAC’s signature long-form coverage of the day’s pressing political events as they unfold.',
-        },
-        'playlist_count': 10,
-    }, {
-        'url': 'https://www.cpac.ca/search?key=hudson&type=all&order=desc',
-        'info_dict': {
-            'id': 'key=hudson',
-            'title': 'hudson',
-        },
-        'playlist_count': 22,
-    }, {
-        'url': 'https://www.cpac.ca/search?programId=50',
-        'info_dict': {
-            'id': 'programId=50',
-            'title': '50',
-        },
-        'playlist_count': 9,
-    }, {
-        'url': 'https://www.cpac.ca/emission?id=6',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.cpac.ca/rechercher?key=hudson&type=all&order=desc',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        url_lang = 'fr' if any(x in url for x in ('/emission?', '/rechercher?')) else 'en'
-        pl_type, list_type = ('program', 'itemList') if any(x in url for x in ('/program?', '/emission?')) else ('search', 'searchResult')
-        api_url = (
-            'https://www.cpac.ca/api/1/services/contentModel.json?url=/site/website/%s/index.xml&crafterSite=cpacca&%s'
-            % (pl_type, video_id, ))
-        content = self._download_json(api_url, video_id)
-        entries = []
-        total_pages = int_or_none(try_get(content, lambda x: x['page'][list_type]['totalPages']), default=1)
-        for page in range(1, total_pages + 1):
-            if page > 1:
-                api_url = update_url_query(api_url, {'page': '%d' % (page, ), })
-                content = self._download_json(
-                    api_url, video_id,
-                    note='Downloading continuation - %d' % (page, ),
-                    fatal=False)
-
-            for item in try_get(content, lambda x: x['page'][list_type]['item'], list) or []:
-                episode_url = urljoin(url, try_get(item, lambda x: x['url_%s_s' % (url_lang, )]))
-                if episode_url:
-                    entries.append(episode_url)
-
-        return self.playlist_result(
-            (self.url_result(entry) for entry in entries),
-            playlist_id=video_id,
-            playlist_title=try_get(content, lambda x: x['page']['program']['title_%s_t' % (url_lang, )]) or video_id.split('=')[-1],
-            playlist_description=try_get(content, lambda x: x['page']['program']['description_%s_t' % (url_lang, )]),
-        )

youtube_dl/extractor/curiositystream.py

@@ -25,12 +25,12 @@ class CuriosityStreamBaseIE(InfoExtractor):
             raise ExtractorError(
                 '%s said: %s' % (self.IE_NAME, error), expected=True)
 
-    def _call_api(self, path, video_id, query=None):
+    def _call_api(self, path, video_id):
         headers = {}
         if self._auth_token:
             headers['X-Auth-Token'] = self._auth_token
         result = self._download_json(
-            self._API_BASE_URL + path, video_id, headers=headers, query=query)
+            self._API_BASE_URL + path, video_id, headers=headers)
         self._handle_errors(result)
         return result['data']
 
@@ -52,75 +52,62 @@ class CuriosityStreamIE(CuriosityStreamBaseIE):
     _VALID_URL = r'https?://(?:app\.)?curiositystream\.com/video/(?P<id>\d+)'
     _TEST = {
         'url': 'https://app.curiositystream.com/video/2',
+        'md5': '262bb2f257ff301115f1973540de8983',
         'info_dict': {
             'id': '2',
             'ext': 'mp4',
             'title': 'How Did You Develop The Internet?',
             'description': 'Vint Cerf, Google\'s Chief Internet Evangelist, describes how he and Bob Kahn created the internet.',
-        },
+        }
-        'params': {
-            'format': 'bestvideo',
-            # m3u8 download
-            'skip_download': True,
-        },
     }
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
+        media = self._call_api('media/' + video_id, video_id)
+        title = media['title']
 
         formats = []
-        for encoding_format in ('m3u8', 'mpd'):
+        for encoding in media.get('encodings', []):
-            media = self._call_api('media/' + video_id, video_id, query={
+            m3u8_url = encoding.get('master_playlist_url')
-                'encodingsNew': 'true',
+            if m3u8_url:
-                'encodingsFormat': encoding_format,
+                formats.extend(self._extract_m3u8_formats(
-            })
+                    m3u8_url, video_id, 'mp4', 'm3u8_native',
-            for encoding in media.get('encodings', []):
+                    m3u8_id='hls', fatal=False))
-                playlist_url = encoding.get('master_playlist_url')
+            encoding_url = encoding.get('url')
-                if encoding_format == 'm3u8':
+            file_url = encoding.get('file_url')
-                    # use `m3u8` entry_protocol until EXT-X-MAP is properly supported by `m3u8_native` entry_protocol
+            if not encoding_url and not file_url:
-                    formats.extend(self._extract_m3u8_formats(
+                continue
-                        playlist_url, video_id, 'mp4',
+            f = {
-                        m3u8_id='hls', fatal=False))
+                'width': int_or_none(encoding.get('width')),
-                elif encoding_format == 'mpd':
+                'height': int_or_none(encoding.get('height')),
-                    formats.extend(self._extract_mpd_formats(
+                'vbr': int_or_none(encoding.get('video_bitrate')),
-                        playlist_url, video_id, mpd_id='dash', fatal=False))
+                'abr': int_or_none(encoding.get('audio_bitrate')),
-                encoding_url = encoding.get('url')
+                'filesize': int_or_none(encoding.get('size_in_bytes')),
-                file_url = encoding.get('file_url')
+                'vcodec': encoding.get('video_codec'),
-                if not encoding_url and not file_url:
+                'acodec': encoding.get('audio_codec'),
+                'container': encoding.get('container_type'),
+            }
+            for f_url in (encoding_url, file_url):
+                if not f_url:
                     continue
-                f = {
+                fmt = f.copy()
-                    'width': int_or_none(encoding.get('width')),
+                rtmp = re.search(r'^(?P<url>rtmpe?://(?P<host>[^/]+)/(?P<app>.+))/(?P<playpath>mp[34]:.+)$', f_url)
-                    'height': int_or_none(encoding.get('height')),
+                if rtmp:
-                    'vbr': int_or_none(encoding.get('video_bitrate')),
+                    fmt.update({
-                    'abr': int_or_none(encoding.get('audio_bitrate')),
+                        'url': rtmp.group('url'),
-                    'filesize': int_or_none(encoding.get('size_in_bytes')),
+                        'play_path': rtmp.group('playpath'),
-                    'vcodec': encoding.get('video_codec'),
+                        'app': rtmp.group('app'),
-                    'acodec': encoding.get('audio_codec'),
+                        'ext': 'flv',
-                    'container': encoding.get('container_type'),
+                        'format_id': 'rtmp',
-                }
+                    })
-                for f_url in (encoding_url, file_url):
+                else:
-                    if not f_url:
+                    fmt.update({
-                        continue
+                        'url': f_url,
-                    fmt = f.copy()
+                        'format_id': 'http',
-                    rtmp = re.search(r'^(?P<url>rtmpe?://(?P<host>[^/]+)/(?P<app>.+))/(?P<playpath>mp[34]:.+)$', f_url)
+                    })
-                    if rtmp:
+                formats.append(fmt)
-                        fmt.update({
-                            'url': rtmp.group('url'),
-                            'play_path': rtmp.group('playpath'),
-                            'app': rtmp.group('app'),
-                            'ext': 'flv',
-                            'format_id': 'rtmp',
-                        })
-                    else:
-                        fmt.update({
-                            'url': f_url,
-                            'format_id': 'http',
-                        })
-                    formats.append(fmt)
         self._sort_formats(formats)
 
-        title = media['title']
-
         subtitles = {}
         for closed_caption in media.get('closed_captions', []):
             sub_url = closed_caption.get('file')
@@ -145,7 +132,7 @@ class CuriosityStreamIE(CuriosityStreamBaseIE):
 
 class CuriosityStreamCollectionIE(CuriosityStreamBaseIE):
     IE_NAME = 'curiositystream:collection'
-    _VALID_URL = r'https?://(?:app\.)?curiositystream\.com/(?:collections?|series)/(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:app\.)?curiositystream\.com/(?:collection|series)/(?P<id>\d+)'
     _TESTS = [{
         'url': 'https://app.curiositystream.com/collection/2',
         'info_dict': {
@@ -153,13 +140,10 @@ class CuriosityStreamCollectionIE(CuriosityStreamBaseIE):
             'title': 'Curious Minds: The Internet',
             'description': 'How is the internet shaping our lives in the 21st Century?',
         },
-        'playlist_mincount': 16,
+        'playlist_mincount': 17,
     }, {
         'url': 'https://curiositystream.com/series/2',
         'only_matching': True,
-    }, {
-        'url': 'https://curiositystream.com/collections/36',
-        'only_matching': True,
     }]
 
     def _real_extract(self, url):

youtube_dl/extractor/dispeak.py

@@ -32,18 +32,6 @@ class DigitallySpeakingIE(InfoExtractor):
         # From http://www.gdcvault.com/play/1013700/Advanced-Material
         'url': 'http://sevt.dispeak.com/ubm/gdc/eur10/xml/11256_1282118587281VNIT.xml',
         'only_matching': True,
-    }, {
-        # From https://gdcvault.com/play/1016624, empty speakerVideo
-        'url': 'https://sevt.dispeak.com/ubm/gdc/online12/xml/201210-822101_1349794556671DDDD.xml',
-        'info_dict': {
-            'id': '201210-822101_1349794556671DDDD',
-            'ext': 'flv',
-            'title': 'Pre-launch - Preparing to Take the Plunge',
-        },
-    }, {
-        # From http://www.gdcvault.com/play/1014846/Conference-Keynote-Shigeru, empty slideVideo
-        'url': 'http://events.digitallyspeaking.com/gdc/project25/xml/p25-miyamoto1999_1282467389849HSVB.xml',
-        'only_matching': True,
     }]
 
     def _parse_mp4(self, metadata):
@@ -96,20 +84,26 @@ class DigitallySpeakingIE(InfoExtractor):
                 'vcodec': 'none',
                 'format_id': audio.get('code'),
             })
-        for video_key, format_id, preference in (
+        slide_video_path = xpath_text(metadata, './slideVideo', fatal=True)
-                ('slide', 'slides', -2), ('speaker', 'speaker', -1)):
+        formats.append({
-            video_path = xpath_text(metadata, './%sVideo' % video_key)
+            'url': 'rtmp://%s/ondemand?ovpfv=1.1' % akamai_url,
-            if not video_path:
+            'play_path': remove_end(slide_video_path, '.flv'),
-                continue
+            'ext': 'flv',
-            formats.append({
+            'format_note': 'slide deck video',
-                'url': 'rtmp://%s/ondemand?ovpfv=1.1' % akamai_url,
+            'quality': -2,
-                'play_path': remove_end(video_path, '.flv'),
+            'preference': -2,
-                'ext': 'flv',
+            'format_id': 'slides',
-                'format_note': '%s video' % video_key,
+        })
-                'quality': preference,
+        speaker_video_path = xpath_text(metadata, './speakerVideo', fatal=True)
-                'preference': preference,
+        formats.append({
-                'format_id': format_id,
+            'url': 'rtmp://%s/ondemand?ovpfv=1.1' % akamai_url,
-            })
+            'play_path': remove_end(speaker_video_path, '.flv'),
+            'ext': 'flv',
+            'format_note': 'speaker video',
+            'quality': -1,
+            'preference': -1,
+            'format_id': 'speaker',
+        })
         return formats
 
     def _real_extract(self, url):