[cleanup] Consistent style for file heads

devscripts/bash-completion.py

@@ -1,9 +1,12 @@
 #!/usr/bin/env python3
+
+# Allow direct execution
 import os
 import sys
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
+
 import yt_dlp
 
 BASH_COMPLETION_FILE = "completions/bash/yt-dlp"

devscripts/fish-completion.py

@@ -1,10 +1,14 @@
 #!/usr/bin/env python3
-import optparse
+
+# Allow direct execution
 import os
 import sys
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
+
+import optparse
+
 import yt_dlp
 from yt_dlp.utils import shell_quote
 

devscripts/generate_aes_testdata.py

@@ -1,11 +1,15 @@
 #!/usr/bin/env python3
-import codecs
+
+# Allow direct execution
 import os
-import subprocess
 import sys
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
+
+import codecs
+import subprocess
+
 from yt_dlp.aes import aes_encrypt, key_expansion
 from yt_dlp.utils import intlist_to_bytes
 

devscripts/make_contributing.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 import optparse
 import re
 

devscripts/make_issue_template.py

@@ -1,4 +1,12 @@
 #!/usr/bin/env python3
+
+# Allow direct execution
+import os
+import sys
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+
 import optparse
 
 
@@ -7,7 +15,7 @@ def read(fname):
         return f.read()
 
 
-# Get the version from yt_dlp/version.py without importing the package
+# Get the version without importing the package
 def read_version(fname):
     exec(compile(read(fname), fname, 'exec'))
     return locals()['__version__']

devscripts/make_lazy_extractors.py

@@ -1,12 +1,15 @@
 #!/usr/bin/env python3
-import optparse
+
+# Allow direct execution
 import os
 import sys
-from inspect import getsource
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
+import optparse
+from inspect import getsource
+
 NO_ATTR = object()
 STATIC_CLASS_PROPERTIES = ['IE_NAME', 'IE_DESC', 'SEARCH_KEY', '_WORKING', '_NETRC_MACHINE', 'age_limit']
 CLASS_METHODS = [

devscripts/make_readme.py

@@ -1,7 +1,11 @@
 #!/usr/bin/env python3
 
-# yt-dlp --help | make_readme.py
-# This must be run in a console of correct width
+"""
+yt-dlp --help | make_readme.py
+This must be run in a console of correct width
+"""
+
+
 import functools
 import re
 import sys

devscripts/make_supportedsites.py

@@ -1,10 +1,14 @@
 #!/usr/bin/env python3
-import optparse
+
+# Allow direct execution
 import os
 import sys
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
+
+import optparse
+
 from yt_dlp.extractor import list_extractor_classes
 
 

devscripts/prepare_manpage.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 import optparse
 import os.path
 import re
@@ -23,7 +24,7 @@
 
 def main():
     parser = optparse.OptionParser(usage='%prog OUTFILE.md')
-    options, args = parser.parse_args()
+    _, args = parser.parse_args()
     if len(args) != 1:
         parser.error('Expected an output filename')
 

devscripts/update-version.py

@@ -1,4 +1,12 @@
 #!/usr/bin/env python3
+
+# Allow direct execution
+import os
+import sys
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+
 import subprocess
 import sys
 from datetime import datetime

devscripts/zsh-completion.py

@@ -1,9 +1,12 @@
 #!/usr/bin/env python3
+
+# Allow direct execution
 import os
 import sys
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
+
 import yt_dlp
 
 ZSH_COMPLETION_FILE = "completions/zsh/_yt-dlp"

pyinst.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 import os
 import platform
 import sys

setup.cfg

@@ -37,3 +37,5 @@ line_length = 80
 reverse_relative = true
 ensure_newline_before_comments = true
 include_trailing_comma = true
+known_first_party =
+    test

setup.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 import os.path
 import sys
 import warnings

test/test_InfoExtractor.py

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

test/test_YoutubeDL.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 # Allow direct execution
 import os
 import sys
@@ -6,6 +7,7 @@
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
+
 import copy
 import json
 import urllib.error

test/test_YoutubeDLCookieJar.py

@@ -1,12 +1,16 @@
 #!/usr/bin/env python3
+
+# Allow direct execution
 import os
-import re
 import sys
-import tempfile
 import unittest
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
+
+import re
+import tempfile
+
 from yt_dlp.utils import YoutubeDLCookieJar
 
 

test/test_aes.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 # Allow direct execution
 import os
 import sys
@@ -6,6 +7,7 @@
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
+
 import base64
 
 from yt_dlp.aes import (

test/test_age_restriction.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 # Allow direct execution
 import os
 import sys
@@ -6,8 +7,8 @@
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from test.helper import is_download_test, try_rm
 
+from test.helper import is_download_test, try_rm
 from yt_dlp import YoutubeDL
 
 

test/test_all_urls.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
+
 # Allow direct execution
-import collections
 import os
 import sys
 import unittest
@@ -8,8 +8,9 @@
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
-from test.helper import gettestcases
+import collections
 
+from test.helper import gettestcases
 from yt_dlp.extractor import FacebookIE, YoutubeIE, gen_extractors
 
 

test/test_cache.py

@@ -1,15 +1,16 @@
 #!/usr/bin/env python3
+
 # Allow direct execution
 import os
-import shutil
 import sys
 import unittest
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
-from test.helper import FakeYDL
+import shutil
 
+from test.helper import FakeYDL
 from yt_dlp.cache import Cache
 
 

test/test_compat.py

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

test/test_download.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 # Allow direct execution
 import os
 import sys
@@ -8,10 +9,10 @@
 
 
 import hashlib
+import http.client
 import json
 import socket
 import urllib.error
-import http.client
 
 from test.helper import (
     assertGreaterEqual,
@@ -23,6 +24,7 @@
     report_warning,
     try_rm,
 )
+
 import yt_dlp.YoutubeDL  # isort: split
 from yt_dlp.compat import compat_HTTPError
 from yt_dlp.extractor import get_info_extractor

test/test_downloader_http.py

@@ -1,17 +1,18 @@
 #!/usr/bin/env python3
+
 # Allow direct execution
 import os
 import sys
 import unittest
-import http.server
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
+import http.server
 import re
 import threading
-from test.helper import http_server_port, try_rm
 
+from test.helper import http_server_port, try_rm
 from yt_dlp import YoutubeDL
 from yt_dlp.downloader.http import HttpFD
 from yt_dlp.utils import encodeFilename

test/test_execution.py

@@ -1,12 +1,16 @@
 #!/usr/bin/env python3
-import contextlib
+
+# Allow direct execution
 import os
-import subprocess
 import sys
 import unittest
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
+
+import contextlib
+import subprocess
+
 from yt_dlp.utils import encodeArgument
 
 rootDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))

test/test_http.py

@@ -1,18 +1,19 @@
 #!/usr/bin/env python3
+
 # Allow direct execution
 import os
 import sys
 import unittest
-import http.server
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
+import http.server
 import ssl
 import threading
 import urllib.request
-from test.helper import http_server_port
 
+from test.helper import http_server_port
 from yt_dlp import YoutubeDL
 
 TEST_DIR = os.path.dirname(os.path.abspath(__file__))

test/test_iqiyi_sdk_interpreter.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 # Allow direct execution
 import os
 import sys
@@ -6,8 +7,8 @@
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from test.helper import FakeYDL, is_download_test
 
+from test.helper import FakeYDL, is_download_test
 from yt_dlp.extractor import IqiyiIE
 
 

test/test_jsinterp.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 # Allow direct execution
 import os
 import sys
@@ -6,6 +7,7 @@
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
+
 from yt_dlp.jsinterp import JSInterpreter
 
 

test/test_netrc.py

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

test/test_overwrites.py

@@ -1,11 +1,15 @@
 #!/usr/bin/env python3
+
+# Allow direct execution
 import os
-import subprocess
 import sys
 import unittest
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
+
+import subprocess
+
 from test.helper import is_download_test, try_rm
 
 root_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))

test/test_post_hooks.py

@@ -1,13 +1,15 @@
 #!/usr/bin/env python3
+
+# Allow direct execution
 import os
 import sys
 import unittest
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from test.helper import get_params, is_download_test, try_rm
 
-import yt_dlp.YoutubeDL
+from test.helper import get_params, is_download_test, try_rm
+import yt_dlp.YoutubeDL  # isort: split
 from yt_dlp.utils import DownloadError
 
 

test/test_postprocessors.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 # Allow direct execution
 import os
 import sys
@@ -6,6 +7,7 @@
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
+
 from yt_dlp import YoutubeDL
 from yt_dlp.compat import compat_shlex_quote
 from yt_dlp.postprocessor import (

test/test_socks.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 # Allow direct execution
 import os
 import sys
@@ -6,6 +7,7 @@
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
+
 import random
 import subprocess
 import urllib.request

test/test_subtitles.py

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

test/test_update.py.disabled

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

test/test_utils.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
+
 # Allow direct execution
-import contextlib
 import os
 import sys
 import unittest
@@ -8,7 +8,7 @@
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
-# Various small unit tests
+import contextlib
 import io
 import itertools
 import json

test/test_verbose_output.py

@@ -1,11 +1,15 @@
 #!/usr/bin/env python3
+
+# Allow direct execution
 import os
-import subprocess
 import sys
 import unittest
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
+
+import subprocess
+
 rootDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 

test/test_write_annotations.py.disabled

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 # Allow direct execution
 import os
 import sys
@@ -6,11 +7,12 @@ import unittest
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
+
 import xml.etree.ElementTree
-from test.helper import get_params, is_download_test, try_rm
 
 import yt_dlp.extractor
 import yt_dlp.YoutubeDL
+from test.helper import get_params, is_download_test, try_rm
 
 
 class YoutubeDL(yt_dlp.YoutubeDL):

test/test_youtube_lists.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 # Allow direct execution
 import os
 import sys
@@ -6,8 +7,8 @@
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from test.helper import FakeYDL, is_download_test
 
+from test.helper import FakeYDL, is_download_test
 from yt_dlp.extractor import YoutubeIE, YoutubeTabIE
 
 

test/test_youtube_misc.py

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

test/test_youtube_signature.py

@@ -1,17 +1,19 @@
 #!/usr/bin/env python3
+
 # Allow direct execution
-import contextlib
 import os
 import sys
 import unittest
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
+
+import contextlib
 import re
 import string
 import urllib.request
-from test.helper import FakeYDL, is_download_test
 
+from test.helper import FakeYDL, is_download_test
 from yt_dlp.compat import compat_str
 from yt_dlp.extractor import YoutubeIE
 from yt_dlp.jsinterp import JSInterpreter

yt_dlp/YoutubeDL.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 import collections
 import contextlib
 import datetime

yt_dlp/__init__.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 f'You are using an unsupported version of Python. Only Python versions 3.6 and above are supported by yt-dlp'  # noqa: F541
 
 __license__ = 'Public Domain'

yt_dlp/__main__.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 # Execute with
 # $ python -m yt_dlp
 

yt_dlp/compat/__init__.py

@@ -7,7 +7,6 @@
 from ._deprecated import *  # noqa: F401, F403
 from .compat_utils import passthrough_module
 
-
 # XXX: Implement this the same way as other DeprecationWarnings without circular import
 try:
     passthrough_module(__name__, '._legacy', callback=lambda attr: warnings.warn(

yt_dlp/compat/_legacy.py

@@ -22,7 +22,7 @@
 import xml.etree.ElementTree as etree
 from subprocess import DEVNULL
 
-from .compat_utils import passthrough_module
+from .compat_utils import passthrough_module  # isort: split
 from .asyncio import run as compat_asyncio_run  # noqa: F401
 from .re import Pattern as compat_Pattern  # noqa: F401
 from .re import match as compat_Match  # noqa: F401
@@ -30,7 +30,6 @@
 from ..dependencies import brotli as compat_brotli  # noqa: F401
 from ..dependencies import websockets as compat_websockets  # noqa: F401
 
-
 passthrough_module(__name__, '...utils', ('WINDOWS_VT_MODE', 'windows_enable_vt_mode'))
 
 

yt_dlp/compat/compat_utils.py

@@ -4,7 +4,6 @@
 import sys
 import types
 
-
 _NO_ATTRIBUTE = object()
 
 _Package = collections.namedtuple('Package', ('name', 'version'))

yt_dlp/cookies.py

@@ -1,5 +1,6 @@
 import contextlib
 import ctypes
+import http.cookiejar
 import json
 import os
 import shutil
@@ -11,7 +12,6 @@
 from datetime import datetime, timedelta, timezone
 from enum import Enum, auto
 from hashlib import pbkdf2_hmac
-import http.cookiejar
 
 from .aes import (
     aes_cbc_decrypt_bytes,

yt_dlp/downloader/http.py

@@ -1,10 +1,10 @@
+import http.client
 import os
 import random
 import socket
 import ssl
 import time
 import urllib.error
-import http.client
 
 from .common import FileDownloader
 from ..utils import (

yt_dlp/extractor/common.py

@@ -2,6 +2,9 @@
 import collections
 import getpass
 import hashlib
+import http.client
+import http.cookiejar
+import http.cookies
 import itertools
 import json
 import math
@@ -12,9 +15,6 @@
 import time
 import urllib.request
 import xml.etree.ElementTree
-import http.client
-import http.cookiejar
-import http.cookies
 
 from ..compat import functools, re  # isort: split
 from ..compat import (

yt_dlp/extractor/iwara.py

@@ -7,10 +7,10 @@
     int_or_none,
     mimetype2ext,
     remove_end,
+    strip_or_none,
+    unified_strdate,
     url_or_none,
     urljoin,
-    unified_strdate,
-    strip_or_none,
 )
 
 

yt_dlp/extractor/nebula.py

@@ -1,8 +1,8 @@
 import itertools
 import json
 import time
-import urllib.parse
 import urllib.error
+import urllib.parse
 
 from .common import InfoExtractor
 from ..utils import ExtractorError, parse_iso8601, try_get

yt_dlp/extractor/shared.py

@@ -1,5 +1,3 @@
-
-
 import urllib.parse
 
 from .common import InfoExtractor

yt_dlp/extractor/urort.py

@@ -1,5 +1,3 @@
-
-
 import urllib.parse
 
 from .common import InfoExtractor

yt_dlp/utils.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 import atexit
 import base64
 import binascii
@@ -16,6 +15,8 @@
 import hmac
 import html.entities
 import html.parser
+import http.client
+import http.cookiejar
 import importlib.util
 import io
 import itertools
@@ -42,8 +43,6 @@
 import urllib.request
 import xml.etree.ElementTree
 import zlib
-import http.client
-import http.cookiejar
 
 from .compat import asyncio, functools  # isort: split
 from .compat import (