streamlink 8.6.2__tar.gz → 8.6.3__tar.gz

{streamlink-8.6.2 → streamlink-8.6.3}/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## streamlink 8.6.3 (2026-10-29)
+
+- SECURITY: new minor release primarily for Streamlink's Windows / Linux AppImages builds, with `brotli 1.2.1` (via uv.lock) ([`CVE-2026-111497`](https://nvd.nist.gov/vuln/detail/CVE-2026-111497))
+- Fixed: `--retry-streams` and `--retry-max` in external/continuous HTTP output mode when re-fetching ([#7165](https://github.com/streamlink/streamlink/pull/7165))
+- Build: bumped `pycryptodome` version requirements to `>=3.4.3,<5` ([#7167](https://github.com/streamlink/streamlink/pull/7167))
+- Tests: fixed race-conditions in HLS tests ([#7174](https://github.com/streamlink/streamlink/pull/7174), [#7176](https://github.com/streamlink/streamlink/pull/7176))
+
+[Full changelog](https://github.com/streamlink/streamlink/compare/8.6.2...8.6.3)
+
+
 ## streamlink 8.6.2 (2026-10-07)
 
 - SECURITY: fixed arbitrary local file read via `file://` URLs in DASH `Location` tags (`CVE-2026-TO-BE-ASSIGNED` / [`GHSA-j7pf-m7gx-jr33`](https://github.com/streamlink/streamlink/security/advisories/GHSA-j7pf-m7gx-jr33)) ([`98781761`](https://github.com/streamlink/streamlink/commit/987817618f57b6def852693e4e0a95fd9c8437f2))

{streamlink-8.6.2 → streamlink-8.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: streamlink
-Version: 8.6.2
+Version: 8.6.3
 Summary: Streamlink is a command-line utility that extracts streams from various services and pipes them into a video player of choice.
 Author: Streamlink
 Author-email: streamlink@protonmail.com
@@ -36,7 +36,7 @@ Requires-Dist: exceptiongroup; python_version < "3.11"
 Requires-Dist: isodate
 Requires-Dist: lxml<8,>=5.0.0
 Requires-Dist: pycountry
-Requires-Dist: pycryptodome<4,>=3.4.3
+Requires-Dist: pycryptodome<5,>=3.4.3
 Requires-Dist: PySocks!=1.5.7,>=1.5.6
 Requires-Dist: requests<3,>=2.30.0
 Requires-Dist: trio<1,>=0.25.0; python_version >= "3.13"

{streamlink-8.6.2 → streamlink-8.6.3}/build_backend/test_plugins_json.py

@@ -199,8 +199,8 @@ def test_parse_sequence_or_mapping(parser: type[ast.NodeVisitor], code: str, exp
                 PluginMatcher(pattern="bar", flags=re.IGNORECASE, priority=None, name=None),
                 PluginMatcher(pattern="bar", flags=re.IGNORECASE, priority=None, name=None),
                 PluginMatcher(pattern="bar", flags=re.IGNORECASE, priority=None, name=None),
-                PluginMatcher(pattern="baz", flags=re.I | re.S | re.X, priority=None, name=None),
-                PluginMatcher(pattern="baz", flags=re.I | re.S | re.X, priority=None, name=None),
+                PluginMatcher(pattern="baz", flags=re.I | re.S | re.X, priority=None, name=None),  # ruff: ignore[regex-flag-alias]
+                PluginMatcher(pattern="baz", flags=re.I | re.S | re.X, priority=None, name=None),  # ruff: ignore[regex-flag-alias]
             ],
             does_not_raise,
             id="pattern",
@@ -1092,7 +1092,7 @@ def test_plugin(test_plugin_code: str):
     assert pluginvisitor.matchers == [
         PluginMatcher(pattern="https://a", flags=None, priority=None, name=None),
         PluginMatcher(pattern="https://b", flags=re.IGNORECASE, priority=PluginMatcher.LOW_PRIORITY, name="b"),
-        PluginMatcher(pattern="https://c", flags=re.I | re.X, priority=20, name="c"),
+        PluginMatcher(pattern="https://c", flags=re.IGNORECASE | re.VERBOSE, priority=20, name="c"),
     ]
     assert pluginvisitor.arguments == [
         PluginArgument(name="a", type="comma_list_filter", type_kwargs={"acceptable": ["a", "b"]}, default=["a"], help="a"),

{streamlink-8.6.2 → streamlink-8.6.3}/completions/bash/streamlink

@@ -216,7 +216,12 @@ _shtab_streamlink() {
       compgen -W "${current_action_choices[*]}" -- "$completing_word")
   fi
 
+  if [[ ${#COMPREPLY[@]} = 0 ]]; then
+    # native fallback matches are not necessarily filenames (e.g. variables)
+    compopt +o filenames 2>/dev/null || : # bash>=4
+  fi
+
   return 0
 }
 
-complete -F _shtab_streamlink streamlink
+complete -o bashdefault -F _shtab_streamlink streamlink

{streamlink-8.6.2 → streamlink-8.6.3}/docs/_build/man/streamlink.1

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "STREAMLINK" "1" "Oct 07, 2026" "8.6.2" "Streamlink"
+.TH "STREAMLINK" "1" "Oct 29, 2026" "8.6.3" "Streamlink"
 .SH NAME
 streamlink \- extracts streams from various services and pipes them into a video player of choice
 .SH SYNOPSIS

{streamlink-8.6.2 → streamlink-8.6.3}/docs/changelog.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## streamlink 8.6.3 (2026-10-29)
+
+- SECURITY: new minor release primarily for Streamlink's Windows / Linux AppImages builds, with `brotli 1.2.1` (via uv.lock) ([`CVE-2026-111497`](https://nvd.nist.gov/vuln/detail/CVE-2026-111497))
+- Fixed: `--retry-streams` and `--retry-max` in external/continuous HTTP output mode when re-fetching ([#7165](https://github.com/streamlink/streamlink/pull/7165))
+- Build: bumped `pycryptodome` version requirements to `>=3.4.3,<5` ([#7167](https://github.com/streamlink/streamlink/pull/7167))
+- Tests: fixed race-conditions in HLS tests ([#7174](https://github.com/streamlink/streamlink/pull/7174), [#7176](https://github.com/streamlink/streamlink/pull/7176))
+
+[Full changelog](https://github.com/streamlink/streamlink/compare/8.6.2...8.6.3)
+
+
 ## streamlink 8.6.2 (2026-10-07)
 
 - SECURITY: fixed arbitrary local file read via `file://` URLs in DASH `Location` tags (`CVE-2026-TO-BE-ASSIGNED` / [`GHSA-j7pf-m7gx-jr33`](https://github.com/streamlink/streamlink/security/advisories/GHSA-j7pf-m7gx-jr33)) ([`98781761`](https://github.com/streamlink/streamlink/commit/987817618f57b6def852693e4e0a95fd9c8437f2))

{streamlink-8.6.2 → streamlink-8.6.3}/docs/install.rst

@@ -187,6 +187,16 @@ Linux and BSD
       - .. code-block:: bash
 
             sudo dnf install streamlink
+    * - :octicon:`package-dependents` `FreeBSD (pkg)`_
+      - .. code-block:: bash
+
+            pkg install multimedia/streamlink
+
+    * - :octicon:`package-dependents` `FreeBSD (ports)`_
+      - .. code-block:: bash
+
+            cd /usr/ports/multimedia/streamlink
+            make config install clean
     * - :octicon:`package-dependents` `Gentoo Linux`_
       - .. code-block:: bash
 
@@ -223,6 +233,8 @@ Linux and BSD
 .. _Debian (sid, testing): https://packages.debian.org/sid/streamlink
 .. _Debian (stable): https://packages.debian.org/trixie-backports/streamlink
 .. _Fedora: https://src.fedoraproject.org/rpms/python-streamlink
+.. _FreeBSD (pkg): https://ports.freebsd.org/cgi/ports.cgi?query=streamlink&stype=name
+.. _FreeBSD (ports): https://www.freshports.org/multimedia/streamlink
 .. _Gentoo Linux: https://packages.gentoo.org/package/net-misc/streamlink
 .. _NixOS: https://github.com/NixOS/nixpkgs/tree/master/pkgs/by-name/st/streamlink
 .. _openSUSE: https://build.opensuse.org/package/show/multimedia:apps/streamlink

{streamlink-8.6.2 → streamlink-8.6.3}/pyproject.toml

@@ -60,7 +60,7 @@ dependencies = [
   "isodate",
   "lxml >=5.0.0,<8",
   "pycountry",
-  "pycryptodome >=3.4.3,<4",
+  "pycryptodome >=3.4.3,<5",
   "PySocks >=1.5.6,!=1.5.7",
   "requests >=2.30.0,<3",
   "trio >=0.25.0,<1 ; python_version>='3.13'",
@@ -108,14 +108,14 @@ test = [
   "freezegun >=1.5.0",
 ]
 lint = [
-  "ruff ==0.16.10",
+  "ruff ==0.17.3",
 ]
 typing = [
   { include-group = "test" },
   { include-group = "docs" },
   { include-group = "script" },
   # tools and typing dependencies
-  "ty ==0.0.85",
+  "ty ==0.0.92",
   "mypy[faster-cache] ==2.4.0",
   "typing-extensions >=4.0.0",
   # dependency overrides
@@ -265,6 +265,12 @@ exclude = [
 
 [tool.ruff.lint]
 select = [
+  "correctness",
+  "suspicious",
+#  "complexity",
+  "performance",
+  "style",
+
   # pycodestyle
   "E",
   "W",
@@ -315,15 +321,20 @@ select = [
 ]
 ignore = [
   "async-function-with-timeout",
+  "blind-except",
   "builtin-attribute-shadowing",
   "compare-to-empty-string",
+  "escape-sequence-in-docstring",
   "explicit-string-concatenation",
+  "math-constant",
   "missing-f-string-syntax",
   "missing-trailing-comma",  # already covered by ruff's formatter
   "parenthesize-chained-operators",
+  "raise-vanilla-class",
   "redefined-loop-name",
   "return-in-generator",
   "stdlib-module-shadowing",
+  "subclass-builtin",
   "unnecessary-collection-call",
   "unnecessary-dunder-call",
   "unsorted-dunder-all",
@@ -368,6 +379,12 @@ allow-multiline = false
 [tool.ty.environment]
 python-platform = "all"
 
+[[tool.ty.overrides]]
+include = ["build_backend", "docs", "src", "tests"]
+
+[tool.ty.overrides.rules]
+invalid-mutable-override = "ignore"  # TODO: don't ignore this rule
+
 [tool.ty.src]
 exclude = [
   "src/streamlink/packages/**",

{streamlink-8.6.2 → streamlink-8.6.3}/setup.py

@@ -91,5 +91,5 @@ if __name__ == "__main__":
         cmdclass=get_cmdclasses(cmdclass),
         entry_points=entry_points,
         data_files=data_files,
-        version="8.6.2",
+        version="8.6.3",
     )

streamlink-8.6.3/src/streamlink/_version.py

@@ -0,0 +1 @@
+__version__ = "8.6.3"

{streamlink-8.6.2 → streamlink-8.6.3}/src/streamlink/plugins/youtube.py

@@ -89,9 +89,7 @@ class YouTube(Plugin):
         # translate input URLs to be able to find embedded data and to avoid unnecessary HTTP redirects
         if parsed.netloc == "gaming.youtube.com":
             self.url = urlunparse(parsed._replace(scheme="https", netloc="www.youtube.com"))
-        elif self.matches["shorthand"]:
-            self.url = self._url_canonical.format(video_id=self.match["video_id"])
-        elif self.matches["embed"] and self.match["video_id"]:
+        elif self.matches["shorthand"] or self.matches["embed"] and self.match["video_id"]:
             self.url = self._url_canonical.format(video_id=self.match["video_id"])
         elif self.matches["embed"] and self.match["live"]:
             self.url = self._url_channelid_live.format(channel_id=self.match["live"])

{streamlink-8.6.2 → streamlink-8.6.3}/src/streamlink/session/http.pyi

@@ -26,29 +26,14 @@ class _StreamlinkKwargs(TypedDict, total=False):
 class _SchemaKwargs(TypedDict):
     schema: Schema
 
-class _RequestKwargs(_requeststypes.RequestKwargs, _StreamlinkKwargs):
-    pass
-
-class _RequestKwargsWithSchema(_requeststypes.RequestKwargs, _StreamlinkKwargs, _SchemaKwargs):
-    pass
-
-class _GetKwargs(_requeststypes.GetKwargs, _StreamlinkKwargs):
-    pass
-
-class _GetKwargsWithSchema(_requeststypes.GetKwargs, _StreamlinkKwargs, _SchemaKwargs):
-    pass
-
-class _PostKwargs(_requeststypes.PostKwargs, _StreamlinkKwargs):
-    pass
-
-class _PostKwargsWithSchema(_requeststypes.PostKwargs, _StreamlinkKwargs, _SchemaKwargs):
-    pass
-
-class _DataKwargs(_requeststypes.DataKwargs, _StreamlinkKwargs):
-    pass
-
-class _DataKwargsWithSchema(_requeststypes.DataKwargs, _StreamlinkKwargs, _SchemaKwargs):
-    pass
+class _RequestKwargs(_requeststypes.RequestKwargs, _StreamlinkKwargs): ...
+class _RequestKwargsWithSchema(_requeststypes.RequestKwargs, _StreamlinkKwargs, _SchemaKwargs): ...
+class _GetKwargs(_requeststypes.GetKwargs, _StreamlinkKwargs): ...
+class _GetKwargsWithSchema(_requeststypes.GetKwargs, _StreamlinkKwargs, _SchemaKwargs): ...
+class _PostKwargs(_requeststypes.PostKwargs, _StreamlinkKwargs): ...
+class _PostKwargsWithSchema(_requeststypes.PostKwargs, _StreamlinkKwargs, _SchemaKwargs): ...
+class _DataKwargs(_requeststypes.DataKwargs, _StreamlinkKwargs): ...
+class _DataKwargsWithSchema(_requeststypes.DataKwargs, _StreamlinkKwargs, _SchemaKwargs): ...
 
 # ----
 

{streamlink-8.6.2 → streamlink-8.6.3}/src/streamlink/stream/dash/manifest.py

@@ -330,7 +330,7 @@ class MPD(MPDNode):
 
     __tag__ = "MPD"
 
-    parent: None  # type: ignore[assignment]
+    parent: None  # type: ignore[assignment, ty:invalid-attribute-override]
     timelines: dict[TTimelineIdent, int]
 
     DEFAULT_MINBUFFERTIME = 3.0

{streamlink-8.6.2 → streamlink-8.6.3}/src/streamlink/stream/wrappers.py

@@ -1,4 +1,5 @@
 import io
+from contextlib import suppress
 from threading import Thread
 
 from streamlink.buffers import Buffer, RingBuffer
@@ -81,10 +82,8 @@ class StreamIOThreadWrapper(io.IOBase):
             self.buffer.close()
 
             if hasattr(self.fd, "close"):
-                try:
+                with suppress(Exception):
                     self.fd.close()
-                except Exception:
-                    pass
 
     def __init__(self, session, fd, timeout=30):
         self.buffer = RingBuffer(session.get_option("ringbuffer-size"))

{streamlink-8.6.2 → streamlink-8.6.3}/src/streamlink/utils/crypto.py

@@ -14,6 +14,8 @@ try:
     from Crypto.Util.Padding import pad, unpad
 except ImportError:  # pragma: no cover
     # pycryptodomex (independent of the old PyCrypto library)
+    # Support for pycryptodomex ended with pycryptodome 4.0.0.
+    # Keep the fallback imports until pycryptodomex is not packaged by major distros anymore.
     from Cryptodome.Cipher import AES, PKCS1_v1_5  # type: ignore
     from Cryptodome.Hash import MD5, SHA256  # type: ignore
     from Cryptodome.PublicKey import RSA  # type: ignore

{streamlink-8.6.2 → streamlink-8.6.3}/src/streamlink/utils/dataclass.py

@@ -17,10 +17,8 @@ if TYPE_CHECKING:
 
     from _typeshed import DataclassInstance
 
-    _Ta = TypeVar("_Ta")
-    _Tb = TypeVar("_Tb")
-
-    _TFormatters: TypeAlias = dict[type[_Tb], Callable[[_Tb], str]]
+    _T = TypeVar("_T")
+    _TFormatters: TypeAlias = dict[type[_T], Callable[[_T], str]]
 
 
 _DEFAULT_FORMATTERS: _TFormatters = {

{streamlink-8.6.2 → streamlink-8.6.3}/src/streamlink.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: streamlink
-Version: 8.6.2
+Version: 8.6.3
 Summary: Streamlink is a command-line utility that extracts streams from various services and pipes them into a video player of choice.
 Author: Streamlink
 Author-email: streamlink@protonmail.com
@@ -36,7 +36,7 @@ Requires-Dist: exceptiongroup; python_version < "3.11"
 Requires-Dist: isodate
 Requires-Dist: lxml<8,>=5.0.0
 Requires-Dist: pycountry
-Requires-Dist: pycryptodome<4,>=3.4.3
+Requires-Dist: pycryptodome<5,>=3.4.3
 Requires-Dist: PySocks!=1.5.7,>=1.5.6
 Requires-Dist: requests<3,>=2.30.0
 Requires-Dist: trio<1,>=0.25.0; python_version >= "3.13"

{streamlink-8.6.2 → streamlink-8.6.3}/src/streamlink.egg-info/requires.txt

@@ -2,7 +2,7 @@ certifi
 isodate
 lxml<8,>=5.0.0
 pycountry
-pycryptodome<4,>=3.4.3
+pycryptodome<5,>=3.4.3
 PySocks!=1.5.7,>=1.5.6
 requests<3,>=2.30.0
 trio-websocket<1,>=0.9.0

{streamlink-8.6.2 → streamlink-8.6.3}/src/streamlink_cli/compat.py

@@ -9,7 +9,7 @@ except AttributeError:  # pragma: no cover
     from atexit import register as _atexit_register
     from pathlib import Path
 
-    stdout = Path(devnull).open("wb")
+    stdout = Path(devnull).open("wb")  # ruff: ignore[open-file-with-context-handler]
     _atexit_register(stdout.close)
     del _atexit_register
 

{streamlink-8.6.2 → streamlink-8.6.3}/src/streamlink_cli/console/progress.py

@@ -94,7 +94,7 @@ class ProgressFormatter:
                 try:
                     for idx, fn, _ in variable:
                         static[idx] = fn(max_width)
-                except Exception:
+                except Exception:  # ruff: ignore[try-except-continue]
                     continue
                 break
 

{streamlink-8.6.2 → streamlink-8.6.3}/src/streamlink_cli/console/stream.py

@@ -19,7 +19,7 @@ class ConsoleStatusMessage(str):
 
 
 class ConsoleOutputStream(StreamWrapper):
-    def __new__(cls, stream: TextIOWrapper) -> ConsoleOutputStream:
+    def __new__(cls, stream: TextIOWrapper) -> ConsoleOutputStream:  # ruff: ignore[non-self-return-type]
         if stream.isatty():
             if (
                 is_win32

{streamlink-8.6.2 → streamlink-8.6.3}/src/streamlink_cli/console/stream_wrapper.py

@@ -13,7 +13,7 @@ class StreamWrapper:
     def wrap(cls, obj, attr):
         stream = getattr(obj, attr)
         if not isinstance(stream, TextIOWrapper):
-            raise AttributeError(f"{stream!r} is not a TextIOWrapper object ({obj!r}, {attr!r})")
+            raise TypeError(f"{stream!r} is not a TextIOWrapper object ({obj!r}, {attr!r})")
 
         console_output_stream = cls(stream)
         console_output_stream._wrap(obj, attr)

{streamlink-8.6.2 → streamlink-8.6.3}/src/streamlink_cli/main.py

@@ -265,6 +265,9 @@ def output_stream_http(
         user_agent = server.request.headers.get("User-Agent") or "unknown player"
         log.info(f"Got HTTP request from {user_agent}")
 
+        retry_streams = args.retry_streams or 10
+        retry_max = args.retry_max or 0
+        retry_attempts = 0
         stream_fd = prebuffer = None
         while not stream_fd and (not player or player.running):
             try:  # ruff: ignore[too-many-statements-in-try-clause]
@@ -277,20 +280,35 @@ def output_stream_http(
                 for stream_name in (resolve_stream_name(streams, s) for s in args.stream):
                     if stream_name in streams:
                         stream = streams[stream_name]
+                        retry_attempts = 0
                         break
                 else:
-                    log.info("Stream not available, will re-fetch streams in 10 sec")
-                    sleep(10)
+                    if retry_attempts >= retry_max > 0:
+                        continuous = False
+                        break
+                    log.info(f"Stream not available, re-fetching streams in {retry_streams:.1f} second(s)")
+                    retry_attempts += 1
+                    sleep(retry_streams)
                     continue
             except PluginError as err:
-                log.error(f"Unable to fetch new streams: {err}")
+                if retry_attempts >= retry_max > 0:
+                    continuous = False
+                    break
+                log.error(f"Unable to fetch new streams, retrying in {retry_streams:.1f} second(s): {err}")
+                retry_attempts += 1
+                sleep(retry_streams)
                 continue
 
-            try:
-                log.info(f"Opening stream: {stream_name} ({type(stream).shortname()})")
-                stream_fd, prebuffer = open_stream(stream)
-            except StreamError as err:
-                log.error(err)
+            for i in range(args.retry_open):
+                try:
+                    log.info(f"Opening stream: {stream_name} ({type(stream).shortname()})")
+                    stream_fd, prebuffer = open_stream(stream)
+                    break
+                except StreamError as err:
+                    log.error(f"Try {i + 1}/{args.retry_open}: Could not open stream {stream} ({err})")
+            else:
+                server.shutdown()
+                raise StreamlinkCLIError(f"Could not open stream {stream}, tried {args.retry_open} times, exiting")
 
         if stream_fd and prebuffer:
             log.debug("Writing stream to player")
@@ -298,6 +316,7 @@ def output_stream_http(
             try:
                 stream_runner.run(prebuffer)
             except OSError as err:
+                server.shutdown()
                 raise StreamlinkCLIError() from err
 
         if not continuous:
@@ -525,7 +544,7 @@ def fetch_streams_with_retry(plugin: Plugin, interval: float, count: int) -> Map
         streams = None
 
     if not streams:
-        log.info(f"Waiting for streams, retrying every {interval} second(s)")
+        log.info(f"Waiting for streams, retrying every {interval:.1f} second(s)")
     attempts = 0
 
     while not streams:

{streamlink-8.6.2 → streamlink-8.6.3}/tests/cli/console/test_stream_wrapper.py

@@ -12,7 +12,7 @@ def _console_output_stream(monkeypatch: pytest.MonkeyPatch):
 
 
 def test_wrap_error():
-    with pytest.raises(AttributeError):
+    with pytest.raises(TypeError):
         ConsoleOutputStream.wrap(sys, "version")
 
 

{streamlink-8.6.2 → streamlink-8.6.3}/tests/cli/main/test_handle_url.py

@@ -380,7 +380,7 @@ def test_handle_url_text_output(
             (
                 "[cli][info] Found matching plugin plugin for URL plugin\n"
                 + "[plugins.plugin][info] plugin log message\n"
-                + "[cli][info] Waiting for streams, retrying every 1 second(s)\n"
+                + "[cli][info] Waiting for streams, retrying every 1.0 second(s)\n"
                 + "error: No playable streams found on this URL: plugin\n"
             ),
             id="no-streams",
@@ -476,7 +476,7 @@ def test_handle_url_text_output(
             (
                 "[cli][info] Found matching plugin plugin for URL plugin\n"
                 + "[plugins.plugin][info] plugin log message\n"
-                + "[cli][info] Waiting for streams, retrying every 1 second(s)\n"
+                + "[cli][info] Waiting for streams, retrying every 1.0 second(s)\n"
                 + "error: fatal\n"
             ),
             id="fatal-plugin-error-on-second-attempt",

{streamlink-8.6.2 → streamlink-8.6.3}/tests/cli/test_argparser.py

@@ -151,8 +151,10 @@ class TestMatchArgumentOverride:
         monkeypatch.setattr("argparse._", null_translations.gettext)
         monkeypatch.setattr("argparse.ngettext", null_translations.ngettext)
 
-    @pytest.fixture(scope="module")
-    def parser(self):
+    # noinspection nested-decorators
+    @pytest.fixture(scope="class")
+    @classmethod
+    def parser(cls):
         parser = ArgumentParser(exit_on_error=False)
         parser.add_argument("-a", "--one", dest="arg")
         parser.add_argument("-b", "--two", nargs=2)

{streamlink-8.6.2 → streamlink-8.6.3}/tests/mixins/stream_hls.py

@@ -4,6 +4,7 @@ import unittest
 from binascii import hexlify
 from functools import partial
 from threading import Event, Thread
+from types import SimpleNamespace
 from typing import TYPE_CHECKING
 from unittest.mock import patch
 
@@ -206,7 +207,7 @@ class TestMixinStreamHLS(unittest.TestCase):
         super().__init__(*args, **kwargs)
         # FIXME: fix HTTPSession.request()
         # don't sleep on mocked HTTP request failures
-        self._patch_http_retry_sleep = patch("streamlink.session.http.time.sleep")
+        self._patch_http_retry_sleep = patch("streamlink.session.http.time", SimpleNamespace(sleep=lambda _: None))
         self.mocker = requests_mock.Mocker()
         self.mocks = {}
 

{streamlink-8.6.2 → streamlink-8.6.3}/tests/session/test_http.py

@@ -6,6 +6,7 @@ from contextlib import closing, nullcontext
 from operator import itemgetter
 from socket import AF_INET, AF_INET6
 from ssl import SSLContext
+from types import SimpleNamespace
 from typing import TYPE_CHECKING, Any
 from unittest.mock import Mock, PropertyMock, call
 
@@ -169,7 +170,7 @@ class TestHTTPSession:
         res = method("http://localhost")
         assert isinstance(res, requests.Response)
         assert res.text == "OK"
-        assert mocked.called_once
+        assert mocked.call_count == 1
 
     @pytest.mark.parametrize(
         ("params", "expected"),
@@ -220,7 +221,7 @@ class TestHTTPSession:
     def test_read_timeout(self, monkeypatch: pytest.MonkeyPatch):
         mock_sleep = Mock()
         mock_request = Mock(side_effect=requests.Timeout)
-        monkeypatch.setattr("streamlink.session.http.time.sleep", mock_sleep)
+        monkeypatch.setattr("streamlink.session.http.time", SimpleNamespace(sleep=mock_sleep))
         monkeypatch.setattr("streamlink.session.http.Session.request", mock_request)
 
         session = HTTPSession()