Backport to Python 3.7

Author: sergeybe2

devscripts/install_deps.py

@@ -48,7 +48,8 @@ def main():
 
     def yield_deps(group):
         for dep in group:
-            if mobj := recursive_pattern.fullmatch(dep):
+            mobj = recursive_pattern.fullmatch(dep)
+            if mobj:
                 yield from optional_groups.get(mobj.group('group_name'), [])
             else:
                 yield dep

devscripts/make_changelog.py

@@ -35,7 +35,7 @@ class CommitGroup(enum.Enum):
     MISC = 'Misc.'
 
     @classmethod
-    @lru_cache
+    @lru_cache()
     def subgroup_lookup(cls):
         return {
             name: group
@@ -56,7 +56,7 @@ def subgroup_lookup(cls):
         }
 
     @classmethod
-    @lru_cache
+    @lru_cache()
     def group_lookup(cls):
         result = {
             'fd': cls.DOWNLOADER,

devscripts/tomlparse.py

@@ -64,19 +64,22 @@ def get_target(root: dict, paths: list[str], is_list=False):
 def parse_enclosed(data: str, index: int, end: str, ws_re: re.Pattern):
     index += 1
 
-    if match := ws_re.match(data, index):
+    match = ws_re.match(data, index)
+    if match:
         index = match.end()
 
     while data[index] != end:
         index = yield True, index
 
-        if match := ws_re.match(data, index):
+        match = ws_re.match(data, index)
+        if match:
             index = match.end()
 
         if data[index] == ',':
             index += 1
 
-        if match := ws_re.match(data, index):
+        match = ws_re.match(data, index)
+        if match:
             index = match.end()
 
     assert data[index] == end
@@ -106,7 +109,8 @@ def parse_value(data: str, index: int):
 
         return index, result
 
-    if match := STRING_RE.match(data, index):
+    match = STRING_RE.match(data, index)
+    if match:
         return match.end(), json.loads(match[0]) if match[0][0] == '"' else match[0][1:-1]
 
     match = LEFTOVER_VALUE_RE.match(data, index)

pyproject.toml

@@ -12,7 +12,7 @@ maintainers = [
 ]
 description = "A feature-rich command-line audio/video downloader"
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.7"
 keywords = [
     "youtube-dl",
     "video-downloader",
@@ -28,6 +28,7 @@ classifiers = [
     "Environment :: Console",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
@@ -48,7 +49,7 @@ dependencies = [
     "pycryptodomex",
     "requests>=2.31.0,<3",
     "urllib3>=1.26.17,<3",
-    "websockets>=12.0",
+    "websockets>=11.0.0",
 ]
 
 [project.optional-dependencies]

setup.cfg

@@ -16,20 +16,23 @@ remove-unused-variables = true
 
 [tox:tox]
 skipsdist = true
-envlist = py{38,39,310,311,312},pypy{38,39,310}
+envlist = py{37,38,39,310,311,312},pypy{37,38,39,310}
 skip_missing_interpreters = true
 
 [testenv]  # tox
 deps =
     pytest
+    requests
+    curl-cffi
+    websockets
 commands = pytest {posargs:"-m not download"}
 passenv = HOME  # For test_compat_expanduser
 setenv =
     # PYTHONWARNINGS = error  # Catches PIP's warnings too
 
 
 [isort]
-py_version = 38
+py_version = 37
 multi_line_output = VERTICAL_HANGING_INDENT
 line_length = 80
 reverse_relative = true

test/test_traversal.py

@@ -402,7 +402,7 @@ def test_traversal_morsel(self):
             'secure': 'f',
             'httponly': 'g',
             'version': 'h',
-            'samesite': 'i',
+            # 'samesite': 'i',
         }
         morsel = http.cookies.Morsel()
         morsel.set('item_key', 'item_value', 'coded_value')

yt_dlp/YoutubeDL.py

@@ -718,7 +718,8 @@ def check_deprecated(param, option, suggestion):
         for msg in self.params.get('_deprecation_warnings', []):
             self.deprecated_feature(msg)
 
-        if impersonate_target := self.params.get('impersonate'):
+        impersonate_target = self.params.get('impersonate')
+        if impersonate_target:
             if not self._impersonate_target_available(impersonate_target):
                 raise YoutubeDLError(
                     f'Impersonate target "{impersonate_target}" is not available. '
@@ -2680,10 +2681,14 @@ def _fill_common_fields(self, info_dict, final=True):
             if new_key in info_dict and old_key in info_dict:
                 if '_version' not in info_dict:  # HACK: Do not warn when using --load-info-json
                     self.deprecation_warning(f'Do not return {old_key!r} when {new_key!r} is present')
-            elif old_value := info_dict.get(old_key):
-                info_dict[new_key] = old_value.split(', ')
-            elif new_value := info_dict.get(new_key):
-                info_dict[old_key] = ', '.join(v.replace(',', '\N{FULLWIDTH COMMA}') for v in new_value)
+            else:
+                old_value = info_dict.get(old_key)
+                if old_value:
+                    info_dict[new_key] = old_value.split(', ')
+                else:
+                    new_value = info_dict.get(new_key)
+                    if new_value:
+                        info_dict[old_key] = ', '.join(v.replace(',', '\N{FULLWIDTH COMMA}') for v in new_value)
 
     def _raise_pending_errors(self, info):
         err = info.pop('__pending_error', None)

yt_dlp/__init__.py

@@ -1,8 +1,8 @@
 import sys
 
-if sys.version_info < (3, 8):
+if sys.version_info < (3, 7):
     raise ImportError(
-        f'You are using an unsupported version of Python. Only Python versions 3.8 and above are supported by yt-dlp')  # noqa: F541
+        f'You are using an unsupported version of Python. Only Python versions 3.7 and above are supported by yt-dlp')  # noqa: F541
 
 __license__ = 'The Unlicense'
 

yt_dlp/compat/functools.py

@@ -10,3 +10,17 @@
     cache  # >= 3.9
 except NameError:
     cache = lru_cache(maxsize=None)
+
+try:
+    cached_property  # >= 3.8
+except NameError:
+    class cached_property:
+        def __init__(self, func):
+            update_wrapper(self, func)
+            self.func = func
+
+        def __get__(self, instance, _):
+            if instance is None:
+                return self
+            setattr(instance, self.func.__name__, self.func(instance))
+            return getattr(instance, self.func.__name__)

yt_dlp/compat/shlex.py

@@ -0,0 +1,15 @@
+# flake8: noqa: F405
+from shlex import *  # noqa: F403
+
+from .compat_utils import passthrough_module
+
+passthrough_module(__name__, 'shlex')
+del passthrough_module
+
+
+try:
+    join
+except NameError:
+    def join(split_command):
+        """Return a shell-escaped string from *split_command*."""
+        return ' '.join(quote(arg) for arg in split_command)