[misc] Add hatch, ruff, pre-commit and improve dev docs (#7409)

Authored by: bashonly, seproDev, Grub4K

Co-authored-by: bashonly <88596187+bashonly@users.noreply.github.com>
Co-authored-by: sepro <4618135+seproDev@users.noreply.github.com>

.github/PULL_REQUEST_TEMPLATE.md

@@ -28,7 +28,6 @@ Fixes #
 ### Before submitting a *pull request* make sure you have:
 - [ ] At least skimmed through [contributing guidelines](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#developer-instructions) including [yt-dlp coding conventions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#yt-dlp-coding-conventions)
 - [ ] [Searched](https://github.com/yt-dlp/yt-dlp/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests
-- [ ] Checked the code with [flake8](https://pypi.python.org/pypi/flake8) and [ran relevant tests](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#developer-instructions)
 
 ### In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check all of the following options that apply:
 - [ ] I am the original author of this code and I am willing to release it under [Unlicense](http://unlicense.org/)

.github/workflows/core.yml

@@ -53,7 +53,7 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install test requirements
-      run: python3 ./devscripts/install_deps.py --include dev --include curl-cffi
+      run: python3 ./devscripts/install_deps.py --include test --include curl-cffi
     - name: Run tests
       continue-on-error: False
       run: |

.github/workflows/quick-test.yml

@@ -15,13 +15,13 @@ jobs:
       with:
         python-version: '3.8'
     - name: Install test requirements
-      run: python3 ./devscripts/install_deps.py --include dev
+      run: python3 ./devscripts/install_deps.py --include test
     - name: Run tests
       run: |
         python3 -m yt_dlp -v || true
         python3 ./devscripts/run_tests.py core
-  flake8:
-    name: Linter
+  check:
+    name: Code check
     if: "!contains(github.event.head_commit.message, 'ci skip all')"
     runs-on: ubuntu-latest
     steps:
@@ -29,9 +29,11 @@ jobs:
     - uses: actions/setup-python@v5
       with:
         python-version: '3.8'
-    - name: Install flake8
-      run: python3 ./devscripts/install_deps.py -o --include dev
+    - name: Install dev dependencies
+      run: python3 ./devscripts/install_deps.py -o --include static-analysis
     - name: Make lazy extractors
       run: python3 ./devscripts/make_lazy_extractors.py
-    - name: Run flake8
-      run: flake8 .
+    - name: Run ruff
+      run: ruff check --output-format github .
+    - name: Run autopep8
+      run: autopep8 --diff .

.gitignore

@@ -67,7 +67,7 @@ cookies
 # Python
 *.pyc
 *.pyo
-.pytest_cache
+.*_cache
 wine-py2exe/
 py2exe.log
 build/

.pre-commit-config.yaml

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

.pre-commit-hatch.yaml

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

CONTRIBUTING.md

@@ -134,18 +134,53 @@ We follow [youtube-dl's policy](https://github.com/ytdl-org/youtube-dl#can-you-a
 
 # DEVELOPER INSTRUCTIONS
 
-Most users do not need to build yt-dlp and can [download the builds](https://github.com/yt-dlp/yt-dlp/releases) or get them via [the other installation methods](README.md#installation).
+Most users do not need to build yt-dlp and can [download the builds](https://github.com/yt-dlp/yt-dlp/releases), get them via [the other installation methods](README.md#installation) or directly run it using `python -m yt_dlp`.
 
-To run yt-dlp as a developer, you don't need to build anything either. Simply execute
+`yt-dlp` uses [`hatch`](<https://hatch.pypa.io>) as a project management tool.
+You can easily install it using [`pipx`](<https://pipx.pypa.io>) via `pipx install hatch`, or else via `pip` or your package manager of choice. Make sure you are using at least version `1.10.0`, otherwise some functionality might not work as expected.
 
-    python3 -m yt_dlp
+If you plan on contributing to `yt-dlp`, best practice is to start by running the following command:
 
-To run all the available core tests, use:
+```shell
+$ hatch run setup
+```
 
-    python3 devscripts/run_tests.py
+The above command will install a `pre-commit` hook so that required checks/fixes (linting, formatting) will run automatically before each commit. If any code needs to be linted or formatted, then the commit will be blocked and the necessary changes will be made; you should review all edits and re-commit the fixed version.
+
+After this you can use `hatch shell` to enable a virtual environment that has `yt-dlp` and its development dependencies installed.
+
+In addition, the following script commands can be used to run simple tasks such as linting or testing (without having to run `hatch shell` first):
+* `hatch fmt`: Automatically fix linter violations and apply required code formatting changes
+    * See `hatch fmt --help` for more info
+* `hatch test`: Run extractor or core tests
+    * See `hatch test --help` for more info
 
 See item 6 of [new extractor tutorial](#adding-support-for-a-new-site) for how to run extractor specific test cases.
 
+While it is strongly recommended to use `hatch` for yt-dlp development, if you are unable to do so, alternatively you can manually create a virtual environment and use the following commands:
+
+```shell
+# To only install development dependencies:
+$ python -m devscripts.install_deps --include dev
+
+# Or, for an editable install plus dev dependencies:
+$ python -m pip install -e ".[default,dev]"
+
+# To setup the pre-commit hook:
+$ pre-commit install
+
+# To be used in place of `hatch test`:
+$ python -m devscripts.run_tests
+
+# To be used in place of `hatch fmt`:
+$ ruff check --fix .
+$ autopep8 --in-place .
+
+# To only check code instead of applying fixes:
+$ ruff check .
+$ autopep8 --diff .
+```
+
 If you want to create a build of yt-dlp yourself, you can follow the instructions [here](README.md#compile).
 
 
@@ -165,12 +200,16 @@ After you have ensured this site is distributing its content legally, you can fo
 1. [Fork this repository](https://github.com/yt-dlp/yt-dlp/fork)
 1. Check out the source code with:
 
-        git clone git@github.com:YOUR_GITHUB_USERNAME/yt-dlp.git
+    ```shell
+    $ git clone git@github.com:YOUR_GITHUB_USERNAME/yt-dlp.git
+    ```
 
 1. Start a new git branch with
 
-        cd yt-dlp
-        git checkout -b yourextractor
+    ```shell
+    $ cd yt-dlp
+    $ git checkout -b yourextractor
+    ```
 
 1. Start with this simple template and save it to `yt_dlp/extractor/yourextractor.py`:
 
@@ -217,21 +256,27 @@ After you have ensured this site is distributing its content legally, you can fo
                 # TODO more properties (see yt_dlp/extractor/common.py)
             }
     ```
-1. Add an import in [`yt_dlp/extractor/_extractors.py`](yt_dlp/extractor/_extractors.py). Note that the class name must end with `IE`.
-1. Run `python3 devscripts/run_tests.py YourExtractor`. This *may fail* at first, but you can continually re-run it until you're done. Upon failure, it will output the missing fields and/or correct values which you can copy. If you decide to add more than one test, the tests will then be named `YourExtractor`, `YourExtractor_1`, `YourExtractor_2`, etc. Note that tests with an `only_matching` key in the test's dict are not included in the count. You can also run all the tests in one go with `YourExtractor_all`
+1. Add an import in [`yt_dlp/extractor/_extractors.py`](yt_dlp/extractor/_extractors.py). Note that the class name must end with `IE`. Also note that when adding a parenthesized import group, the last import in the group must have a trailing comma in order for this formatting to be respected by our code formatter.
+1. Run `hatch test YourExtractor`. This *may fail* at first, but you can continually re-run it until you're done. Upon failure, it will output the missing fields and/or correct values which you can copy. If you decide to add more than one test, the tests will then be named `YourExtractor`, `YourExtractor_1`, `YourExtractor_2`, etc. Note that tests with an `only_matching` key in the test's dict are not included in the count. You can also run all the tests in one go with `YourExtractor_all`
 1. Make sure you have at least one test for your extractor. Even if all videos covered by the extractor are expected to be inaccessible for automated testing, tests should still be added with a `skip` parameter indicating why the particular test is disabled from running.
 1. Have a look at [`yt_dlp/extractor/common.py`](yt_dlp/extractor/common.py) for possible helper methods and a [detailed description of what your extractor should and may return](yt_dlp/extractor/common.py#L119-L440). Add tests and code for as many as you want.
-1. Make sure your code follows [yt-dlp coding conventions](#yt-dlp-coding-conventions) and check the code with [flake8](https://flake8.pycqa.org/en/latest/index.html#quickstart):
+1. Make sure your code follows [yt-dlp coding conventions](#yt-dlp-coding-conventions), passes [ruff](https://docs.astral.sh/ruff/tutorial/#getting-started) code checks and is properly formatted:
 
-        $ flake8 yt_dlp/extractor/yourextractor.py
+    ```shell
+    $ hatch fmt --check
+    ```
+
+    You can use `hatch fmt` to automatically fix problems.
 
 1. Make sure your code works under all [Python](https://www.python.org/) versions supported by yt-dlp, namely CPython and PyPy for Python 3.8 and above. Backward compatibility is not required for even older versions of Python.
 1. When the tests pass, [add](https://git-scm.com/docs/git-add) the new files, [commit](https://git-scm.com/docs/git-commit) them and [push](https://git-scm.com/docs/git-push) the result, like this:
 
+    ```shell
     $ git add yt_dlp/extractor/_extractors.py
     $ git add yt_dlp/extractor/yourextractor.py
     $ git commit -m '[yourextractor] Add extractor'
     $ git push origin yourextractor
+    ```
 
 1. Finally, [create a pull request](https://help.github.com/articles/creating-a-pull-request). We'll then review and merge it.
 

Makefile

@@ -27,7 +27,7 @@ clean-dist:
 	yt_dlp/extractor/lazy_extractors.py *.spec CONTRIBUTING.md.tmp yt-dlp yt-dlp.exe yt_dlp.egg-info/ AUTHORS
 clean-cache:
 	find . \( \
-		-type d -name .pytest_cache -o -type d -name __pycache__ -o -name "*.pyc" -o -name "*.class" \
+		-type d -name ".*_cache" -o -type d -name __pycache__ -o -name "*.pyc" -o -name "*.class" \
 	\) -prune -exec rm -rf {} \;
 
 completion-bash: completions/bash/yt-dlp
@@ -70,7 +70,8 @@ uninstall:
 	rm -f $(DESTDIR)$(SHAREDIR)/fish/vendor_completions.d/yt-dlp.fish
 
 codetest:
-	flake8 .
+	ruff check .
+	autopep8 --diff .
 
 test:
 	$(PYTHON) -m pytest
@@ -151,7 +152,7 @@ yt-dlp.tar.gz: all
 		--exclude '*.pyo' \
 		--exclude '*~' \
 		--exclude '__pycache__' \
-		--exclude '.pytest_cache' \
+		--exclude '.*_cache' \
 		--exclude '.git' \
 		-- \
 		README.md supportedsites.md Changelog.md LICENSE \

devscripts/install_deps.py

@@ -42,17 +42,25 @@ def parse_args():
 def main():
     args = parse_args()
     project_table = parse_toml(read_file(args.input))['project']
+    recursive_pattern = re.compile(rf'{project_table["name"]}\[(?P<group_name>[\w-]+)\]')
     optional_groups = project_table['optional-dependencies']
     excludes = args.exclude or []
 
+    def yield_deps(group):
+        for dep in group:
+            if mobj := recursive_pattern.fullmatch(dep):
+                yield from optional_groups.get(mobj.group('group_name'), [])
+            else:
+                yield dep
+
     targets = []
     if not args.only_optional:  # `-o` should exclude 'dependencies' and the 'default' group
         targets.extend(project_table['dependencies'])
         if 'default' not in excludes:  # `--exclude default` should exclude entire 'default' group
-            targets.extend(optional_groups['default'])
+            targets.extend(yield_deps(optional_groups['default']))
 
     for include in filter(None, map(optional_groups.get, args.include or [])):
-        targets.extend(include)
+        targets.extend(yield_deps(include))
 
     targets = [t for t in targets if re.match(r'[\w-]+', t).group(0).lower() not in excludes]
 

devscripts/run_tests.py

@@ -4,6 +4,7 @@ import argparse
 import functools
 import os
 import re
+import shlex
 import subprocess
 import sys
 from pathlib import Path
@@ -18,6 +19,8 @@ def parse_args():
         'test', help='a extractor tests, or one of "core" or "download"', nargs='*')
     parser.add_argument(
         '-k', help='run a test matching EXPRESSION. Same as "pytest -k"', metavar='EXPRESSION')
+    parser.add_argument(
+        '--pytest-args', help='arguments to passthrough to pytest')
     return parser.parse_args()
 
 
@@ -26,15 +29,16 @@ def run_tests(*tests, pattern=None, ci=False):
     run_download = 'download' in tests
     tests = list(map(fix_test_name, tests))
 
-    arguments = ['pytest', '-Werror', '--tb=short']
+    pytest_args = args.pytest_args or os.getenv('HATCH_TEST_ARGS', '')
+    arguments = ['pytest', '-Werror', '--tb=short', *shlex.split(pytest_args)]
     if ci:
         arguments.append('--color=yes')
+    if pattern:
+        arguments.extend(['-k', pattern])
     if run_core:
         arguments.extend(['-m', 'not download'])
     elif run_download:
         arguments.extend(['-m', 'download'])
-    elif pattern:
-        arguments.extend(['-k', pattern])
     else:
         arguments.extend(
             f'test/test_download.py::TestDownload::test_{test}' for test in tests)
@@ -46,13 +50,13 @@ def run_tests(*tests, pattern=None, ci=False):
         pass
 
     arguments = [sys.executable, '-Werror', '-m', 'unittest']
+    if pattern:
+        arguments.extend(['-k', pattern])
     if run_core:
         print('"pytest" needs to be installed to run core tests', file=sys.stderr, flush=True)
         return 1
     elif run_download:
         arguments.append('test.test_download')
-    elif pattern:
-        arguments.extend(['-k', pattern])
     else:
         arguments.extend(
             f'test.test_download.TestDownload.test_{test}' for test in tests)

pyproject.toml

@@ -66,9 +66,16 @@ build = [
     "wheel",
 ]
 dev = [
-    "flake8",
-    "isort",
-    "pytest",
+    "pre-commit",
+    "yt-dlp[static-analysis]",
+    "yt-dlp[test]",
+]
+static-analysis = [
+    "autopep8~=2.0",
+    "ruff~=0.4.4",
+]
+test = [
+    "pytest~=8.1",
 ]
 pyinstaller = [
     "pyinstaller>=6.3; sys_platform!='darwin'",
@@ -126,3 +133,146 @@ artifacts = ["/yt_dlp/extractor/lazy_extractors.py"]
 [tool.hatch.version]
 path = "yt_dlp/version.py"
 pattern = "_pkg_version = '(?P<version>[^']+)'"
+
+[tool.hatch.envs.default]
+features = ["curl-cffi", "default"]
+dependencies = ["pre-commit"]
+path = ".venv"
+installer = "uv"
+
+[tool.hatch.envs.default.scripts]
+setup = "pre-commit install --config .pre-commit-hatch.yaml"
+yt-dlp = "python -Werror -Xdev -m yt_dlp {args}"
+
+[tool.hatch.envs.hatch-static-analysis]
+detached = true
+features = ["static-analysis"]
+dependencies = []  # override hatch ruff version
+config-path = "pyproject.toml"
+
+[tool.hatch.envs.hatch-static-analysis.scripts]
+format-check = "autopep8 --diff {args:.}"
+format-fix = "autopep8 --in-place {args:.}"
+lint-check = "ruff check {args:.}"
+lint-fix = "ruff check --fix {args:.}"
+
+[tool.hatch.envs.hatch-test]
+features = ["test"]
+dependencies = [
+    "pytest-randomly~=3.15",
+    "pytest-rerunfailures~=14.0",
+    "pytest-xdist[psutil]~=3.5",
+]
+
+[tool.hatch.envs.hatch-test.scripts]
+run = "python -m devscripts.run_tests {args}"
+run-cov = "echo Code coverage not implemented && exit 1"
+
+[[tool.hatch.envs.hatch-test.matrix]]
+python = [
+    "3.8",
+    "3.9",
+    "3.10",
+    "3.11",
+    "3.12",
+    "pypy3.8",
+    "pypy3.9",
+    "pypy3.10",
+]
+
+[tool.ruff]
+line-length = 120
+
+[tool.ruff.lint]
+ignore = [
+    "E402",  # module level import not at top of file
+    "E501",  # line too long
+    "E731",  # do not assign a lambda expression, use a def
+    "E741",  # ambiguous variable name
+]
+select = [
+    "E",  # pycodestyle errors
+    "W",  # pycodestyle warnings
+    "F",  # pyflakes
+    "I",  # import order
+]
+
+[tool.ruff.lint.per-file-ignores]
+"devscripts/lazy_load_template.py" = ["F401"]
+"!yt_dlp/extractor/**.py" = ["I"]
+
+[tool.ruff.lint.isort]
+known-first-party = [
+    "bundle",
+    "devscripts",
+    "test",
+]
+relative-imports-order = "closest-to-furthest"
+
+[tool.autopep8]
+max_line_length = 120
+recursive = true
+exit-code = true
+jobs = 0
+select = [
+    "E101",
+    "E112",
+    "E113",
+    "E115",
+    "E116",
+    "E117",
+    "E121",
+    "E122",
+    "E123",
+    "E124",
+    "E125",
+    "E126",
+    "E127",
+    "E128",
+    "E129",
+    "E131",
+    "E201",
+    "E202",
+    "E203",
+    "E211",
+    "E221",
+    "E222",
+    "E223",
+    "E224",
+    "E225",
+    "E226",
+    "E227",
+    "E228",
+    "E231",
+    "E241",
+    "E242",
+    "E251",
+    "E252",
+    "E261",
+    "E262",
+    "E265",
+    "E266",
+    "E271",
+    "E272",
+    "E273",
+    "E274",
+    "E275",
+    "E301",
+    "E302",
+    "E303",
+    "E304",
+    "E305",
+    "E306",
+    "E502",
+    "E701",
+    "E702",
+    "E704",
+    "W391",
+    "W504",
+]
+
+[tool.pytest.ini_options]
+addopts = "-ra -v --strict-markers"
+markers = [
+    "download",
+]

setup.cfg

@@ -14,12 +14,6 @@ remove-duplicate-keys = true
 remove-unused-variables = true
 
 
-[tool:pytest]
-addopts = -ra -v --strict-markers
-markers =
-    download
-
-
 [tox:tox]
 skipsdist = true
 envlist = py{38,39,310,311,312},pypy{38,39,310}

test/test_http_proxy.py

@@ -93,6 +93,7 @@ if urllib3:
 
         This allows us to chain multiple TLS connections.
         """
+
         def __init__(self, socket, ssl_context, server_hostname=None, suppress_ragged_eofs=True, server_side=False):
             self.incoming = ssl.MemoryBIO()
             self.outgoing = ssl.MemoryBIO()

yt_dlp/extractor/_extractors.py

@@ -1,4 +1,5 @@
 # flake8: noqa: F401
+# isort: off
 
 from .youtube import (  # Youtube is moved to the top to improve performance
     YoutubeIE,
@@ -24,6 +25,8 @@ from .youtube import (  # Youtube is moved to the top to improve performance
     YoutubeConsentRedirectIE,
 )
 
+# isort: on
+
 from .abc import (
     ABCIE,
     ABCIViewIE,
@@ -43,27 +46,33 @@ from .abematv import (
 )
 from .academicearth import AcademicEarthCourseIE
 from .acast import (
-    ACastIE,
     ACastChannelIE,
+    ACastIE,
+)
+from .acfun import (
+    AcFunBangumiIE,
+    AcFunVideoIE,
+)
+from .adn import (
+    ADNIE,
+    ADNSeasonIE,
 )
-from .acfun import AcFunVideoIE, AcFunBangumiIE
-from .adn import ADNIE, ADNSeasonIE
 from .adobeconnect import AdobeConnectIE
 from .adobetv import (
+    AdobeTVChannelIE,
     AdobeTVEmbedIE,
     AdobeTVIE,
     AdobeTVShowIE,
-    AdobeTVChannelIE,
     AdobeTVVideoIE,
 )
 from .adultswim import AdultSwimIE
 from .aenetworks import (
-    AENetworksIE,
     AENetworksCollectionIE,
+    AENetworksIE,
     AENetworksShowIE,
-    HistoryTopicIE,
-    HistoryPlayerIE,
     BiographyIE,
+    HistoryPlayerIE,
+    HistoryTopicIE,
 )
 from .aeonco import AeonCoIE
 from .afreecatv import (
@@ -79,77 +88,85 @@ from .agora import (
 )
 from .airtv import AirTVIE
 from .aitube import AitubeKZVideoIE
+from .aliexpress import AliExpressLiveIE
 from .aljazeera import AlJazeeraIE
+from .allocine import AllocineIE
 from .allstar import (
     AllstarIE,
     AllstarProfileIE,
 )
 from .alphaporno import AlphaPornoIE
+from .alsace20tv import (
+    Alsace20TVEmbedIE,
+    Alsace20TVIE,
+)
 from .altcensored import (
-    AltCensoredIE,
     AltCensoredChannelIE,
+    AltCensoredIE,
 )
 from .alura import (
+    AluraCourseIE,
     AluraIE,
-    AluraCourseIE
 )
 from .amadeustv import AmadeusTVIE
 from .amara import AmaraIE
-from .amcnetworks import AMCNetworksIE
 from .amazon import (
-    AmazonStoreIE,
     AmazonReviewsIE,
+    AmazonStoreIE,
 )
 from .amazonminitv import (
     AmazonMiniTVIE,
     AmazonMiniTVSeasonIE,
     AmazonMiniTVSeriesIE,
 )
+from .amcnetworks import AMCNetworksIE
 from .americastestkitchen import (
     AmericasTestKitchenIE,
     AmericasTestKitchenSeasonIE,
 )
 from .anchorfm import AnchorFMEpisodeIE
 from .angel import AngelIE
+from .antenna import (
+    Ant1NewsGrArticleIE,
+    Ant1NewsGrEmbedIE,
+    AntennaGrWatchIE,
+)
 from .anvato import AnvatoIE
 from .aol import AolIE
-from .allocine import AllocineIE
-from .aliexpress import AliExpressLiveIE
-from .alsace20tv import (
-    Alsace20TVIE,
-    Alsace20TVEmbedIE,
-)
 from .apa import APAIE
 from .aparat import AparatIE
 from .appleconnect import AppleConnectIE
+from .applepodcasts import ApplePodcastsIE
 from .appletrailers import (
     AppleTrailersIE,
     AppleTrailersSectionIE,
 )
-from .applepodcasts import ApplePodcastsIE
 from .archiveorg import (
     ArchiveOrgIE,
     YoutubeWebArchiveIE,
 )
 from .arcpublishing import ArcPublishingIE
-from .arkena import ArkenaIE
 from .ard import (
+    ARDIE,
     ARDBetaMediathekIE,
     ARDMediathekCollectionIE,
-    ARDIE,
 )
+from .arkena import ArkenaIE
+from .arnes import ArnesIE
 from .art19 import (
     Art19IE,
     Art19ShowIE,
 )
 from .arte import (
-    ArteTVIE,
-    ArteTVEmbedIE,
-    ArteTVPlaylistIE,
     ArteTVCategoryIE,
+    ArteTVEmbedIE,
+    ArteTVIE,
+    ArteTVPlaylistIE,
+)
+from .asobichannel import (
+    AsobiChannelIE,
+    AsobiChannelTagURLIE,
 )
-from .arnes import ArnesIE
-from .asobichannel import AsobiChannelIE, AsobiChannelTagURLIE
 from .asobistage import AsobiStageIE
 from .atresplayer import AtresPlayerIE
 from .atscaleconf import AtScaleConfEventIE
@@ -160,57 +177,60 @@ from .audiodraft import (
     AudiodraftCustomIE,
     AudiodraftGenericIE,
 )
-from .audiomack import AudiomackIE, AudiomackAlbumIE
+from .audiomack import (
+    AudiomackAlbumIE,
+    AudiomackIE,
+)
 from .audius import (
     AudiusIE,
-    AudiusTrackIE,
     AudiusPlaylistIE,
     AudiusProfileIE,
+    AudiusTrackIE,
 )
 from .awaan import (
     AWAANIE,
-    AWAANVideoIE,
     AWAANLiveIE,
     AWAANSeasonIE,
+    AWAANVideoIE,
 )
 from .axs import AxsIE
 from .azmedien import AZMedienIE
 from .baidu import BaiduVideoIE
 from .banbye import (
-    BanByeIE,
     BanByeChannelIE,
+    BanByeIE,
 )
 from .bandaichannel import BandaiChannelIE
 from .bandcamp import (
-    BandcampIE,
     BandcampAlbumIE,
-    BandcampWeeklyIE,
+    BandcampIE,
     BandcampUserIE,
+    BandcampWeeklyIE,
 )
 from .bannedvideo import BannedVideoIE
 from .bbc import (
-    BBCCoUkIE,
+    BBCIE,
     BBCCoUkArticleIE,
+    BBCCoUkIE,
     BBCCoUkIPlayerEpisodesIE,
     BBCCoUkIPlayerGroupIE,
     BBCCoUkPlaylistIE,
-    BBCIE,
 )
+from .beatbump import (
+    BeatBumpPlaylistIE,
+    BeatBumpVideoIE,
+)
+from .beatport import BeatportIE
 from .beeg import BeegIE
 from .behindkink import BehindKinkIE
 from .bellmedia import BellMediaIE
-from .beatbump import (
-    BeatBumpVideoIE,
-    BeatBumpPlaylistIE,
-)
-from .beatport import BeatportIE
 from .berufetv import BerufeTVIE
 from .bet import BetIE
 from .bfi import BFIPlayerIE
 from .bfmtv import (
     BFMTVIE,
-    BFMTVLiveIE,
     BFMTVArticleIE,
+    BFMTVLiveIE,
 )
 from .bibeltv import (
     BibelTVLiveIE,
@@ -221,37 +241,37 @@ from .bigflix import BigflixIE
 from .bigo import BigoIE
 from .bild import BildIE
 from .bilibili import (
-    BiliBiliIE,
+    BilibiliAudioAlbumIE,
+    BilibiliAudioIE,
     BiliBiliBangumiIE,
-    BiliBiliBangumiSeasonIE,
     BiliBiliBangumiMediaIE,
+    BiliBiliBangumiSeasonIE,
+    BilibiliCategoryIE,
     BilibiliCheeseIE,
     BilibiliCheeseSeasonIE,
-    BiliBiliSearchIE,
-    BilibiliCategoryIE,
-    BilibiliAudioIE,
-    BilibiliAudioAlbumIE,
-    BiliBiliPlayerIE,
-    BilibiliSpaceVideoIE,
-    BilibiliSpaceAudioIE,
     BilibiliCollectionListIE,
-    BilibiliSeriesListIE,
     BilibiliFavoritesListIE,
-    BilibiliWatchlaterIE,
+    BiliBiliIE,
+    BiliBiliPlayerIE,
     BilibiliPlaylistIE,
+    BiliBiliSearchIE,
+    BilibiliSeriesListIE,
+    BilibiliSpaceAudioIE,
+    BilibiliSpaceVideoIE,
+    BilibiliWatchlaterIE,
     BiliIntlIE,
     BiliIntlSeriesIE,
     BiliLiveIE,
 )
 from .biobiochiletv import BioBioChileTVIE
 from .bitchute import (
-    BitChuteIE,
     BitChuteChannelIE,
+    BitChuteIE,
 )
 from .blackboardcollaborate import BlackboardCollaborateIE
 from .bleacherreport import (
-    BleacherReportIE,
     BleacherReportCMSIE,
+    BleacherReportIE,
 )
 from .blerp import BlerpIE
 from .blogger import BloggerIE
@@ -264,27 +284,27 @@ from .box import BoxIE
 from .boxcast import BoxCastVideoIE
 from .bpb import BpbIE
 from .br import BRIE
-from .bravotv import BravoTVIE
 from .brainpop import (
-    BrainPOPIE,
-    BrainPOPJrIE,
     BrainPOPELLIE,
     BrainPOPEspIE,
     BrainPOPFrIE,
+    BrainPOPIE,
     BrainPOPIlIE,
+    BrainPOPJrIE,
 )
+from .bravotv import BravoTVIE
 from .breitbart import BreitBartIE
 from .brightcove import (
     BrightcoveLegacyIE,
     BrightcoveNewIE,
 )
 from .brilliantpala import (
-    BrilliantpalaElearnIE,
     BrilliantpalaClassesIE,
+    BrilliantpalaElearnIE,
 )
-from .businessinsider import BusinessInsiderIE
 from .bundesliga import BundesligaIE
 from .bundestag import BundestagIE
+from .businessinsider import BusinessInsiderIE
 from .buzzfeed import BuzzFeedIE
 from .byutv import BYUtvIE
 from .c56 import C56IE
@@ -292,40 +312,40 @@ from .callin import CallinIE
 from .caltrans import CaltransIE
 from .cam4 import CAM4IE
 from .camdemy import (
+    CamdemyFolderIE,
     CamdemyIE,
-    CamdemyFolderIE
 )
 from .camfm import (
     CamFMEpisodeIE,
-    CamFMShowIE
+    CamFMShowIE,
 )
 from .cammodels import CamModelsIE
 from .camsoda import CamsodaIE
 from .camtasia import CamtasiaEmbedIE
 from .canal1 import Canal1IE
 from .canalalpha import CanalAlphaIE
-from .canalplus import CanalplusIE
 from .canalc2 import Canalc2IE
+from .canalplus import CanalplusIE
 from .caracoltv import CaracolTvPlayIE
 from .cartoonnetwork import CartoonNetworkIE
 from .cbc import (
     CBCIE,
+    CBCGemIE,
+    CBCGemLiveIE,
+    CBCGemPlaylistIE,
     CBCPlayerIE,
     CBCPlayerPlaylistIE,
-    CBCGemIE,
-    CBCGemPlaylistIE,
-    CBCGemLiveIE,
 )
 from .cbs import (
     CBSIE,
     ParamountPressExpressIE,
 )
 from .cbsnews import (
+    CBSLocalArticleIE,
+    CBSLocalIE,
+    CBSLocalLiveIE,
     CBSNewsEmbedIE,
     CBSNewsIE,
-    CBSLocalIE,
-    CBSLocalArticleIE,
-    CBSLocalLiveIE,
     CBSNewsLiveIE,
     CBSNewsLiveVideoIE,
 )
@@ -354,12 +374,12 @@ from .chzzk import (
 from .cinemax import CinemaxIE
 from .cinetecamilano import CinetecaMilanoIE
 from .cineverse import (
-    CineverseIE,
     CineverseDetailsIE,
+    CineverseIE,
 )
 from .ciscolive import (
-    CiscoLiveSessionIE,
     CiscoLiveSearchIE,
+    CiscoLiveSessionIE,
 )
 from .ciscowebex import CiscoWebexIE
 from .cjsw import CJSWIE
@@ -372,16 +392,13 @@ from .cloudycdn import CloudyCDNIE
 from .clubic import ClubicIE
 from .clyp import ClypIE
 from .cmt import CMTIE
-from .cnbc import (
-    CNBCVideoIE,
-)
+from .cnbc import CNBCVideoIE
 from .cnn import (
     CNNIE,
-    CNNBlogsIE,
     CNNArticleIE,
+    CNNBlogsIE,
     CNNIndonesiaIE,
 )
-from .coub import CoubIE
 from .comedycentral import (
     ComedyCentralIE,
     ComedyCentralTVIE,
@@ -399,44 +416,48 @@ from .commonprotocols import (
 from .condenast import CondeNastIE
 from .contv import CONtvIE
 from .corus import CorusIE
+from .coub import CoubIE
+from .cozytv import CozyTVIE
 from .cpac import (
     CPACIE,
     CPACPlaylistIE,
 )
-from .cozytv import CozyTVIE
 from .cracked import CrackedIE
 from .crackle import CrackleIE
 from .craftsy import CraftsyIE
 from .crooksandliars import CrooksAndLiarsIE
 from .crowdbunker import (
-    CrowdBunkerIE,
     CrowdBunkerChannelIE,
+    CrowdBunkerIE,
 )
 from .crtvg import CrtvgIE
 from .crunchyroll import (
+    CrunchyrollArtistIE,
     CrunchyrollBetaIE,
     CrunchyrollBetaShowIE,
     CrunchyrollMusicIE,
-    CrunchyrollArtistIE,
 )
-from .cspan import CSpanIE, CSpanCongressIE
+from .cspan import (
+    CSpanCongressIE,
+    CSpanIE,
+)
 from .ctsnews import CtsNewsIE
 from .ctv import CTVIE
 from .ctvnews import CTVNewsIE
 from .cultureunplugged import CultureUnpluggedIE
 from .curiositystream import (
-    CuriosityStreamIE,
     CuriosityStreamCollectionsIE,
+    CuriosityStreamIE,
     CuriosityStreamSeriesIE,
 )
 from .cwtv import CWTVIE
 from .cybrary import (
+    CybraryCourseIE,
     CybraryIE,
-    CybraryCourseIE
 )
 from .dacast import (
-    DacastVODIE,
     DacastPlaylistIE,
+    DacastVODIE,
 )
 from .dailymail import DailyMailIE
 from .dailymotion import (
@@ -458,8 +479,8 @@ from .dangalplay import (
     DangalPlaySeasonIE,
 )
 from .daum import (
-    DaumIE,
     DaumClipIE,
+    DaumIE,
     DaumPlaylistIE,
     DaumUserIE,
 )
@@ -467,49 +488,69 @@ from .daystar import DaystarClipIE
 from .dbtv import DBTVIE
 from .dctp import DctpTvIE
 from .deezer import (
-    DeezerPlaylistIE,
     DeezerAlbumIE,
+    DeezerPlaylistIE,
 )
 from .democracynow import DemocracynowIE
 from .detik import DetikEmbedIE
+from .deuxm import (
+    DeuxMIE,
+    DeuxMNewsIE,
+)
+from .dfb import DFBIE
+from .dhm import DHMIE
+from .digitalconcerthall import DigitalConcertHallIE
+from .digiteka import DigitekaIE
+from .discogs import DiscogsReleasePlaylistIE
+from .discovery import DiscoveryIE
+from .disney import DisneyIE
+from .dispeak import DigitallySpeakingIE
 from .dlf import (
     DLFIE,
     DLFCorpusIE,
 )
-from .dfb import DFBIE
-from .dhm import DHMIE
+from .dlive import (
+    DLiveStreamIE,
+    DLiveVODIE,
+)
 from .douyutv import (
     DouyuShowIE,
     DouyuTVIE,
 )
 from .dplay import (
-    DPlayIE,
-    DiscoveryPlusIE,
-    HGTVDeIE,
-    GoDiscoveryIE,
-    TravelChannelIE,
-    CookingChannelIE,
-    HGTVUsaIE,
-    FoodNetworkIE,
-    InvestigationDiscoveryIE,
-    DestinationAmericaIE,
-    AmHistoryChannelIE,
-    ScienceChannelIE,
-    DIYNetworkIE,
-    DiscoveryLifeIE,
-    AnimalPlanetIE,
     TLCIE,
-    MotorTrendIE,
-    MotorTrendOnDemandIE,
-    DiscoveryPlusIndiaIE,
+    AmHistoryChannelIE,
+    AnimalPlanetIE,
+    CookingChannelIE,
+    DestinationAmericaIE,
+    DiscoveryLifeIE,
     DiscoveryNetworksDeIE,
+    DiscoveryPlusIE,
+    DiscoveryPlusIndiaIE,
+    DiscoveryPlusIndiaShowIE,
     DiscoveryPlusItalyIE,
     DiscoveryPlusItalyShowIE,
-    DiscoveryPlusIndiaShowIE,
+    DIYNetworkIE,
+    DPlayIE,
+    FoodNetworkIE,
     GlobalCyclingNetworkPlusIE,
+    GoDiscoveryIE,
+    HGTVDeIE,
+    HGTVUsaIE,
+    InvestigationDiscoveryIE,
+    MotorTrendIE,
+    MotorTrendOnDemandIE,
+    ScienceChannelIE,
+    TravelChannelIE,
 )
-from .dreisat import DreiSatIE
 from .drbonanza import DRBonanzaIE
+from .dreisat import DreiSatIE
+from .drooble import DroobleIE
+from .dropbox import DropboxIE
+from .dropout import (
+    DropoutIE,
+    DropoutSeasonIE,
+)
 from .drtuber import DrTuberIE
 from .drtv import (
     DRTVIE,
@@ -518,32 +559,21 @@ from .drtv import (
     DRTVSeriesIE,
 )
 from .dtube import DTubeIE
-from .dvtv import DVTVIE
 from .duboku import (
     DubokuIE,
-    DubokuPlaylistIE
+    DubokuPlaylistIE,
 )
 from .dumpert import DumpertIE
-from .deuxm import (
-    DeuxMIE,
-    DeuxMNewsIE
-)
-from .digitalconcerthall import DigitalConcertHallIE
-from .discogs import DiscogsReleasePlaylistIE
-from .discovery import DiscoveryIE
-from .disney import DisneyIE
-from .dispeak import DigitallySpeakingIE
-from .dropbox import DropboxIE
-from .dropout import (
-    DropoutSeasonIE,
-    DropoutIE
-)
 from .duoplay import DuoplayIE
+from .dvtv import DVTVIE
 from .dw import (
     DWIE,
     DWArticleIE,
 )
-from .eagleplatform import EaglePlatformIE, ClipYouEmbedIE
+from .eagleplatform import (
+    ClipYouEmbedIE,
+    EaglePlatformIE,
+)
 from .ebaumsworld import EbaumsWorldIE
 from .ebay import EbayIE
 from .egghead import (
@@ -567,8 +597,8 @@ from .epoch import EpochIE
 from .eporner import EpornerIE
 from .erocast import ErocastIE
 from .eroprofile import (
-    EroProfileIE,
     EroProfileAlbumIE,
+    EroProfileIE,
 )
 from .err import ERRJupiterIE
 from .ertgr import (
@@ -578,31 +608,33 @@ from .ertgr import (
 )
 from .espn import (
     ESPNIE,
-    WatchESPNIE,
     ESPNArticleIE,
-    FiveThirtyEightIE,
     ESPNCricInfoIE,
+    FiveThirtyEightIE,
+    WatchESPNIE,
 )
 from .ettutv import EttuTvIE
-from .europa import EuropaIE, EuroParlWebstreamIE
+from .europa import (
+    EuropaIE,
+    EuroParlWebstreamIE,
+)
 from .europeantour import EuropeanTourIE
 from .eurosport import EurosportIE
 from .euscreen import EUScreenIE
 from .expressen import ExpressenIE
 from .eyedotv import EyedoTVIE
 from .facebook import (
+    FacebookAdsIE,
     FacebookIE,
     FacebookPluginsVideoIE,
     FacebookRedirectURLIE,
     FacebookReelIE,
-    FacebookAdsIE,
+)
+from .fancode import (
+    FancodeLiveIE,
+    FancodeVodIE,
 )
 from .fathom import FathomIE
-from .fancode import (
-    FancodeVodIE,
-    FancodeLiveIE
-)
-
 from .faz import FazIE
 from .fc2 import (
     FC2IE,
@@ -612,8 +644,8 @@ from .fc2 import (
 from .fczenit import FczenitIE
 from .fifa import FifaIE
 from .filmon import (
-    FilmOnIE,
     FilmOnChannelIE,
+    FilmOnIE,
 )
 from .filmweb import FilmwebIE
 from .firsttv import FirstTVIE
@@ -621,17 +653,17 @@ from .fivetv import FiveTVIE
 from .flextv import FlexTVIE
 from .flickr import FlickrIE
 from .floatplane import (
-    FloatplaneIE,
     FloatplaneChannelIE,
+    FloatplaneIE,
 )
 from .folketinget import FolketingetIE
 from .footyroom import FootyRoomIE
 from .formula1 import Formula1IE
 from .fourtube import (
     FourTubeIE,
-    PornTubeIE,
-    PornerBrosIE,
     FuxIE,
+    PornerBrosIE,
+    PornTubeIE,
 )
 from .fox import FOXIE
 from .fox9 import (
@@ -639,8 +671,8 @@ from .fox9 import (
     FOX9NewsIE,
 )
 from .foxnews import (
-    FoxNewsIE,
     FoxNewsArticleIE,
+    FoxNewsIE,
     FoxNewsVideoIE,
 )
 from .foxsports import FoxSportsIE
@@ -648,20 +680,20 @@ from .fptplay import FptplayIE
 from .franceinter import FranceInterIE
 from .francetv import (
     FranceTVIE,
-    FranceTVSiteIE,
     FranceTVInfoIE,
+    FranceTVSiteIE,
 )
 from .freesound import FreesoundIE
 from .freespeech import FreespeechIE
-from .frontendmasters import (
-    FrontendMastersIE,
-    FrontendMastersLessonIE,
-    FrontendMastersCourseIE
-)
 from .freetv import (
     FreeTvIE,
     FreeTvMoviesIE,
 )
+from .frontendmasters import (
+    FrontendMastersCourseIE,
+    FrontendMastersIE,
+    FrontendMastersLessonIE,
+)
 from .fujitv import FujiTVFODPlus7IE
 from .funimation import (
     FunimationIE,
@@ -672,17 +704,17 @@ from .funk import FunkIE
 from .funker530 import Funker530IE
 from .fuyintv import FuyinTVIE
 from .gab import (
-    GabTVIE,
     GabIE,
+    GabTVIE,
 )
 from .gaia import GaiaIE
 from .gamejolt import (
-    GameJoltIE,
-    GameJoltUserIE,
+    GameJoltCommunityIE,
     GameJoltGameIE,
     GameJoltGameSoundtrackIE,
-    GameJoltCommunityIE,
+    GameJoltIE,
     GameJoltSearchIE,
+    GameJoltUserIE,
 )
 from .gamespot import GameSpotIE
 from .gamestar import GameStarIE
@@ -691,13 +723,17 @@ from .gazeta import GazetaIE
 from .gdcvault import GDCVaultIE
 from .gedidigital import GediDigitalIE
 from .generic import GenericIE
+from .genericembeds import (
+    HTML5MediaEmbedIE,
+    QuotedHTMLIE,
+)
 from .genius import (
     GeniusIE,
     GeniusLyricsIE,
 )
 from .getcourseru import (
+    GetCourseRuIE,
     GetCourseRuPlayerIE,
-    GetCourseRuIE
 )
 from .gettr import (
     GettrIE,
@@ -706,41 +742,45 @@ from .gettr import (
 from .giantbomb import GiantBombIE
 from .glide import GlideIE
 from .globalplayer import (
+    GlobalPlayerAudioEpisodeIE,
+    GlobalPlayerAudioIE,
     GlobalPlayerLiveIE,
     GlobalPlayerLivePlaylistIE,
-    GlobalPlayerAudioIE,
-    GlobalPlayerAudioEpisodeIE,
-    GlobalPlayerVideoIE
+    GlobalPlayerVideoIE,
 )
 from .globo import (
-    GloboIE,
     GloboArticleIE,
+    GloboIE,
+)
+from .glomex import (
+    GlomexEmbedIE,
+    GlomexIE,
 )
 from .gmanetwork import GMANetworkVideoIE
 from .go import GoIE
-from .godtube import GodTubeIE
 from .godresource import GodResourceIE
+from .godtube import GodTubeIE
 from .gofile import GofileIE
 from .golem import GolemIE
 from .goodgame import GoodGameIE
 from .googledrive import (
-    GoogleDriveIE,
     GoogleDriveFolderIE,
+    GoogleDriveIE,
 )
 from .googlepodcasts import (
-    GooglePodcastsIE,
     GooglePodcastsFeedIE,
+    GooglePodcastsIE,
 )
 from .googlesearch import GoogleSearchIE
-from .gopro import GoProIE
 from .goplay import GoPlayIE
+from .gopro import GoProIE
 from .goshgay import GoshgayIE
 from .gotostage import GoToStageIE
 from .gputechconf import GPUTechConfIE
 from .gronkh import (
-    GronkhIE,
     GronkhFeedIE,
-    GronkhVodsIE
+    GronkhIE,
+    GronkhVodsIE,
 )
 from .groupon import GrouponIE
 from .harpodeon import HarpodeonIE
@@ -749,10 +789,10 @@ from .hearthisat import HearThisAtIE
 from .heise import HeiseIE
 from .hellporno import HellPornoIE
 from .hgtv import HGTVComShowIE
-from .hketv import HKETVIE
 from .hidive import HiDiveIE
 from .historicfilms import HistoricFilmsIE
 from .hitrecord import HitRecordIE
+from .hketv import HKETVIE
 from .hollywoodreporter import (
     HollywoodReporterIE,
     HollywoodReporterPlaylistIE,
@@ -761,8 +801,8 @@ from .holodex import HolodexIE
 from .hotnewhiphop import HotNewHipHopIE
 from .hotstar import (
     HotStarIE,
-    HotStarPrefixIE,
     HotStarPlaylistIE,
+    HotStarPrefixIE,
     HotStarSeasonIE,
     HotStarSeriesIE,
 )
@@ -773,34 +813,30 @@ from .hrti import (
     HRTiPlaylistIE,
 )
 from .hse import (
-    HSEShowIE,
     HSEProductIE,
-)
-from .genericembeds import (
-    HTML5MediaEmbedIE,
-    QuotedHTMLIE,
+    HSEShowIE,
 )
 from .huajiao import HuajiaoIE
-from .huya import HuyaLiveIE
 from .huffpost import HuffPostIE
 from .hungama import (
+    HungamaAlbumPlaylistIE,
     HungamaIE,
     HungamaSongIE,
-    HungamaAlbumPlaylistIE,
 )
+from .huya import HuyaLiveIE
 from .hypem import HypemIE
 from .hypergryph import MonsterSirenHypergryphMusicIE
 from .hytale import HytaleIE
 from .icareus import IcareusIE
 from .ichinanalive import (
-    IchinanaLiveIE,
     IchinanaLiveClipIE,
+    IchinanaLiveIE,
 )
 from .idolplus import IdolPlusIE
 from .ign import (
     IGNIE,
-    IGNVideoIE,
     IGNArticleIE,
+    IGNVideoIE,
 )
 from .iheart import (
     IHeartRadioIE,
@@ -810,12 +846,12 @@ from .ilpost import IlPostIE
 from .iltalehti import IltalehtiIE
 from .imdb import (
     ImdbIE,
-    ImdbListIE
+    ImdbListIE,
 )
 from .imgur import (
-    ImgurIE,
     ImgurAlbumIE,
     ImgurGalleryIE,
+    ImgurIE,
 )
 from .ina import InaIE
 from .inc import IncIE
@@ -824,20 +860,20 @@ from .infoq import InfoQIE
 from .instagram import (
     InstagramIE,
     InstagramIOSIE,
-    InstagramUserIE,
-    InstagramTagIE,
     InstagramStoryIE,
+    InstagramTagIE,
+    InstagramUserIE,
 )
 from .internazionale import InternazionaleIE
 from .internetvideoarchive import InternetVideoArchiveIE
 from .iprima import (
+    IPrimaCNNIE,
     IPrimaIE,
-    IPrimaCNNIE
 )
 from .iqiyi import (
-    IqiyiIE,
+    IqAlbumIE,
     IqIE,
-    IqAlbumIE
+    IqiyiIE,
 )
 from .islamchannel import (
     IslamChannelIE,
@@ -845,16 +881,16 @@ from .islamchannel import (
 )
 from .israelnationalnews import IsraelNationalNewsIE
 from .itprotv import (
+    ITProTVCourseIE,
     ITProTVIE,
-    ITProTVCourseIE
 )
 from .itv import (
-    ITVIE,
     ITVBTCCIE,
+    ITVIE,
 )
 from .ivi import (
+    IviCompilationIE,
     IviIE,
-    IviCompilationIE
 )
 from .ivideon import IvideonIE
 from .iwara import (
@@ -865,15 +901,15 @@ from .iwara import (
 from .ixigua import IxiguaIE
 from .izlesene import IzleseneIE
 from .jamendo import (
-    JamendoIE,
     JamendoAlbumIE,
+    JamendoIE,
 )
 from .japandiet import (
+    SangiinIE,
+    SangiinInstructionIE,
     ShugiinItvLiveIE,
     ShugiinItvLiveRoomIE,
     ShugiinItvVodIE,
-    SangiinInstructionIE,
-    SangiinIE,
 )
 from .jeuxvideo import JeuxVideoIE
 from .jiocinema import (
@@ -881,13 +917,13 @@ from .jiocinema import (
     JioCinemaSeriesIE,
 )
 from .jiosaavn import (
-    JioSaavnSongIE,
     JioSaavnAlbumIE,
     JioSaavnPlaylistIE,
+    JioSaavnSongIE,
 )
-from .jove import JoveIE
 from .joj import JojIE
 from .joqrag import JoqrAgIE
+from .jove import JoveIE
 from .jstream import JStreamIE
 from .jtbc import (
     JTBCIE,
@@ -914,17 +950,17 @@ from .kinopoisk import KinoPoiskIE
 from .kommunetv import KommunetvIE
 from .kompas import KompasVideoIE
 from .koo import KooIE
-from .kth import KTHIE
 from .krasview import KrasViewIE
+from .kth import KTHIE
 from .ku6 import Ku6IE
 from .kukululive import KukuluLiveIE
 from .kuwo import (
-    KuwoIE,
     KuwoAlbumIE,
-    KuwoChartIE,
-    KuwoSingerIE,
     KuwoCategoryIE,
+    KuwoChartIE,
+    KuwoIE,
     KuwoMvIE,
+    KuwoSingerIE,
 )
 from .la7 import (
     LA7IE,
@@ -944,14 +980,14 @@ from .lbry import (
 )
 from .lci import LCIIE
 from .lcp import (
-    LcpPlayIE,
     LcpIE,
+    LcpPlayIE,
 )
 from .lecture2go import Lecture2GoIE
 from .lecturio import (
-    LecturioIE,
     LecturioCourseIE,
     LecturioDeCourseIE,
+    LecturioIE,
 )
 from .leeco import (
     LeIE,
@@ -968,22 +1004,22 @@ from .lenta import LentaIE
 from .libraryofcongress import LibraryOfCongressIE
 from .libsyn import LibsynIE
 from .lifenews import (
-    LifeNewsIE,
     LifeEmbedIE,
+    LifeNewsIE,
 )
 from .likee import (
     LikeeIE,
-    LikeeUserIE
+    LikeeUserIE,
 )
 from .limelight import (
-    LimelightMediaIE,
     LimelightChannelIE,
     LimelightChannelListIE,
+    LimelightMediaIE,
 )
 from .linkedin import (
     LinkedInIE,
-    LinkedInLearningIE,
     LinkedInLearningCourseIE,
+    LinkedInLearningIE,
 )
 from .liputan6 import Liputan6IE
 from .listennotes import ListenNotesIE
@@ -1000,25 +1036,23 @@ from .lnkgo import (
     LnkIE,
 )
 from .loom import (
-    LoomIE,
     LoomFolderIE,
+    LoomIE,
 )
 from .lovehomeporn import LoveHomePornIE
 from .lrt import (
     LRTVODIE,
-    LRTStreamIE
+    LRTStreamIE,
 )
 from .lsm import (
     LSMLREmbedIE,
     LSMLTVEmbedIE,
-    LSMReplayIE
-)
-from .lumni import (
-    LumniIE
+    LSMReplayIE,
 )
+from .lumni import LumniIE
 from .lynda import (
+    LyndaCourseIE,
     LyndaIE,
-    LyndaCourseIE
 )
 from .maariv import MaarivIE
 from .magellantv import MagellanTVIE
@@ -1030,13 +1064,13 @@ from .mailru import (
 )
 from .mainstreaming import MainStreamingIE
 from .mangomolo import (
-    MangomoloVideoIE,
     MangomoloLiveIE,
+    MangomoloVideoIE,
 )
 from .manoto import (
     ManotoTVIE,
-    ManotoTVShowIE,
     ManotoTVLiveIE,
+    ManotoTVShowIE,
 )
 from .manyvids import ManyVidsIE
 from .maoritv import MaoriTVIE
@@ -1052,13 +1086,14 @@ from .mdr import MDRIE
 from .medaltv import MedalTVIE
 from .mediaite import MediaiteIE
 from .mediaklikk import MediaKlikkIE
+from .medialaan import MedialaanIE
 from .mediaset import (
     MediasetIE,
     MediasetShowIE,
 )
 from .mediasite import (
-    MediasiteIE,
     MediasiteCatalogIE,
+    MediasiteIE,
     MediasiteNamedCatalogIE,
 )
 from .mediastream import (
@@ -1068,26 +1103,30 @@ from .mediastream import (
 from .mediaworksnz import MediaWorksNZVODIE
 from .medici import MediciIE
 from .megaphone import MegaphoneIE
+from .megatvcom import (
+    MegaTVComEmbedIE,
+    MegaTVComIE,
+)
 from .meipai import MeipaiIE
 from .melonvod import MelonVODIE
 from .metacritic import MetacriticIE
 from .mgtv import MGTVIE
+from .microsoftembed import MicrosoftEmbedIE
 from .microsoftstream import MicrosoftStreamIE
 from .microsoftvirtualacademy import (
-    MicrosoftVirtualAcademyIE,
     MicrosoftVirtualAcademyCourseIE,
+    MicrosoftVirtualAcademyIE,
 )
-from .microsoftembed import MicrosoftEmbedIE
 from .mildom import (
-    MildomIE,
-    MildomVodIE,
     MildomClipIE,
+    MildomIE,
     MildomUserVodIE,
+    MildomVodIE,
 )
 from .minds import (
-    MindsIE,
     MindsChannelIE,
     MindsGroupIE,
+    MindsIE,
 )
 from .minoto import MinotoIE
 from .mirrativ import (
@@ -1095,31 +1134,34 @@ from .mirrativ import (
     MirrativUserIE,
 )
 from .mirrorcouk import MirrorCoUKIE
-from .mit import TechTVMITIE, OCWMITIE
+from .mit import (
+    OCWMITIE,
+    TechTVMITIE,
+)
 from .mitele import MiTeleIE
 from .mixch import (
-    MixchIE,
     MixchArchiveIE,
+    MixchIE,
 )
 from .mixcloud import (
     MixcloudIE,
-    MixcloudUserIE,
     MixcloudPlaylistIE,
+    MixcloudUserIE,
 )
 from .mlb import (
     MLBIE,
-    MLBVideoIE,
     MLBTVIE,
     MLBArticleIE,
+    MLBVideoIE,
 )
 from .mlssoccer import MLSSoccerIE
 from .mocha import MochaVideoIE
 from .mojvideo import MojvideoIE
 from .monstercat import MonstercatIE
 from .motherless import (
-    MotherlessIE,
-    MotherlessGroupIE,
     MotherlessGalleryIE,
+    MotherlessGroupIE,
+    MotherlessIE,
     MotherlessUploaderIE,
 )
 from .motorsport import MotorsportIE
@@ -1129,23 +1171,26 @@ from .moviezine import MoviezineIE
 from .movingimage import MovingImageIE
 from .msn import MSNIE
 from .mtv import (
-    MTVIE,
-    MTVVideoIE,
-    MTVServicesEmbeddedIE,
     MTVDEIE,
-    MTVJapanIE,
+    MTVIE,
     MTVItaliaIE,
     MTVItaliaProgrammaIE,
+    MTVJapanIE,
+    MTVServicesEmbeddedIE,
+    MTVVideoIE,
 )
 from .muenchentv import MuenchenTVIE
-from .murrtube import MurrtubeIE, MurrtubeUserIE
+from .murrtube import (
+    MurrtubeIE,
+    MurrtubeUserIE,
+)
 from .museai import MuseAIIE
 from .musescore import MuseScoreIE
 from .musicdex import (
-    MusicdexSongIE,
     MusicdexAlbumIE,
     MusicdexArtistIE,
     MusicdexPlaylistIE,
+    MusicdexSongIE,
 )
 from .mx3 import (
     Mx3IE,
@@ -1156,7 +1201,10 @@ from .mxplayer import (
     MxplayerIE,
     MxplayerShowIE,
 )
-from .myspace import MySpaceIE, MySpaceAlbumIE
+from .myspace import (
+    MySpaceAlbumIE,
+    MySpaceIE,
+)
 from .myspass import MySpassIE
 from .myvideoge import MyVideoGeIE
 from .myvidster import MyVidsterIE
@@ -1170,8 +1218,8 @@ from .nate import (
     NateProgramIE,
 )
 from .nationalgeographic import (
-    NationalGeographicVideoIE,
     NationalGeographicTVIE,
+    NationalGeographicVideoIE,
 )
 from .naver import (
     NaverIE,
@@ -1179,12 +1227,12 @@ from .naver import (
     NaverNowIE,
 )
 from .nba import (
-    NBAWatchEmbedIE,
-    NBAWatchIE,
-    NBAWatchCollectionIE,
-    NBAEmbedIE,
     NBAIE,
     NBAChannelIE,
+    NBAEmbedIE,
+    NBAWatchCollectionIE,
+    NBAWatchEmbedIE,
+    NBAWatchIE,
 )
 from .nbc import (
     NBCIE,
@@ -1198,35 +1246,35 @@ from .nbc import (
 )
 from .ndr import (
     NDRIE,
-    NJoyIE,
     NDREmbedBaseIE,
     NDREmbedIE,
     NJoyEmbedIE,
+    NJoyIE,
 )
 from .ndtv import NDTVIE
 from .nebula import (
-    NebulaIE,
-    NebulaClassIE,
-    NebulaSubscriptionsIE,
     NebulaChannelIE,
+    NebulaClassIE,
+    NebulaIE,
+    NebulaSubscriptionsIE,
 )
 from .nekohacker import NekoHackerIE
 from .nerdcubed import NerdCubedFeedIE
-from .netzkino import NetzkinoIE
 from .neteasemusic import (
-    NetEaseMusicIE,
     NetEaseMusicAlbumIE,
-    NetEaseMusicSingerIE,
+    NetEaseMusicDjRadioIE,
+    NetEaseMusicIE,
     NetEaseMusicListIE,
     NetEaseMusicMvIE,
     NetEaseMusicProgramIE,
-    NetEaseMusicDjRadioIE,
+    NetEaseMusicSingerIE,
 )
 from .netverse import (
     NetverseIE,
     NetversePlaylistIE,
     NetverseSearchIE,
 )
+from .netzkino import NetzkinoIE
 from .newgrounds import (
     NewgroundsIE,
     NewgroundsPlaylistIE,
@@ -1235,14 +1283,14 @@ from .newgrounds import (
 from .newspicks import NewsPicksIE
 from .newsy import NewsyIE
 from .nextmedia import (
-    NextMediaIE,
-    NextMediaActionNewsIE,
     AppleDailyIE,
+    NextMediaActionNewsIE,
+    NextMediaIE,
     NextTVIE,
 )
 from .nexx import (
-    NexxIE,
     NexxEmbedIE,
+    NexxIE,
 )
 from .nfb import (
     NFBIE,
@@ -1256,43 +1304,43 @@ from .nfl import (
     NFLPlusReplayIE,
 )
 from .nhk import (
-    NhkVodIE,
-    NhkVodProgramIE,
     NhkForSchoolBangumiIE,
-    NhkForSchoolSubjectIE,
     NhkForSchoolProgramListIE,
+    NhkForSchoolSubjectIE,
     NhkRadioNewsPageIE,
     NhkRadiruIE,
     NhkRadiruLiveIE,
+    NhkVodIE,
+    NhkVodProgramIE,
 )
 from .nhl import NHLIE
 from .nick import (
-    NickIE,
     NickBrIE,
     NickDeIE,
+    NickIE,
     NickRuIE,
 )
 from .niconico import (
-    NiconicoIE,
-    NiconicoPlaylistIE,
-    NiconicoUserIE,
-    NiconicoSeriesIE,
     NiconicoHistoryIE,
+    NiconicoIE,
+    NiconicoLiveIE,
+    NiconicoPlaylistIE,
+    NiconicoSeriesIE,
+    NiconicoUserIE,
     NicovideoSearchDateIE,
     NicovideoSearchIE,
     NicovideoSearchURLIE,
     NicovideoTagURLIE,
-    NiconicoLiveIE,
+)
+from .niconicochannelplus import (
+    NiconicoChannelPlusChannelLivesIE,
+    NiconicoChannelPlusChannelVideosIE,
+    NiconicoChannelPlusIE,
 )
 from .ninaprotocol import NinaProtocolIE
 from .ninecninemedia import (
-    NineCNineMediaIE,
     CPTwentyFourIE,
-)
-from .niconicochannelplus import (
-    NiconicoChannelPlusIE,
-    NiconicoChannelPlusChannelVideosIE,
-    NiconicoChannelPlusChannelLivesIE,
+    NineCNineMediaIE,
 )
 from .ninegag import NineGagIE
 from .ninenews import NineNewsIE
@@ -1317,24 +1365,24 @@ from .nowness import (
 )
 from .noz import NozIE
 from .npo import (
-    AndereTijdenIE,
     NPOIE,
-    NPOLiveIE,
-    NPORadioIE,
-    NPORadioFragmentIE,
-    SchoolTVIE,
-    HetKlokhuisIE,
     VPROIE,
     WNLIE,
+    AndereTijdenIE,
+    HetKlokhuisIE,
+    NPOLiveIE,
+    NPORadioFragmentIE,
+    NPORadioIE,
+    SchoolTVIE,
 )
 from .npr import NprIE
 from .nrk import (
     NRKIE,
-    NRKPlaylistIE,
-    NRKSkoleIE,
     NRKTVIE,
-    NRKTVDirekteIE,
+    NRKPlaylistIE,
     NRKRadioPodkastIE,
+    NRKSkoleIE,
+    NRKTVDirekteIE,
     NRKTVEpisodeIE,
     NRKTVEpisodesIE,
     NRKTVSeasonIE,
@@ -1346,18 +1394,18 @@ from .ntvcojp import NTVCoJpCUIE
 from .ntvde import NTVDeIE
 from .ntvru import NTVRuIE
 from .nubilesporn import NubilesPornIE
+from .nuum import (
+    NuumLiveIE,
+    NuumMediaIE,
+    NuumTabIE,
+)
+from .nuvid import NuvidIE
 from .nytimes import (
-    NYTimesIE,
     NYTimesArticleIE,
     NYTimesCookingIE,
     NYTimesCookingRecipeIE,
+    NYTimesIE,
 )
-from .nuum import (
-    NuumLiveIE,
-    NuumTabIE,
-    NuumMediaIE,
-)
-from .nuvid import NuvidIE
 from .nzherald import NZHeraldIE
 from .nzonscreen import NZOnScreenIE
 from .nzz import NZZIE
@@ -1365,7 +1413,7 @@ from .odkmedia import OnDemandChinaEpisodeIE
 from .odnoklassniki import OdnoklassnikiIE
 from .oftv import (
     OfTVIE,
-    OfTVPlaylistIE
+    OfTVPlaylistIE,
 )
 from .oktoberfesttv import OktoberfestTVIE
 from .olympics import OlympicsReplayIE
@@ -1378,8 +1426,8 @@ from .onefootball import OneFootballIE
 from .onenewsnz import OneNewsNZIE
 from .oneplace import OnePlacePodcastIE
 from .onet import (
-    OnetIE,
     OnetChannelIE,
+    OnetIE,
     OnetMVPIE,
     OnetPlIE,
 )
@@ -1389,33 +1437,33 @@ from .opencast import (
     OpencastPlaylistIE,
 )
 from .openrec import (
-    OpenRecIE,
     OpenRecCaptureIE,
+    OpenRecIE,
     OpenRecMovieIE,
 )
 from .ora import OraTVIE
 from .orf import (
-    ORFFM4StoryIE,
-    ORFONIE,
-    ORFRadioIE,
-    ORFPodcastIE,
     ORFIPTVIE,
+    ORFONIE,
+    ORFFM4StoryIE,
+    ORFPodcastIE,
+    ORFRadioIE,
 )
 from .outsidetv import OutsideTVIE
 from .owncloud import OwnCloudIE
 from .packtpub import (
-    PacktPubIE,
     PacktPubCourseIE,
+    PacktPubIE,
 )
 from .palcomp3 import (
-    PalcoMP3IE,
     PalcoMP3ArtistIE,
+    PalcoMP3IE,
     PalcoMP3VideoIE,
 )
 from .panopto import (
     PanoptoIE,
     PanoptoListIE,
-    PanoptoPlaylistIE
+    PanoptoPlaylistIE,
 )
 from .paramountplus import (
     ParamountPlusIE,
@@ -1424,12 +1472,18 @@ from .paramountplus import (
 from .parler import ParlerIE
 from .parlview import ParlviewIE
 from .patreon import (
+    PatreonCampaignIE,
     PatreonIE,
-    PatreonCampaignIE
 )
-from .pbs import PBSIE, PBSKidsIE
+from .pbs import (
+    PBSIE,
+    PBSKidsIE,
+)
 from .pearvideo import PearVideoIE
-from .peekvids import PeekVidsIE, PlayVidsIE
+from .peekvids import (
+    PeekVidsIE,
+    PlayVidsIE,
+)
 from .peertube import (
     PeerTubeIE,
     PeerTubePlaylistIE,
@@ -1437,7 +1491,7 @@ from .peertube import (
 from .peertv import PeerTVIE
 from .peloton import (
     PelotonIE,
-    PelotonLiveIE
+    PelotonLiveIE,
 )
 from .performgroup import PerformGroupIE
 from .periscope import (
@@ -1457,8 +1511,8 @@ from .picarto import (
 from .piksel import PikselIE
 from .pinkbike import PinkbikeIE
 from .pinterest import (
-    PinterestIE,
     PinterestCollectionIE,
+    PinterestIE,
 )
 from .pixivsketch import (
     PixivSketchIE,
@@ -1467,19 +1521,22 @@ from .pixivsketch import (
 from .pladform import PladformIE
 from .planetmarathi import PlanetMarathiIE
 from .platzi import (
-    PlatziIE,
     PlatziCourseIE,
+    PlatziIE,
 )
 from .playplustv import PlayPlusTVIE
 from .playsuisse import PlaySuisseIE
 from .playtvak import PlaytvakIE
 from .playwire import PlaywireIE
-from .plutotv import PlutoTVIE
 from .pluralsight import (
-    PluralsightIE,
     PluralsightCourseIE,
+    PluralsightIE,
+)
+from .plutotv import PlutoTVIE
+from .podbayfm import (
+    PodbayFMChannelIE,
+    PodbayFMIE,
 )
-from .podbayfm import PodbayFMIE, PodbayFMChannelIE
 from .podchaser import PodchaserIE
 from .podomatic import PodomaticIE
 from .pokemon import (
@@ -1487,15 +1544,15 @@ from .pokemon import (
     PokemonWatchIE,
 )
 from .pokergo import (
-    PokerGoIE,
     PokerGoCollectionIE,
+    PokerGoIE,
 )
 from .polsatgo import PolsatGoIE
 from .polskieradio import (
-    PolskieRadioIE,
-    PolskieRadioLegacyIE,
     PolskieRadioAuditionIE,
     PolskieRadioCategoryIE,
+    PolskieRadioIE,
+    PolskieRadioLegacyIE,
     PolskieRadioPlayerIE,
     PolskieRadioPodcastIE,
     PolskieRadioPodcastListIE,
@@ -1506,57 +1563,62 @@ from .pornbox import PornboxIE
 from .pornflip import PornFlipIE
 from .pornhub import (
     PornHubIE,
-    PornHubUserIE,
-    PornHubPlaylistIE,
     PornHubPagedVideoListIE,
+    PornHubPlaylistIE,
+    PornHubUserIE,
     PornHubUserVideosUploadIE,
 )
 from .pornotube import PornotubeIE
 from .pornovoisines import PornoVoisinesIE
 from .pornoxo import PornoXOIE
-from .puhutv import (
-    PuhuTVIE,
-    PuhuTVSerieIE,
-)
 from .pr0gramm import Pr0grammIE
-from .prankcast import PrankCastIE, PrankCastPostIE
+from .prankcast import (
+    PrankCastIE,
+    PrankCastPostIE,
+)
 from .premiershiprugby import PremiershipRugbyIE
 from .presstv import PressTVIE
 from .projectveritas import ProjectVeritasIE
 from .prosiebensat1 import ProSiebenSat1IE
 from .prx import (
-    PRXStoryIE,
-    PRXSeriesIE,
     PRXAccountIE,
+    PRXSeriesIE,
+    PRXSeriesSearchIE,
     PRXStoriesSearchIE,
-    PRXSeriesSearchIE
+    PRXStoryIE,
+)
+from .puhutv import (
+    PuhuTVIE,
+    PuhuTVSerieIE,
 )
 from .puls4 import Puls4IE
 from .pyvideo import PyvideoIE
 from .qdance import QDanceIE
 from .qingting import QingTingIE
 from .qqmusic import (
-    QQMusicIE,
-    QQMusicSingerIE,
     QQMusicAlbumIE,
-    QQMusicToplistIE,
+    QQMusicIE,
     QQMusicPlaylistIE,
+    QQMusicSingerIE,
+    QQMusicToplistIE,
 )
 from .r7 import (
     R7IE,
     R7ArticleIE,
 )
-from .radiko import RadikoIE, RadikoRadioIE
+from .radiko import (
+    RadikoIE,
+    RadikoRadioIE,
+)
 from .radiocanada import (
-    RadioCanadaIE,
     RadioCanadaAudioVideoIE,
+    RadioCanadaIE,
 )
 from .radiocomercial import (
     RadioComercialIE,
     RadioComercialPlaylistIE,
 )
 from .radiode import RadioDeIE
-from .radiojavan import RadioJavanIE
 from .radiofrance import (
     FranceCultureIE,
     RadioFranceIE,
@@ -1565,35 +1627,36 @@ from .radiofrance import (
     RadioFranceProfileIE,
     RadioFranceProgramScheduleIE,
 )
-from .radiozet import RadioZetPodcastIE
+from .radiojavan import RadioJavanIE
 from .radiokapital import (
     RadioKapitalIE,
     RadioKapitalShowIE,
 )
+from .radiozet import RadioZetPodcastIE
 from .radlive import (
-    RadLiveIE,
     RadLiveChannelIE,
+    RadLiveIE,
     RadLiveSeasonIE,
 )
 from .rai import (
-    RaiIE,
     RaiCulturaIE,
+    RaiIE,
+    RaiNewsIE,
     RaiPlayIE,
     RaiPlayLiveIE,
     RaiPlayPlaylistIE,
     RaiPlaySoundIE,
     RaiPlaySoundLiveIE,
     RaiPlaySoundPlaylistIE,
-    RaiNewsIE,
     RaiSudtirolIE,
 )
 from .raywenderlich import (
-    RayWenderlichIE,
     RayWenderlichCourseIE,
+    RayWenderlichIE,
 )
 from .rbgtum import (
-    RbgTumIE,
     RbgTumCourseIE,
+    RbgTumIE,
     RbgTumNewCourseIE,
 )
 from .rcs import (
@@ -1607,12 +1670,15 @@ from .rcti import (
     RCTIPlusTVIE,
 )
 from .rds import RDSIE
-from .redbee import ParliamentLiveUKIE, RTBFIE
+from .redbee import (
+    RTBFIE,
+    ParliamentLiveUKIE,
+)
 from .redbulltv import (
-    RedBullTVIE,
     RedBullEmbedIE,
-    RedBullTVRrnContentIE,
     RedBullIE,
+    RedBullTVIE,
+    RedBullTVRrnContentIE,
 )
 from .reddit import RedditIE
 from .redge import RedCDNLivxIE
@@ -1632,107 +1698,100 @@ from .reverbnation import ReverbNationIE
 from .rheinmaintv import RheinMainTVIE
 from .ridehome import RideHomeIE
 from .rinsefm import (
-    RinseFMIE,
     RinseFMArtistPlaylistIE,
+    RinseFMIE,
 )
 from .rmcdecouverte import RMCDecouverteIE
 from .rockstargames import RockstarGamesIE
 from .rokfin import (
-    RokfinIE,
-    RokfinStackIE,
     RokfinChannelIE,
+    RokfinIE,
     RokfinSearchIE,
+    RokfinStackIE,
+)
+from .roosterteeth import (
+    RoosterTeethIE,
+    RoosterTeethSeriesIE,
 )
-from .roosterteeth import RoosterTeethIE, RoosterTeethSeriesIE
 from .rottentomatoes import RottenTomatoesIE
 from .rozhlas import (
+    MujRozhlasIE,
     RozhlasIE,
     RozhlasVltavaIE,
-    MujRozhlasIE,
 )
-from .rte import RteIE, RteRadioIE
+from .rte import (
+    RteIE,
+    RteRadioIE,
+)
+from .rtl2 import RTL2IE
 from .rtlnl import (
-    RtlNlIE,
-    RTLLuTeleVODIE,
     RTLLuArticleIE,
     RTLLuLiveIE,
     RTLLuRadioIE,
+    RTLLuTeleVODIE,
+    RtlNlIE,
 )
-from .rtl2 import RTL2IE
 from .rtnews import (
-    RTNewsIE,
     RTDocumentryIE,
     RTDocumentryPlaylistIE,
+    RTNewsIE,
     RuptlyIE,
 )
 from .rtp import RTPIE
 from .rtrfm import RTRFMIE
 from .rts import RTSIE
 from .rtvcplay import (
-    RTVCPlayIE,
-    RTVCPlayEmbedIE,
     RTVCKalturaIE,
+    RTVCPlayEmbedIE,
+    RTVCPlayIE,
 )
 from .rtve import (
     RTVEALaCartaIE,
     RTVEAudioIE,
-    RTVELiveIE,
     RTVEInfantilIE,
+    RTVELiveIE,
     RTVETelevisionIE,
 )
 from .rtvs import RTVSIE
 from .rtvslo import RTVSLOIE
+from .rudovideo import RudoVideoIE
 from .rule34video import Rule34VideoIE
 from .rumble import (
+    RumbleChannelIE,
     RumbleEmbedIE,
     RumbleIE,
-    RumbleChannelIE,
 )
-from .rudovideo import RudoVideoIE
 from .rutube import (
-    RutubeIE,
     RutubeChannelIE,
     RutubeEmbedIE,
+    RutubeIE,
     RutubeMovieIE,
     RutubePersonIE,
     RutubePlaylistIE,
     RutubeTagsIE,
 )
-from .glomex import (
-    GlomexIE,
-    GlomexEmbedIE,
-)
-from .megatvcom import (
-    MegaTVComIE,
-    MegaTVComEmbedIE,
-)
-from .antenna import (
-    AntennaGrWatchIE,
-    Ant1NewsGrArticleIE,
-    Ant1NewsGrEmbedIE,
-)
 from .rutv import RUTVIE
 from .ruutu import RuutuIE
 from .ruv import (
     RuvIE,
-    RuvSpilaIE
+    RuvSpilaIE,
 )
 from .s4c import (
     S4CIE,
-    S4CSeriesIE
+    S4CSeriesIE,
 )
 from .safari import (
-    SafariIE,
     SafariApiIE,
     SafariCourseIE,
+    SafariIE,
 )
 from .saitosan import SaitosanIE
 from .samplefocus import SampleFocusIE
 from .sapo import SapoIE
 from .sbs import SBSIE
 from .sbscokr import (
-    SBSCoKrIE,
     SBSCoKrAllvodProgramIE,
+    SBSCoKrIE,
     SBSCoKrProgramsVodIE,
 )
 from .screen9 import Screen9IE
@@ -1740,24 +1799,27 @@ from .screencast import ScreencastIE
 from .screencastify import ScreencastifyIE
 from .screencastomatic import ScreencastOMaticIE
 from .scrippsnetworks import (
-    ScrippsNetworksWatchIE,
     ScrippsNetworksIE,
+    ScrippsNetworksWatchIE,
 )
+from .scrolller import ScrolllerIE
 from .scte import (
     SCTEIE,
     SCTECourseIE,
 )
-from .scrolller import ScrolllerIE
 from .sejmpl import SejmIE
 from .senalcolombia import SenalColombiaLiveIE
-from .senategov import SenateISVPIE, SenateGovIE
+from .senategov import (
+    SenateGovIE,
+    SenateISVPIE,
+)
 from .sendtonews import SendtoNewsIE
 from .servus import ServusIE
 from .sevenplus import SevenPlusIE
 from .sexu import SexuIE
 from .seznamzpravy import (
-    SeznamZpravyIE,
     SeznamZpravyArticleIE,
+    SeznamZpravyIE,
 )
 from .shahid import (
     ShahidIE,
@@ -1765,38 +1827,38 @@ from .shahid import (
 )
 from .sharepoint import SharePointIE
 from .sharevideos import ShareVideosEmbedIE
-from .sibnet import SibnetEmbedIE
 from .shemaroome import ShemarooMeIE
 from .showroomlive import ShowRoomLiveIE
+from .sibnet import SibnetEmbedIE
 from .simplecast import (
-    SimplecastIE,
     SimplecastEpisodeIE,
+    SimplecastIE,
     SimplecastPodcastIE,
 )
 from .sina import SinaIE
 from .sixplay import SixPlayIE
 from .skeb import SkebIE
-from .skyit import (
-    SkyItPlayerIE,
-    SkyItVideoIE,
-    SkyItVideoLiveIE,
-    SkyItIE,
-    SkyItArteIE,
-    CieloTVItIE,
-    TV8ItIE,
-)
-from .skylinewebcams import SkylineWebcamsIE
-from .skynewsarabia import (
-    SkyNewsArabiaIE,
-    SkyNewsArabiaArticleIE,
-)
-from .skynewsau import SkyNewsAUIE
 from .sky import (
     SkyNewsIE,
     SkyNewsStoryIE,
     SkySportsIE,
     SkySportsNewsIE,
 )
+from .skyit import (
+    CieloTVItIE,
+    SkyItArteIE,
+    SkyItIE,
+    SkyItPlayerIE,
+    SkyItVideoIE,
+    SkyItVideoLiveIE,
+    TV8ItIE,
+)
+from .skylinewebcams import SkylineWebcamsIE
+from .skynewsarabia import (
+    SkyNewsArabiaArticleIE,
+    SkyNewsArabiaIE,
+)
+from .skynewsau import SkyNewsAUIE
 from .slideshare import SlideshareIE
 from .slideslive import SlidesLiveIE
 from .slutload import SlutloadIE
@@ -1813,29 +1875,29 @@ from .sonyliv import (
 from .soundcloud import (
     SoundcloudEmbedIE,
     SoundcloudIE,
-    SoundcloudSetIE,
+    SoundcloudPlaylistIE,
     SoundcloudRelatedIE,
+    SoundcloudSearchIE,
+    SoundcloudSetIE,
+    SoundcloudTrackStationIE,
     SoundcloudUserIE,
     SoundcloudUserPermalinkIE,
-    SoundcloudTrackStationIE,
-    SoundcloudPlaylistIE,
-    SoundcloudSearchIE,
 )
 from .soundgasm import (
     SoundgasmIE,
-    SoundgasmProfileIE
+    SoundgasmProfileIE,
 )
 from .southpark import (
-    SouthParkIE,
     SouthParkDeIE,
     SouthParkDkIE,
     SouthParkEsIE,
+    SouthParkIE,
     SouthParkLatIE,
-    SouthParkNlIE
+    SouthParkNlIE,
 )
 from .sovietscloset import (
     SovietsClosetIE,
-    SovietsClosetPlaylistIE
+    SovietsClosetPlaylistIE,
 )
 from .spankbang import (
     SpankBangIE,
@@ -1846,12 +1908,6 @@ from .spike import (
     BellatorIE,
     ParamountNetworkIE,
 )
-from .stageplus import StagePlusVODConcertIE
-from .startrek import StarTrekIE
-from .stitcher import (
-    StitcherIE,
-    StitcherShowIE,
-)
 from .sport5 import Sport5IE
 from .sportbox import SportBoxIE
 from .sportdeutschland import SportDeutschlandIE
@@ -1875,19 +1931,25 @@ from .srmediathek import SRMediathekIE
 from .stacommu import (
     StacommuLiveIE,
     StacommuVODIE,
-    TheaterComplexTownVODIE,
     TheaterComplexTownPPVIE,
+    TheaterComplexTownVODIE,
 )
+from .stageplus import StagePlusVODConcertIE
 from .stanfordoc import StanfordOpenClassroomIE
+from .startrek import StarTrekIE
 from .startv import StarTVIE
 from .steam import (
-    SteamIE,
     SteamCommunityBroadcastIE,
+    SteamIE,
+)
+from .stitcher import (
+    StitcherIE,
+    StitcherShowIE,
 )
 from .storyfire import (
     StoryFireIE,
-    StoryFireUserIE,
     StoryFireSeriesIE,
+    StoryFireUserIE,
 )
 from .streamable import StreamableIE
 from .streamcz import StreamCZIE
@@ -1908,26 +1970,26 @@ from .svt import (
     SVTSeriesIE,
 )
 from .swearnet import SwearnetEpisodeIE
-from .syvdk import SYVDKIE
 from .syfy import SyfyIE
+from .syvdk import SYVDKIE
 from .sztvhu import SztvHuIE
 from .tagesschau import TagesschauIE
 from .taptap import (
-    TapTapMomentIE,
     TapTapAppIE,
     TapTapAppIntlIE,
+    TapTapMomentIE,
     TapTapPostIntlIE,
 )
 from .tass import TassIE
 from .tbs import TBSIE
 from .tbsjp import (
     TBSJPEpisodeIE,
-    TBSJPProgramIE,
     TBSJPPlaylistIE,
+    TBSJPProgramIE,
 )
 from .teachable import (
-    TeachableIE,
     TeachableCourseIE,
+    TeachableIE,
 )
 from .teachertube import (
     TeacherTubeIE,
@@ -1935,8 +1997,8 @@ from .teachertube import (
 )
 from .teachingchannel import TeachingChannelIE
 from .teamcoco import (
-    TeamcocoIE,
     ConanClassicIE,
+    TeamcocoIE,
 )
 from .teamtreehouse import TeamTreeHouseIE
 from .ted import (
@@ -1955,15 +2017,18 @@ from .telegram import TelegramEmbedIE
 from .telemb import TeleMBIE
 from .telemundo import TelemundoIE
 from .telequebec import (
-    TeleQuebecIE,
-    TeleQuebecSquatIE,
     TeleQuebecEmissionIE,
+    TeleQuebecIE,
     TeleQuebecLiveIE,
+    TeleQuebecSquatIE,
     TeleQuebecVideoIE,
 )
 from .teletask import TeleTaskIE
 from .telewebion import TelewebionIE
-from .tempo import TempoIE, IVXPlayerIE
+from .tempo import (
+    IVXPlayerIE,
+    TempoIE,
+)
 from .tencent import (
     IflixEpisodeIE,
     IflixSeriesIE,
@@ -1987,8 +2052,8 @@ from .theguardian import (
 from .theholetv import TheHoleTvIE
 from .theintercept import TheInterceptIE
 from .theplatform import (
-    ThePlatformIE,
     ThePlatformFeedIE,
+    ThePlatformIE,
 )
 from .thestar import TheStarIE
 from .thesun import TheSunIE
@@ -2000,50 +2065,51 @@ from .thisvid import (
     ThisVidMemberIE,
     ThisVidPlaylistIE,
 )
+from .threeqsdn import ThreeQSDNIE
 from .threespeak import (
     ThreeSpeakIE,
     ThreeSpeakUserIE,
 )
-from .threeqsdn import ThreeQSDNIE
 from .tiktok import (
-    TikTokIE,
-    TikTokUserIE,
-    TikTokSoundIE,
-    TikTokEffectIE,
-    TikTokTagIE,
-    TikTokVMIE,
-    TikTokLiveIE,
     DouyinIE,
+    TikTokEffectIE,
+    TikTokIE,
+    TikTokLiveIE,
+    TikTokSoundIE,
+    TikTokTagIE,
+    TikTokUserIE,
+    TikTokVMIE,
 )
 from .tmz import TMZIE
 from .tnaflix import (
-    TNAFlixNetworkEmbedIE,
-    TNAFlixIE,
     EMPFlixIE,
     MovieFapIE,
+    TNAFlixIE,
+    TNAFlixNetworkEmbedIE,
 )
 from .toggle import (
-    ToggleIE,
     MeWatchIE,
+    ToggleIE,
 )
-from .toggo import (
-    ToggoIE,
-)
+from .toggo import ToggoIE
 from .tonline import TOnlineIE
 from .toongoggles import ToonGogglesIE
 from .toutv import TouTvIE
-from .toypics import ToypicsUserIE, ToypicsIE
+from .toypics import (
+    ToypicsIE,
+    ToypicsUserIE,
+)
 from .traileraddict import TrailerAddictIE
 from .triller import (
     TrillerIE,
-    TrillerUserIE,
     TrillerShortIE,
+    TrillerUserIE,
 )
 from .trovo import (
+    TrovoChannelClipIE,
+    TrovoChannelVodIE,
     TrovoIE,
     TrovoVodIE,
-    TrovoChannelVodIE,
-    TrovoChannelClipIE,
 )
 from .trtcocuk import TrtCocukVideoIE
 from .trtworld import TrtWorldIE
@@ -2052,26 +2118,26 @@ from .trunews import TruNewsIE
 from .truth import TruthIE
 from .trutv import TruTVIE
 from .tube8 import Tube8IE
-from .tubetugraz import TubeTuGrazIE, TubeTuGrazSeriesIE
+from .tubetugraz import (
+    TubeTuGrazIE,
+    TubeTuGrazSeriesIE,
+)
 from .tubitv import (
     TubiTvIE,
     TubiTvShowIE,
 )
 from .tumblr import TumblrIE
 from .tunein import (
-    TuneInStationIE,
-    TuneInPodcastIE,
     TuneInPodcastEpisodeIE,
+    TuneInPodcastIE,
     TuneInShortenerIE,
+    TuneInStationIE,
 )
 from .tv2 import (
     TV2IE,
-    TV2ArticleIE,
     KatsomoIE,
     MTVUutisetArticleIE,
-)
-from .tv24ua import (
-    TV24UAVideoIE,
+    TV2ArticleIE,
 )
 from .tv2dk import (
     TV2DKIE,
@@ -2084,16 +2150,17 @@ from .tv2hu import (
 from .tv4 import TV4IE
 from .tv5mondeplus import TV5MondePlusIE
 from .tv5unis import (
-    TV5UnisVideoIE,
     TV5UnisIE,
+    TV5UnisVideoIE,
 )
+from .tv24ua import TV24UAVideoIE
 from .tva import (
     TVAIE,
     QubIE,
 )
 from .tvanouvelles import (
-    TVANouvellesIE,
     TVANouvellesArticleIE,
+    TVANouvellesIE,
 )
 from .tvc import (
     TVCIE,
@@ -2106,19 +2173,19 @@ from .tvland import TVLandIE
 from .tvn24 import TVN24IE
 from .tvnoe import TVNoeIE
 from .tvopengr import (
-    TVOpenGrWatchIE,
     TVOpenGrEmbedIE,
+    TVOpenGrWatchIE,
 )
 from .tvp import (
-    TVPEmbedIE,
     TVPIE,
+    TVPEmbedIE,
     TVPStreamIE,
     TVPVODSeriesIE,
     TVPVODVideoIE,
 )
 from .tvplay import (
-    TVPlayIE,
     TVPlayHomeIE,
+    TVPlayIE,
 )
 from .tvplayer import TVPlayerIE
 from .tweakers import TweakersIE
@@ -2130,29 +2197,29 @@ from .twitcasting import (
     TwitCastingUserIE,
 )
 from .twitch import (
-    TwitchVodIE,
+    TwitchClipsIE,
     TwitchCollectionIE,
-    TwitchVideosIE,
+    TwitchStreamIE,
     TwitchVideosClipsIE,
     TwitchVideosCollectionsIE,
-    TwitchStreamIE,
-    TwitchClipsIE,
+    TwitchVideosIE,
+    TwitchVodIE,
 )
 from .twitter import (
-    TwitterCardIE,
-    TwitterIE,
     TwitterAmplifyIE,
     TwitterBroadcastIE,
-    TwitterSpacesIE,
+    TwitterCardIE,
+    TwitterIE,
     TwitterShortenerIE,
+    TwitterSpacesIE,
 )
 from .txxx import (
-    TxxxIE,
     PornTopIE,
+    TxxxIE,
 )
 from .udemy import (
+    UdemyCourseIE,
     UdemyIE,
-    UdemyCourseIE
 )
 from .udn import UDNEmbedIE
 from .ufctv import (
@@ -2161,16 +2228,13 @@ from .ufctv import (
 )
 from .ukcolumn import UkColumnIE
 from .uktvplay import UKTVPlayIE
-from .digiteka import DigitekaIE
-from .dlive import (
-    DLiveVODIE,
-    DLiveStreamIE,
-)
-from .drooble import DroobleIE
 from .umg import UMGDeIE
 from .unistra import UnistraIE
 from .unity import UnityIE
-from .unsupported import KnownDRMIE, KnownPiracyIE
+from .unsupported import (
+    KnownDRMIE,
+    KnownPiracyIE,
+)
 from .uol import UOLIE
 from .uplynk import (
     UplynkIE,
@@ -2180,10 +2244,13 @@ from .urort import UrortIE
 from .urplay import URPlayIE
 from .usanetwork import USANetworkIE
 from .usatoday import USATodayIE
-from .ustream import UstreamIE, UstreamChannelIE
+from .ustream import (
+    UstreamChannelIE,
+    UstreamIE,
+)
 from .ustudio import (
-    UstudioIE,
     UstudioEmbedIE,
+    UstudioIE,
 )
 from .utreon import UtreonIE
 from .varzesh3 import Varzesh3IE
@@ -2191,7 +2258,7 @@ from .vbox7 import Vbox7IE
 from .veo import VeoIE
 from .veoh import (
     VeohIE,
-    VeohUserIE
+    VeohUserIE,
 )
 from .vesti import VestiIE
 from .vevo import (
@@ -2199,14 +2266,14 @@ from .vevo import (
     VevoPlaylistIE,
 )
 from .vgtv import (
+    VGTVIE,
     BTArticleIE,
     BTVestlendingenIE,
-    VGTVIE,
 )
 from .vh1 import VH1IE
 from .vice import (
-    ViceIE,
     ViceArticleIE,
+    ViceIE,
     ViceShowIE,
 )
 from .viddler import ViddlerIE
@@ -2218,42 +2285,46 @@ from .videocampus_sachsen import (
 from .videodetective import VideoDetectiveIE
 from .videofyme import VideofyMeIE
 from .videoken import (
+    VideoKenCategoryIE,
     VideoKenIE,
     VideoKenPlayerIE,
     VideoKenPlaylistIE,
-    VideoKenCategoryIE,
     VideoKenTopicIE,
 )
 from .videomore import (
     VideomoreIE,
-    VideomoreVideoIE,
     VideomoreSeasonIE,
+    VideomoreVideoIE,
 )
 from .videopress import VideoPressIE
 from .vidio import (
     VidioIE,
+    VidioLiveIE,
     VidioPremierIE,
-    VidioLiveIE
 )
 from .vidlii import VidLiiIE
 from .vidly import VidlyIE
 from .viewlift import (
-    ViewLiftIE,
     ViewLiftEmbedIE,
+    ViewLiftIE,
 )
 from .viidea import ViideaIE
+from .viki import (
+    VikiChannelIE,
+    VikiIE,
+)
 from .vimeo import (
-    VimeoIE,
+    VHXEmbedIE,
     VimeoAlbumIE,
     VimeoChannelIE,
     VimeoGroupsIE,
+    VimeoIE,
     VimeoLikesIE,
     VimeoOndemandIE,
     VimeoProIE,
     VimeoReviewIE,
     VimeoUserIE,
     VimeoWatchLaterIE,
-    VHXEmbedIE,
 )
 from .vimm import (
     VimmIE,
@@ -2263,46 +2334,41 @@ from .vine import (
     VineIE,
     VineUserIE,
 )
-from .viki import (
-    VikiIE,
-    VikiChannelIE,
-)
 from .viously import ViouslyIE
 from .viqeo import ViqeoIE
 from .viu import (
     ViuIE,
-    ViuPlaylistIE,
     ViuOTTIE,
     ViuOTTIndonesiaIE,
+    ViuPlaylistIE,
 )
 from .vk import (
     VKIE,
-    VKUserVideosIE,
-    VKWallPostIE,
     VKPlayIE,
     VKPlayLiveIE,
+    VKUserVideosIE,
+    VKWallPostIE,
 )
 from .vocaroo import VocarooIE
 from .vodpl import VODPlIE
 from .vodplatform import VODPlatformIE
 from .voicy import (
-    VoicyIE,
     VoicyChannelIE,
+    VoicyIE,
 )
 from .volejtv import VolejTVIE
 from .voxmedia import (
-    VoxMediaVolumeIE,
     VoxMediaIE,
+    VoxMediaVolumeIE,
 )
 from .vrt import (
     VRTIE,
-    VrtNUIE,
-    KetnetIE,
     DagelijkseKostIE,
+    KetnetIE,
     Radio1BeIE,
+    VrtNUIE,
 )
 from .vtm import VTMIE
-from .medialaan import MedialaanIE
 from .vuclip import VuClipIE
 from .vvvvid import (
     VVVVIDIE,
@@ -2310,20 +2376,20 @@ from .vvvvid import (
 )
 from .walla import WallaIE
 from .washingtonpost import (
-    WashingtonPostIE,
     WashingtonPostArticleIE,
+    WashingtonPostIE,
 )
 from .wat import WatIE
 from .wdr import (
     WDRIE,
-    WDRPageIE,
     WDRElefantIE,
     WDRMobileIE,
+    WDRPageIE,
 )
 from .webcamerapl import WebcameraplIE
 from .webcaster import (
-    WebcasterIE,
     WebcasterFeedIE,
+    WebcasterIE,
 )
 from .webofstories import (
     WebOfStoriesIE,
@@ -2331,42 +2397,42 @@ from .webofstories import (
 )
 from .weibo import (
     WeiboIE,
-    WeiboVideoIE,
     WeiboUserIE,
+    WeiboVideoIE,
 )
 from .weiqitv import WeiqiTVIE
 from .weverse import (
     WeverseIE,
-    WeverseMediaIE,
-    WeverseMomentIE,
-    WeverseLiveTabIE,
-    WeverseMediaTabIE,
     WeverseLiveIE,
+    WeverseLiveTabIE,
+    WeverseMediaIE,
+    WeverseMediaTabIE,
+    WeverseMomentIE,
 )
 from .wevidi import WeVidiIE
 from .weyyak import WeyyakIE
+from .whowatch import WhoWatchIE
 from .whyp import WhypIE
 from .wikimedia import WikimediaIE
 from .wimbledon import WimbledonIE
 from .wimtv import WimTVIE
-from .whowatch import WhoWatchIE
 from .wistia import (
+    WistiaChannelIE,
     WistiaIE,
     WistiaPlaylistIE,
-    WistiaChannelIE,
 )
 from .wordpress import (
-    WordpressPlaylistEmbedIE,
     WordpressMiniAudioPlayerEmbedIE,
+    WordpressPlaylistEmbedIE,
 )
 from .worldstarhiphop import WorldStarHipHopIE
 from .wppilot import (
-    WPPilotIE,
     WPPilotChannelsIE,
+    WPPilotIE,
 )
 from .wrestleuniverse import (
-    WrestleUniverseVODIE,
     WrestleUniversePPVIE,
+    WrestleUniverseVODIE,
 )
 from .wsj import (
     WSJIE,
@@ -2374,22 +2440,22 @@ from .wsj import (
 )
 from .wwe import WWEIE
 from .wykop import (
-    WykopDigIE,
     WykopDigCommentIE,
-    WykopPostIE,
+    WykopDigIE,
     WykopPostCommentIE,
+    WykopPostIE,
 )
 from .xanimu import XanimuIE
 from .xboxclips import XboxClipsIE
 from .xhamster import (
-    XHamsterIE,
     XHamsterEmbedIE,
+    XHamsterIE,
     XHamsterUserIE,
 )
 from .xiaohongshu import XiaoHongShuIE
 from .ximalaya import (
+    XimalayaAlbumIE,
     XimalayaIE,
-    XimalayaAlbumIE
 )
 from .xinpianchang import XinpianchangIE
 from .xminus import XMinusIE
@@ -2397,27 +2463,27 @@ from .xnxx import XNXXIE
 from .xstream import XstreamIE
 from .xvideos import (
     XVideosIE,
-    XVideosQuickiesIE
+    XVideosQuickiesIE,
 )
 from .xxxymovies import XXXYMoviesIE
 from .yahoo import (
     YahooIE,
-    YahooSearchIE,
     YahooJapanNewsIE,
+    YahooSearchIE,
 )
 from .yandexdisk import YandexDiskIE
 from .yandexmusic import (
-    YandexMusicTrackIE,
     YandexMusicAlbumIE,
-    YandexMusicPlaylistIE,
-    YandexMusicArtistTracksIE,
     YandexMusicArtistAlbumsIE,
+    YandexMusicArtistTracksIE,
+    YandexMusicPlaylistIE,
+    YandexMusicTrackIE,
 )
 from .yandexvideo import (
     YandexVideoIE,
     YandexVideoPreviewIE,
-    ZenYandexIE,
     ZenYandexChannelIE,
+    ZenYandexIE,
 )
 from .yapfiles import YapFilesIE
 from .yappy import (
@@ -2431,24 +2497,26 @@ from .youku import (
     YoukuShowIE,
 )
 from .younow import (
-    YouNowLiveIE,
     YouNowChannelIE,
+    YouNowLiveIE,
     YouNowMomentIE,
 )
 from .youporn import YouPornIE
 from .zaiko import (
-    ZaikoIE,
     ZaikoETicketIE,
+    ZaikoIE,
 )
 from .zapiks import ZapiksIE
 from .zattoo import (
     BBVTVIE,
+    EWETVIE,
+    SAKTVIE,
+    VTXTVIE,
     BBVTVLiveIE,
     BBVTVRecordingsIE,
     EinsUndEinsTVIE,
     EinsUndEinsTVLiveIE,
     EinsUndEinsTVRecordingsIE,
-    EWETVIE,
     EWETVLiveIE,
     EWETVRecordingsIE,
     GlattvisionTVIE,
@@ -2466,13 +2534,11 @@ from .zattoo import (
     QuantumTVIE,
     QuantumTVLiveIE,
     QuantumTVRecordingsIE,
+    SAKTVLiveIE,
+    SAKTVRecordingsIE,
     SaltTVIE,
     SaltTVLiveIE,
     SaltTVRecordingsIE,
-    SAKTVIE,
-    SAKTVLiveIE,
-    SAKTVRecordingsIE,
-    VTXTVIE,
     VTXTVLiveIE,
     VTXTVRecordingsIE,
     WalyTVIE,
@@ -2483,7 +2549,10 @@ from .zattoo import (
     ZattooMoviesIE,
     ZattooRecordingsIE,
 )
-from .zdf import ZDFIE, ZDFChannelIE
+from .zdf import (
+    ZDFIE,
+    ZDFChannelIE,
+)
 from .zee5 import (
     Zee5IE,
     Zee5SeriesIE,
@@ -2493,16 +2562,16 @@ from .zenporn import ZenPornIE
 from .zetland import ZetlandDKArticleIE
 from .zhihu import ZhihuIE
 from .zingmp3 import (
-    ZingMp3IE,
     ZingMp3AlbumIE,
     ZingMp3ChartHomeIE,
-    ZingMp3WeekChartIE,
     ZingMp3ChartMusicVideoIE,
-    ZingMp3UserIE,
     ZingMp3HubIE,
+    ZingMp3IE,
     ZingMp3LiveRadioIE,
     ZingMp3PodcastEpisodeIE,
     ZingMp3PodcastIE,
+    ZingMp3UserIE,
+    ZingMp3WeekChartIE,
 )
 from .zoom import ZoomIE
 from .zype import ZypeIE

yt_dlp/extractor/abc.py

@@ -6,10 +6,10 @@ import time
 from .common import InfoExtractor
 from ..compat import compat_str
 from ..utils import (
-    dict_get,
     ExtractorError,
-    js_to_json,
+    dict_get,
     int_or_none,
+    js_to_json,
     parse_iso8601,
     str_or_none,
     traverse_obj,

yt_dlp/extractor/abematv.py

@@ -12,20 +12,21 @@ import urllib.parse
 import urllib.request
 import urllib.response
 import uuid
-from ..utils.networking import clean_proxies
+
 from .common import InfoExtractor
 from ..aes import aes_ecb_decrypt
 from ..utils import (
     ExtractorError,
+    OnDemandPagedList,
     bytes_to_intlist,
     decode_base_n,
     int_or_none,
     intlist_to_bytes,
-    OnDemandPagedList,
     time_seconds,
     traverse_obj,
     update_url_query,
 )
+from ..utils.networking import clean_proxies
 
 
 def add_opener(ydl, handler):  # FIXME: Create proper API in .networking

yt_dlp/extractor/acfun.py

@@ -3,10 +3,10 @@ from ..utils import (
     float_or_none,
     format_field,
     int_or_none,
-    str_or_none,
-    traverse_obj,
     parse_codecs,
     parse_qs,
+    str_or_none,
+    traverse_obj,
 )
 
 

yt_dlp/extractor/adn.py

@@ -10,18 +10,18 @@ from ..aes import aes_cbc_decrypt_bytes, unpad_pkcs7
 from ..compat import compat_b64decode
 from ..networking.exceptions import HTTPError
 from ..utils import (
+    ExtractorError,
     ass_subtitles_timecode,
     bytes_to_intlist,
     bytes_to_long,
-    ExtractorError,
     float_or_none,
     int_or_none,
     intlist_to_bytes,
     long_to_bytes,
     parse_iso8601,
     pkcs1pad,
-    strip_or_none,
     str_or_none,
+    strip_or_none,
     try_get,
     unified_strdate,
     urlencode_postdata,

yt_dlp/extractor/adobetv.py

@@ -4,11 +4,11 @@ import re
 from .common import InfoExtractor
 from ..compat import compat_str
 from ..utils import (
+    ISO639Utils,
+    OnDemandPagedList,
     float_or_none,
     int_or_none,
-    ISO639Utils,
     join_nonempty,
-    OnDemandPagedList,
     parse_duration,
     str_or_none,
     str_to_int,

yt_dlp/extractor/airtv.py

@@ -5,7 +5,7 @@ from ..utils import (
     int_or_none,
     mimetype2ext,
     parse_iso8601,
-    traverse_obj
+    traverse_obj,
 )
 
 

yt_dlp/extractor/allstar.py

@@ -12,7 +12,6 @@ from ..utils import (
 )
 from ..utils.traversal import traverse_obj
 
-
 _FIELDS = '''
     _id
     clipImageSource

yt_dlp/extractor/alphaporno.py

@@ -1,9 +1,9 @@
 from .common import InfoExtractor
 from ..utils import (
-    parse_iso8601,
+    int_or_none,
     parse_duration,
     parse_filesize,
-    int_or_none,
+    parse_iso8601,
 )
 
 

yt_dlp/extractor/alura.py

@@ -1,17 +1,13 @@
 import re
 
 from .common import InfoExtractor
-
-from ..compat import (
-    compat_urlparse,
-)
-
+from ..compat import compat_urlparse
 from ..utils import (
+    ExtractorError,
+    clean_html,
+    int_or_none,
     urlencode_postdata,
     urljoin,
-    int_or_none,
-    clean_html,
-    ExtractorError
 )
 
 

yt_dlp/extractor/amara.py

@@ -1,6 +1,6 @@
 from .common import InfoExtractor
-from .youtube import YoutubeIE
 from .vimeo import VimeoIE
+from .youtube import YoutubeIE
 from ..utils import (
     int_or_none,
     parse_iso8601,

yt_dlp/extractor/amp.py

@@ -1,7 +1,7 @@
 from .common import InfoExtractor
 from ..utils import (
-    determine_ext,
     ExtractorError,
+    determine_ext,
     int_or_none,
     mimetype2ext,
     parse_iso8601,

yt_dlp/extractor/anchorfm.py

@@ -5,7 +5,7 @@ from ..utils import (
     int_or_none,
     str_or_none,
     traverse_obj,
-    unified_timestamp
+    unified_timestamp,
 )
 
 

yt_dlp/extractor/angel.py

@@ -1,7 +1,7 @@
 import re
 
 from .common import InfoExtractor
-from ..utils import url_or_none, merge_dicts
+from ..utils import merge_dicts, url_or_none
 
 
 class AngelIE(InfoExtractor):

yt_dlp/extractor/appleconnect.py

@@ -1,8 +1,5 @@
 from .common import InfoExtractor
-from ..utils import (
-    str_to_int,
-    ExtractorError
-)
+from ..utils import ExtractorError, str_to_int
 
 
 class AppleConnectIE(InfoExtractor):

yt_dlp/extractor/appletrailers.py

@@ -1,5 +1,5 @@
-import re
 import json
+import re
 
 from .common import InfoExtractor
 from ..compat import compat_urlparse

yt_dlp/extractor/arnes.py

@@ -4,8 +4,8 @@ from ..compat import (
     compat_urllib_parse_urlparse,
 )
 from ..utils import (
-    format_field,
     float_or_none,
+    format_field,
     int_or_none,
     parse_iso8601,
     remove_start,

yt_dlp/extractor/atvat.py

@@ -2,10 +2,10 @@ import datetime as dt
 
 from .common import InfoExtractor
 from ..utils import (
+    ExtractorError,
     float_or_none,
     jwt_encode_hs256,
     try_get,
-    ExtractorError,
 )
 
 

yt_dlp/extractor/awaan.py

@@ -2,8 +2,8 @@ import base64
 
 from .common import InfoExtractor
 from ..compat import (
-    compat_urllib_parse_urlencode,
     compat_str,
+    compat_urllib_parse_urlencode,
 )
 from ..utils import (
     format_field,

yt_dlp/extractor/banbye.py

@@ -2,12 +2,12 @@ import math
 
 from .common import InfoExtractor
 from ..compat import (
-    compat_urllib_parse_urlparse,
     compat_parse_qs,
+    compat_urllib_parse_urlparse,
 )
 from ..utils import (
-    format_field,
     InAdvancePagedList,
+    format_field,
     traverse_obj,
     unified_timestamp,
 )

yt_dlp/extractor/bannedvideo.py

@@ -2,11 +2,11 @@ import json
 
 from .common import InfoExtractor
 from ..utils import (
-    try_get,
-    int_or_none,
-    url_or_none,
     float_or_none,
+    int_or_none,
+    try_get,
     unified_timestamp,
+    url_or_none,
 )
 
 

yt_dlp/extractor/beeg.py

@@ -1,5 +1,4 @@
 from .common import InfoExtractor
-
 from ..utils import (
     int_or_none,
     str_or_none,

yt_dlp/extractor/bleacherreport.py

@@ -1,5 +1,5 @@
-from .common import InfoExtractor
 from .amp import AMPIE
+from .common import InfoExtractor
 from ..utils import (
     ExtractorError,
     int_or_none,

yt_dlp/extractor/blogger.py

@@ -1,3 +1,4 @@
+from .common import InfoExtractor
 from ..utils import (
     mimetype2ext,
     parse_duration,
@@ -5,7 +6,6 @@ from ..utils import (
     str_or_none,
     traverse_obj,
 )
-from .common import InfoExtractor
 
 
 class BloggerIE(InfoExtractor):

yt_dlp/extractor/bostonglobe.py

@@ -1,7 +1,6 @@
 import re
 
 from .common import InfoExtractor
-
 from ..utils import (
     extract_attributes,
 )

yt_dlp/extractor/boxcast.py

@@ -1,9 +1,5 @@
 from .common import InfoExtractor
-from ..utils import (
-    js_to_json,
-    traverse_obj,
-    unified_timestamp
-)
+from ..utils import js_to_json, traverse_obj, unified_timestamp
 
 
 class BoxCastVideoIE(InfoExtractor):

yt_dlp/extractor/brainpop.py

@@ -6,7 +6,7 @@ from ..utils import (
     classproperty,
     int_or_none,
     traverse_obj,
-    urljoin
+    urljoin,
 )
 
 

yt_dlp/extractor/brightcove.py

@@ -12,10 +12,11 @@ from ..compat import (
 )
 from ..networking.exceptions import HTTPError
 from ..utils import (
+    ExtractorError,
+    UnsupportedError,
     clean_html,
     dict_get,
     extract_attributes,
-    ExtractorError,
     find_xpath_attr,
     fix_xml_ampersands,
     float_or_none,
@@ -29,7 +30,6 @@ from ..utils import (
     try_get,
     unescapeHTML,
     unsmuggle_url,
-    UnsupportedError,
     update_url_query,
     url_or_none,
 )

yt_dlp/extractor/cbs.py

@@ -5,14 +5,14 @@ from .youtube import YoutubeIE
 from ..utils import (
     ExtractorError,
     extract_attributes,
+    find_xpath_attr,
     get_element_html_by_id,
     int_or_none,
-    find_xpath_attr,
     smuggle_url,
-    xpath_element,
-    xpath_text,
     update_url_query,
     url_or_none,
+    xpath_element,
+    xpath_text,
 )
 
 

yt_dlp/extractor/cinetecamilano.py

@@ -1,4 +1,5 @@
 import json
+
 from .common import InfoExtractor
 from ..networking.exceptions import HTTPError
 from ..utils import (

yt_dlp/extractor/clippit.py

@@ -1,11 +1,11 @@
+import re
+
 from .common import InfoExtractor
 from ..utils import (
     parse_iso8601,
     qualities,
 )
 
-import re
-
 
 class ClippitIE(InfoExtractor):
 

yt_dlp/extractor/common.py

@@ -1,5 +1,6 @@
 import base64
 import collections
+import functools
 import getpass
 import hashlib
 import http.client
@@ -21,7 +22,6 @@ import urllib.parse
 import urllib.request
 import xml.etree.ElementTree
 
-from ..compat import functools  # isort: split
 from ..compat import (
     compat_etree_fromstring,
     compat_expanduser,

yt_dlp/extractor/corus.py

@@ -1,7 +1,7 @@
 from .theplatform import ThePlatformFeedIE
 from ..utils import (
-    dict_get,
     ExtractorError,
+    dict_get,
     float_or_none,
     int_or_none,
 )

yt_dlp/extractor/crackle.py

@@ -6,6 +6,7 @@ import time
 from .common import InfoExtractor
 from ..networking.exceptions import HTTPError
 from ..utils import (
+    ExtractorError,
     determine_ext,
     float_or_none,
     int_or_none,
@@ -13,7 +14,6 @@ from ..utils import (
     parse_age_limit,
     parse_duration,
     url_or_none,
-    ExtractorError
 )
 
 

yt_dlp/extractor/cspan.py

@@ -1,10 +1,12 @@
 import re
 
 from .common import InfoExtractor
+from .senategov import SenateISVPIE
+from .ustream import UstreamIE
 from ..compat import compat_HTMLParseError
 from ..utils import (
-    determine_ext,
     ExtractorError,
+    determine_ext,
     extract_attributes,
     find_xpath_attr,
     get_element_by_attribute,
@@ -19,8 +21,6 @@ from ..utils import (
     str_to_int,
     unescapeHTML,
 )
-from .senategov import SenateISVPIE
-from .ustream import UstreamIE
 
 
 class CSpanIE(InfoExtractor):

yt_dlp/extractor/ctsnews.py

@@ -1,6 +1,6 @@
 from .common import InfoExtractor
-from ..utils import unified_timestamp
 from .youtube import YoutubeIE
+from ..utils import unified_timestamp
 
 
 class CtsNewsIE(InfoExtractor):

yt_dlp/extractor/dailymail.py

@@ -1,8 +1,8 @@
 from .common import InfoExtractor
 from ..compat import compat_str
 from ..utils import (
-    int_or_none,
     determine_protocol,
+    int_or_none,
     try_get,
     unescapeHTML,
 )

yt_dlp/extractor/damtomo.py

@@ -1,8 +1,8 @@
 import re
 
 from .common import InfoExtractor
-from ..utils import ExtractorError, clean_html, int_or_none, try_get, unified_strdate
 from ..compat import compat_str
+from ..utils import ExtractorError, clean_html, int_or_none, try_get, unified_strdate
 
 
 class DamtomoBaseIE(InfoExtractor):

yt_dlp/extractor/democracynow.py

@@ -1,11 +1,11 @@
-import re
 import os.path
+import re
 
 from .common import InfoExtractor
 from ..compat import compat_urlparse
 from ..utils import (
-    url_basename,
     remove_start,
+    url_basename,
 )
 
 

yt_dlp/extractor/digitalconcerthall.py

@@ -1,5 +1,4 @@
 from .common import InfoExtractor
-
 from ..utils import (
     ExtractorError,
     parse_resolution,

yt_dlp/extractor/discoverygo.py

@@ -2,9 +2,9 @@ import re
 
 from .common import InfoExtractor
 from ..utils import (
+    ExtractorError,
     determine_ext,
     extract_attributes,
-    ExtractorError,
     int_or_none,
     parse_age_limit,
     remove_end,

yt_dlp/extractor/disney.py

@@ -2,10 +2,10 @@ import re
 
 from .common import InfoExtractor
 from ..utils import (
-    int_or_none,
-    unified_strdate,
     determine_ext,
+    int_or_none,
     join_nonempty,
+    unified_strdate,
     update_url_query,
 )
 

yt_dlp/extractor/douyutv.py

@@ -1,5 +1,5 @@
-import time
 import hashlib
+import time
 import urllib
 import uuid
 

yt_dlp/extractor/dplay.py

@@ -4,8 +4,8 @@ import uuid
 from .common import InfoExtractor
 from ..networking.exceptions import HTTPError
 from ..utils import (
-    determine_ext,
     ExtractorError,
+    determine_ext,
     float_or_none,
     int_or_none,
     remove_start,

yt_dlp/extractor/drtuber.py

@@ -2,8 +2,8 @@ import re
 
 from .common import InfoExtractor
 from ..utils import (
-    int_or_none,
     NO_DEFAULT,
+    int_or_none,
     parse_duration,
     str_to_int,
 )

yt_dlp/extractor/duboku.py

@@ -5,9 +5,9 @@ import urllib.parse
 from .common import InfoExtractor
 from ..compat import compat_urlparse
 from ..utils import (
+    ExtractorError,
     clean_html,
     extract_attributes,
-    ExtractorError,
     get_elements_by_class,
     int_or_none,
     js_to_json,

yt_dlp/extractor/dvtv.py

@@ -2,15 +2,15 @@ import re
 
 from .common import InfoExtractor
 from ..utils import (
-    determine_ext,
     ExtractorError,
+    determine_ext,
     int_or_none,
     join_nonempty,
     js_to_json,
     mimetype2ext,
+    parse_iso8601,
     try_get,
     unescapeHTML,
-    parse_iso8601,
 )
 
 

yt_dlp/extractor/dw.py

@@ -1,10 +1,10 @@
 from .common import InfoExtractor
+from ..compat import compat_urlparse
 from ..utils import (
     int_or_none,
     unified_strdate,
     url_or_none,
 )
-from ..compat import compat_urlparse
 
 
 class DWIE(InfoExtractor):

yt_dlp/extractor/ertgr.py

@@ -4,15 +4,15 @@ import re
 from .common import InfoExtractor
 from ..compat import compat_str
 from ..utils import (
+    ExtractorError,
     clean_html,
     determine_ext,
-    ExtractorError,
     dict_get,
     int_or_none,
     merge_dicts,
-    parse_qs,
     parse_age_limit,
     parse_iso8601,
+    parse_qs,
     str_or_none,
     try_get,
     url_or_none,

yt_dlp/extractor/europa.py

@@ -8,7 +8,7 @@ from ..utils import (
     qualities,
     traverse_obj,
     unified_strdate,
-    xpath_text
+    xpath_text,
 )
 
 

yt_dlp/extractor/euscreen.py

@@ -1,8 +1,7 @@
 from .common import InfoExtractor
-
 from ..utils import (
-    parse_duration,
     js_to_json,
+    parse_duration,
 )
 
 

yt_dlp/extractor/eyedotv.py

@@ -1,8 +1,8 @@
 from .common import InfoExtractor
 from ..utils import (
-    xpath_text,
-    parse_duration,
     ExtractorError,
+    parse_duration,
+    xpath_text,
 )
 
 

yt_dlp/extractor/fancode.py

@@ -1,12 +1,6 @@
 from .common import InfoExtractor
-
 from ..compat import compat_str
-from ..utils import (
-    parse_iso8601,
-    ExtractorError,
-    try_get,
-    mimetype2ext
-)
+from ..utils import ExtractorError, mimetype2ext, parse_iso8601, try_get
 
 
 class FancodeVodIE(InfoExtractor):

yt_dlp/extractor/faz.py

@@ -3,9 +3,9 @@ import re
 from .common import InfoExtractor
 from ..compat import compat_etree_fromstring
 from ..utils import (
+    int_or_none,
     xpath_element,
     xpath_text,
-    int_or_none,
 )
 
 

yt_dlp/extractor/fczenit.py

@@ -1,7 +1,7 @@
 from .common import InfoExtractor
 from ..utils import (
-    int_or_none,
     float_or_none,
+    int_or_none,
 )
 
 

yt_dlp/extractor/fifa.py

@@ -1,5 +1,4 @@
 from .common import InfoExtractor
-
 from ..utils import (
     int_or_none,
     traverse_obj,

yt_dlp/extractor/filmon.py

@@ -2,10 +2,10 @@ from .common import InfoExtractor
 from ..compat import compat_str
 from ..networking.exceptions import HTTPError
 from ..utils import (
+    ExtractorError,
+    int_or_none,
     qualities,
     strip_or_none,
-    int_or_none,
-    ExtractorError,
 )
 
 

yt_dlp/extractor/gab.py

@@ -7,7 +7,7 @@ from ..utils import (
     parse_codecs,
     parse_duration,
     str_to_int,
-    unified_timestamp
+    unified_timestamp,
 )
 
 

yt_dlp/extractor/gamejolt.py

@@ -10,7 +10,7 @@ from ..utils import (
     int_or_none,
     str_or_none,
     traverse_obj,
-    try_get
+    try_get,
 )
 
 

yt_dlp/extractor/gaskrank.py

@@ -1,4 +1,5 @@
 import re
+
 from .common import InfoExtractor
 from ..utils import (
     float_or_none,

yt_dlp/extractor/generic.py

@@ -4,7 +4,7 @@ import types
 import urllib.parse
 import xml.etree.ElementTree
 
-from .common import InfoExtractor  # isort: split
+from .common import InfoExtractor
 from .commonprotocols import RtmpIE
 from .youtube import YoutubeIE
 from ..compat import compat_etree_fromstring

yt_dlp/extractor/gettr.py

@@ -1,7 +1,7 @@
 from .common import InfoExtractor
 from ..utils import (
-    bool_or_none,
     ExtractorError,
+    bool_or_none,
     dict_get,
     float_or_none,
     int_or_none,

yt_dlp/extractor/gigya.py

@@ -1,5 +1,4 @@
 from .common import InfoExtractor
-
 from ..utils import (
     ExtractorError,
     urlencode_postdata,

yt_dlp/extractor/glomex.py

@@ -3,9 +3,9 @@ import urllib.parse
 
 from .common import InfoExtractor
 from ..utils import (
+    ExtractorError,
     determine_ext,
     extract_attributes,
-    ExtractorError,
     int_or_none,
     parse_qs,
     smuggle_url,

yt_dlp/extractor/go.py

@@ -3,16 +3,16 @@ import re
 from .adobepass import AdobePassIE
 from ..compat import compat_str
 from ..utils import (
-    int_or_none,
-    determine_ext,
-    parse_age_limit,
-    remove_start,
-    remove_end,
-    try_get,
-    urlencode_postdata,
     ExtractorError,
-    unified_timestamp,
+    determine_ext,
+    int_or_none,
+    parse_age_limit,
+    remove_end,
+    remove_start,
     traverse_obj,
+    try_get,
+    unified_timestamp,
+    urlencode_postdata,
 )
 
 

yt_dlp/extractor/godresource.py

@@ -4,7 +4,7 @@ from ..utils import (
     determine_ext,
     str_or_none,
     unified_timestamp,
-    url_or_none
+    url_or_none,
 )
 from ..utils.traversal import traverse_obj
 

yt_dlp/extractor/gofile.py

@@ -1,10 +1,7 @@
 import hashlib
 
 from .common import InfoExtractor
-from ..utils import (
-    ExtractorError,
-    try_get
-)
+from ..utils import ExtractorError, try_get
 
 
 class GofileIE(InfoExtractor):

yt_dlp/extractor/gotostage.py

@@ -1,11 +1,8 @@
+import json
+
 from .common import InfoExtractor
 from ..compat import compat_str
-from ..utils import (
-    try_get,
-    url_or_none
-)
-
-import json
+from ..utils import try_get, url_or_none
 
 
 class GoToStageIE(InfoExtractor):

yt_dlp/extractor/hbo.py

@@ -2,11 +2,11 @@ import re
 
 from .common import InfoExtractor
 from ..utils import (
-    xpath_text,
-    xpath_element,
     int_or_none,
     parse_duration,
     urljoin,
+    xpath_element,
+    xpath_text,
 )
 
 

yt_dlp/extractor/hearthisat.py

@@ -1,7 +1,7 @@
 from .common import InfoExtractor
 from ..utils import (
-    determine_ext,
     KNOWN_EXTENSIONS,
+    determine_ext,
     str_to_int,
 )
 

yt_dlp/extractor/hketv.py

@@ -1,8 +1,8 @@
 from .common import InfoExtractor
 from ..compat import compat_str
 from ..utils import (
-    clean_html,
     ExtractorError,
+    clean_html,
     int_or_none,
     merge_dicts,
     parse_count,

yt_dlp/extractor/hrti.py

@@ -4,8 +4,8 @@ from .common import InfoExtractor
 from ..networking import Request
 from ..networking.exceptions import HTTPError
 from ..utils import (
-    clean_html,
     ExtractorError,
+    clean_html,
     int_or_none,
     parse_age_limit,
     try_get,

yt_dlp/extractor/huya.py

@@ -2,8 +2,8 @@ import hashlib
 import random
 import re
 
-from ..compat import compat_urlparse, compat_b64decode
-
+from .common import InfoExtractor
+from ..compat import compat_b64decode, compat_urlparse
 from ..utils import (
     ExtractorError,
     int_or_none,
@@ -13,8 +13,6 @@ from ..utils import (
     update_url_query,
 )
 
-from .common import InfoExtractor
-
 
 class HuyaLiveIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.|m\.)?huya\.com/(?P<id>[^/#?&]+)(?:\D|$)'

yt_dlp/extractor/ichinanalive.py

@@ -1,6 +1,6 @@
 from .common import InfoExtractor
-from ..utils import ExtractorError, str_or_none, traverse_obj, unified_strdate
 from ..compat import compat_str
+from ..utils import ExtractorError, str_or_none, traverse_obj, unified_strdate
 
 
 class IchinanaLiveIE(InfoExtractor):

yt_dlp/extractor/infoq.py

@@ -1,3 +1,4 @@
+from .bokecc import BokeCCBaseIE
 from ..compat import (
     compat_b64decode,
     compat_urllib_parse_unquote,
@@ -6,10 +7,9 @@ from ..compat import (
 from ..utils import (
     ExtractorError,
     determine_ext,
-    update_url_query,
     traverse_obj,
+    update_url_query,
 )
-from .bokecc import BokeCCBaseIE
 
 
 class InfoQIE(BokeCCBaseIE):

yt_dlp/extractor/iprima.py

@@ -3,12 +3,12 @@ import time
 
 from .common import InfoExtractor
 from ..utils import (
+    ExtractorError,
     determine_ext,
     js_to_json,
-    urlencode_postdata,
-    ExtractorError,
     parse_qs,
-    traverse_obj
+    traverse_obj,
+    urlencode_postdata,
 )
 
 

yt_dlp/extractor/iqiyi.py

@@ -4,20 +4,16 @@ import re
 import time
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_str,
-    compat_urllib_parse_urlencode,
-    compat_urllib_parse_unquote
-)
 from .openload import PhantomJSwrapper
+from ..compat import compat_str, compat_urllib_parse_unquote, compat_urllib_parse_urlencode
 from ..utils import (
+    ExtractorError,
     clean_html,
     decode_packed_codes,
-    ExtractorError,
     float_or_none,
     format_field,
-    get_element_by_id,
     get_element_by_attribute,
+    get_element_by_id,
     int_or_none,
     js_to_json,
     ohdave_rsa_encrypt,

yt_dlp/extractor/itprotv.py

@@ -1,12 +1,11 @@
 import re
 
 from .common import InfoExtractor
-
 from ..utils import (
     int_or_none,
     str_or_none,
     traverse_obj,
-    urljoin
+    urljoin,
 )
 
 

yt_dlp/extractor/itv.py

@@ -1,23 +1,22 @@
 import json
 
-from .common import InfoExtractor
 from .brightcove import BrightcoveNewIE
-
+from .common import InfoExtractor
 from ..compat import compat_str
 from ..utils import (
+    JSON_LD_RE,
+    ExtractorError,
     base_url,
     clean_html,
     determine_ext,
     extract_attributes,
-    ExtractorError,
     get_element_by_class,
-    JSON_LD_RE,
     merge_dicts,
     parse_duration,
     smuggle_url,
     try_get,
-    url_or_none,
     url_basename,
+    url_or_none,
     urljoin,
 )
 

yt_dlp/extractor/iwara.py

@@ -1,9 +1,9 @@
 import functools
-import urllib.parse
-import urllib.error
 import hashlib
 import json
 import time
+import urllib.error
+import urllib.parse
 
 from .common import InfoExtractor
 from ..utils import (

yt_dlp/extractor/jamendo.py

@@ -1,8 +1,8 @@
 import hashlib
 import random
 
-from ..compat import compat_str
 from .common import InfoExtractor
+from ..compat import compat_str
 from ..utils import (
     clean_html,
     int_or_none,

yt_dlp/extractor/japandiet.py

@@ -1,5 +1,6 @@
 import re
 
+from .common import InfoExtractor
 from ..utils import (
     ExtractorError,
     clean_html,
@@ -9,9 +10,8 @@ from ..utils import (
     smuggle_url,
     traverse_obj,
     try_call,
-    unsmuggle_url
+    unsmuggle_url,
 )
-from .common import InfoExtractor
 
 
 def _parse_japanese_date(text):

yt_dlp/extractor/jove.py

@@ -1,8 +1,5 @@
 from .common import InfoExtractor
-from ..utils import (
-    ExtractorError,
-    unified_strdate
-)
+from ..utils import ExtractorError, unified_strdate
 
 
 class JoveIE(InfoExtractor):

yt_dlp/extractor/jstream.py

@@ -1,6 +1,6 @@
 import base64
-import re
 import json
+import re
 
 from .common import InfoExtractor
 from ..utils import (

yt_dlp/extractor/kakao.py

@@ -3,8 +3,8 @@ from ..networking.exceptions import HTTPError
 from ..utils import (
     ExtractorError,
     int_or_none,
-    strip_or_none,
     str_or_none,
+    strip_or_none,
     traverse_obj,
     unified_timestamp,
 )

yt_dlp/extractor/kaltura.py

@@ -4,18 +4,18 @@ import re
 
 from .common import InfoExtractor
 from ..compat import (
-    compat_urlparse,
     compat_parse_qs,
+    compat_urlparse,
 )
 from ..utils import (
-    clean_html,
     ExtractorError,
+    clean_html,
     format_field,
     int_or_none,
-    unsmuggle_url,
+    remove_start,
     smuggle_url,
     traverse_obj,
-    remove_start
+    unsmuggle_url,
 )
 
 

yt_dlp/extractor/kankanews.py

@@ -1,7 +1,7 @@
-import time
+import hashlib
 import random
 import string
-import hashlib
+import time
 import urllib.parse
 
 from .common import InfoExtractor