diff options
Diffstat (limited to 'yt_dlp')
-rw-r--r-- | yt_dlp/YoutubeDL.py | 1 | ||||
-rw-r--r-- | yt_dlp/__init__.py | 1 | ||||
-rw-r--r-- | yt_dlp/__main__.py | 1 | ||||
-rw-r--r-- | yt_dlp/compat/__init__.py | 1 | ||||
-rw-r--r-- | yt_dlp/compat/_legacy.py | 3 | ||||
-rw-r--r-- | yt_dlp/compat/compat_utils.py | 1 | ||||
-rw-r--r-- | yt_dlp/cookies.py | 2 | ||||
-rw-r--r-- | yt_dlp/downloader/http.py | 2 | ||||
-rw-r--r-- | yt_dlp/extractor/common.py | 6 | ||||
-rw-r--r-- | yt_dlp/extractor/iwara.py | 4 | ||||
-rw-r--r-- | yt_dlp/extractor/nebula.py | 2 | ||||
-rw-r--r-- | yt_dlp/extractor/shared.py | 2 | ||||
-rw-r--r-- | yt_dlp/extractor/urort.py | 2 | ||||
-rw-r--r-- | yt_dlp/utils.py | 5 |
14 files changed, 12 insertions, 21 deletions
diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py index df4eef4e2..94aaaeb60 100644 --- a/yt_dlp/YoutubeDL.py +++ b/yt_dlp/YoutubeDL.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python3 import collections import contextlib import datetime diff --git a/yt_dlp/__init__.py b/yt_dlp/__init__.py index a5921c565..357be861b 100644 --- a/yt_dlp/__init__.py +++ b/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' diff --git a/yt_dlp/__main__.py b/yt_dlp/__main__.py index c9d275b86..ff5d71d3c 100644 --- a/yt_dlp/__main__.py +++ b/yt_dlp/__main__.py @@ -1,4 +1,5 @@ #!/usr/bin/env python3 + # Execute with # $ python -m yt_dlp diff --git a/yt_dlp/compat/__init__.py b/yt_dlp/compat/__init__.py index 3a91fad0e..9f8e8c3e5 100644 --- a/yt_dlp/compat/__init__.py +++ b/yt_dlp/compat/__init__.py @@ -7,7 +7,6 @@ from . import re 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( diff --git a/yt_dlp/compat/_legacy.py b/yt_dlp/compat/_legacy.py index 2b33638b6..49bb13a3c 100644 --- a/yt_dlp/compat/_legacy.py +++ b/yt_dlp/compat/_legacy.py @@ -22,7 +22,7 @@ import urllib.request 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 Cryptodome_AES as compat_pycrypto_AES # noqa: F401 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')) diff --git a/yt_dlp/compat/compat_utils.py b/yt_dlp/compat/compat_utils.py index 79e253056..82e176281 100644 --- a/yt_dlp/compat/compat_utils.py +++ b/yt_dlp/compat/compat_utils.py @@ -4,7 +4,6 @@ import importlib import sys import types - _NO_ATTRIBUTE = object() _Package = collections.namedtuple('Package', ('name', 'version')) diff --git a/yt_dlp/cookies.py b/yt_dlp/cookies.py index 6811a7288..e2ff8c39f 100644 --- a/yt_dlp/cookies.py +++ b/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 @@ import time 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, diff --git a/yt_dlp/downloader/http.py b/yt_dlp/downloader/http.py index ca5b26498..6b59320b8 100644 --- a/yt_dlp/downloader/http.py +++ b/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 ( diff --git a/yt_dlp/extractor/common.py b/yt_dlp/extractor/common.py index 1c3d4af2c..4c37044f6 100644 --- a/yt_dlp/extractor/common.py +++ b/yt_dlp/extractor/common.py @@ -2,6 +2,9 @@ import base64 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 sys 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 ( diff --git a/yt_dlp/extractor/iwara.py b/yt_dlp/extractor/iwara.py index 32ebd2ba6..f77c5d44d 100644 --- a/yt_dlp/extractor/iwara.py +++ b/yt_dlp/extractor/iwara.py @@ -7,10 +7,10 @@ from ..utils import ( int_or_none, mimetype2ext, remove_end, + strip_or_none, + unified_strdate, url_or_none, urljoin, - unified_strdate, - strip_or_none, ) diff --git a/yt_dlp/extractor/nebula.py b/yt_dlp/extractor/nebula.py index 9478f3aa3..7057b8b26 100644 --- a/yt_dlp/extractor/nebula.py +++ b/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 diff --git a/yt_dlp/extractor/shared.py b/yt_dlp/extractor/shared.py index 31c0080ba..9a237b320 100644 --- a/yt_dlp/extractor/shared.py +++ b/yt_dlp/extractor/shared.py @@ -1,5 +1,3 @@ - - import urllib.parse from .common import InfoExtractor diff --git a/yt_dlp/extractor/urort.py b/yt_dlp/extractor/urort.py index be508f434..3f687f737 100644 --- a/yt_dlp/extractor/urort.py +++ b/yt_dlp/extractor/urort.py @@ -1,5 +1,3 @@ - - import urllib.parse from .common import InfoExtractor diff --git a/yt_dlp/utils.py b/yt_dlp/utils.py index 6b02eb450..7327f3150 100644 --- a/yt_dlp/utils.py +++ b/yt_dlp/utils.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python3 import atexit import base64 import binascii @@ -16,6 +15,8 @@ import hashlib 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.parse 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 ( |