Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-mocket for openSUSE:Factory checked in at 2026-09-10 11:46:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-mocket (Old) and /work/SRC/openSUSE:Factory/.python-mocket.new.1265 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-mocket" Thu Sep 10 11:46:45 2026 rev:52 rq:1376494 version:3.14.4 Changes: -------- --- /work/SRC/openSUSE:Factory/python-mocket/python-mocket.changes 2026-07-23 23:09:50.939247229 +0200 +++ /work/SRC/openSUSE:Factory/.python-mocket.new.1265/python-mocket.changes 2026-09-10 11:47:05.698762498 +0200 @@ -1,0 +2,6 @@ +Tue Sep 1 20:50:21 UTC 2026 - Dirk Müller <[email protected]> + +- update to 3.14.4: + * Fix for nested Mocketizer's decorators + +------------------------------------------------------------------- Old: ---- mocket-3.14.3.tar.gz New: ---- mocket-3.14.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-mocket.spec ++++++ --- /var/tmp/diff_new_pack.igJlJs/_old 2026-09-10 11:47:06.696804338 +0200 +++ /var/tmp/diff_new_pack.igJlJs/_new 2026-09-10 11:47:06.697804380 +0200 @@ -36,7 +36,7 @@ %{?sle15_python_module_pythons} Name: python-mocket%{psuffix} -Version: 3.14.3 +Version: 3.14.4 Release: 0 Summary: Python socket mock framework License: BSD-3-Clause ++++++ mocket-3.14.3.tar.gz -> mocket-3.14.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mocket-3.14.3/PKG-INFO new/mocket-3.14.4/PKG-INFO --- old/mocket-3.14.3/PKG-INFO 2020-02-02 01:00:00.000000000 +0100 +++ new/mocket-3.14.4/PKG-INFO 2020-02-02 01:00:00.000000000 +0100 @@ -1,6 +1,6 @@ -Metadata-Version: 2.4 +Metadata-Version: 2.5 Name: mocket -Version: 3.14.3 +Version: 3.14.4 Summary: Socket Mock Framework - for all kinds of socket animals, web-clients included - with gevent/asyncio/SSL support Project-URL: Homepage, https://pypi.org/project/mocket Project-URL: Repository, https://github.com/mindflayer/python-mocket diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mocket-3.14.3/mocket/__init__.py new/mocket-3.14.4/mocket/__init__.py --- old/mocket-3.14.3/mocket/__init__.py 2020-02-02 01:00:00.000000000 +0100 +++ new/mocket-3.14.4/mocket/__init__.py 2020-02-02 01:00:00.000000000 +0100 @@ -33,4 +33,4 @@ "FakeSSLContext", ) -__version__ = "3.14.3" +__version__ = "3.14.4" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mocket-3.14.3/mocket/decorators/mocketizer.py new/mocket-3.14.4/mocket/decorators/mocketizer.py --- old/mocket-3.14.3/mocket/decorators/mocketizer.py 2020-02-02 01:00:00.000000000 +0100 +++ new/mocket-3.14.4/mocket/decorators/mocketizer.py 2020-02-02 01:00:00.000000000 +0100 @@ -32,13 +32,15 @@ self.instance = instance self.truesocket_recording_dir = truesocket_recording_dir self.namespace = namespace or str(id(self)) - MocketMode.STRICT = strict_mode - if strict_mode: - MocketMode.STRICT_ALLOWED = strict_mode_allowed or [] - elif strict_mode_allowed: + if not strict_mode and strict_mode_allowed: raise ValueError( "Allowed locations are only accepted when STRICT mode is active." ) + self._previous_strict_mode = MocketMode.STRICT + self._previous_strict_mode_allowed = MocketMode.STRICT_ALLOWED + MocketMode.STRICT = strict_mode + if strict_mode: + MocketMode.STRICT_ALLOWED = strict_mode_allowed or [] def enter(self) -> None: """Enter the Mocketizer context (enable Mocket).""" @@ -60,10 +62,15 @@ def exit(self) -> None: """Exit the Mocketizer context (disable Mocket).""" - if self.instance: - self.check_and_call("mocketize_teardown") - - Mocket.disable() + try: + if self.instance: + self.check_and_call("mocketize_teardown") + finally: + try: + Mocket.disable() + finally: + MocketMode.STRICT = self._previous_strict_mode + MocketMode.STRICT_ALLOWED = self._previous_strict_mode_allowed def __exit__(self, type: Any, value: Any, tb: Any) -> None: """Exit context manager. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mocket-3.14.3/mocket/inject.py new/mocket-3.14.4/mocket/inject.py --- old/mocket-3.14.3/mocket/inject.py 2020-02-02 01:00:00.000000000 +0100 +++ new/mocket-3.14.4/mocket/inject.py 2020-02-02 01:00:00.000000000 +0100 @@ -5,12 +5,15 @@ import contextlib import socket import ssl +import threading from types import ModuleType from typing import Any import urllib3 _patches_restore: dict[tuple[ModuleType, str], Any] = {} +_enable_depth = 0 +_enable_lock = threading.Lock() def _patch(module: ModuleType, name: str, patched_value: Any) -> None: @@ -39,6 +42,8 @@ def enable() -> None: """Enable Mocket by patching socket, ssl, and urllib3 modules.""" + global _enable_depth + from mocket.socket import ( MocketSocket, mock_create_connection, @@ -77,8 +82,15 @@ (urllib3.util.ssl_, "wrap_socket"): mock_urllib3_ssl_wrap_socket, # urllib3 < 2 } - for (module, name), new_value in patches.items(): - _patch(module, name, new_value) + with _enable_lock: + if _enable_depth > 0: + _enable_depth += 1 + return + + for (module, name), new_value in patches.items(): + _patch(module, name, new_value) + + _enable_depth += 1 with contextlib.suppress(ImportError): from urllib3.contrib.pyopenssl import extract_from_urllib3 @@ -88,8 +100,17 @@ def disable() -> None: """Disable Mocket by restoring all patched modules.""" - for module, name in list(_patches_restore.keys()): - _restore(module, name) + global _enable_depth + with _enable_lock: + if _enable_depth == 0: + return + + _enable_depth -= 1 + if _enable_depth > 0: + return + + for module, name in list(_patches_restore.keys()): + _restore(module, name) with contextlib.suppress(ImportError): from urllib3.contrib.pyopenssl import inject_into_urllib3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mocket-3.14.3/mocket/mocket.py new/mocket-3.14.4/mocket/mocket.py --- old/mocket-3.14.3/mocket/mocket.py 2020-02-02 01:00:00.000000000 +0100 +++ new/mocket-3.14.4/mocket/mocket.py 2020-02-02 01:00:00.000000000 +0100 @@ -14,7 +14,7 @@ # NOTE this is here for backwards-compat to keep old import-paths working # from mocket.socket import MocketSocket as MocketSocket -if TYPE_CHECKING: +if TYPE_CHECKING: # pragma: no cover from mocket.entry import MocketEntry from mocket.types import Address diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mocket-3.14.3/tests/test_inject.py new/mocket-3.14.4/tests/test_inject.py --- old/mocket-3.14.3/tests/test_inject.py 1970-01-01 01:00:00.000000000 +0100 +++ new/mocket-3.14.4/tests/test_inject.py 2020-02-02 01:00:00.000000000 +0100 @@ -0,0 +1,43 @@ +import sys +import types + +from mocket import inject + + +def test_disable_calls_pyopenssl_inject_when_available(monkeypatch): + calls: list[str] = [] + pyopenssl_module = types.ModuleType("urllib3.contrib.pyopenssl") + + def fake_inject_into_urllib3(): + calls.append("called") + + pyopenssl_module.inject_into_urllib3 = fake_inject_into_urllib3 + monkeypatch.setitem(sys.modules, "urllib3.contrib.pyopenssl", pyopenssl_module) + monkeypatch.setattr(inject, "_patches_restore", {}) + monkeypatch.setattr(inject, "_enable_depth", 1) + + inject.disable() + + assert calls == ["called"] + + +def test_enable_calls_pyopenssl_extract_when_available(monkeypatch): + calls: list[str] = [] + pyopenssl_module = types.ModuleType("urllib3.contrib.pyopenssl") + + def fake_extract_from_urllib3(): + calls.append("called") + + def fake_inject_into_urllib3(): + pass + + pyopenssl_module.extract_from_urllib3 = fake_extract_from_urllib3 + pyopenssl_module.inject_into_urllib3 = fake_inject_into_urllib3 + monkeypatch.setitem(sys.modules, "urllib3.contrib.pyopenssl", pyopenssl_module) + monkeypatch.setattr(inject, "_patches_restore", {}) + monkeypatch.setattr(inject, "_enable_depth", 0) + + inject.enable() + inject.disable() + + assert calls == ["called"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mocket-3.14.3/tests/test_mode.py new/mocket-3.14.4/tests/test_mode.py --- old/mocket-3.14.3/tests/test_mode.py 2020-02-02 01:00:00.000000000 +0100 +++ new/mocket-3.14.4/tests/test_mode.py 2020-02-02 01:00:00.000000000 +0100 @@ -1,3 +1,6 @@ +import socket + +import httpx import pytest import requests @@ -71,3 +74,28 @@ with Mocketizer(strict_mode=strict_mode_on): assert MocketMode.is_allowed("foobar.com") is not strict_mode_on assert MocketMode.is_allowed(("foobar.com", 443)) is not strict_mode_on + + +def test_mocketize_strict_mode_does_not_leak_after_outer_context(): + with Mocketizer(strict_mode=False): + + @mocketize(strict_mode=True) + def strict_test(): + assert MocketMode.STRICT is True + + strict_test() + assert MocketMode.STRICT is False + + [email protected]('os.getenv("SKIP_TRUE_HTTP", False)') +def test_mocketize_twice_nested(): + original_socket = socket.socket + original_strict_mode = MocketMode.STRICT + + with Mocketizer(strict_mode=True), Mocketizer(strict_mode=True): + pass + + assert socket.socket is original_socket + assert MocketMode.STRICT is original_strict_mode + url = "http://httpbin.local/ip"; + assert httpx.get(url, timeout=5.0).status_code == 200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mocket-3.14.3/tests/test_recording.py new/mocket-3.14.4/tests/test_recording.py --- old/mocket-3.14.3/tests/test_recording.py 1970-01-01 01:00:00.000000000 +0100 +++ new/mocket-3.14.4/tests/test_recording.py 2020-02-02 01:00:00.000000000 +0100 @@ -0,0 +1,43 @@ +from mocket.recording import MocketRecord, MocketRecordStorage, _hash_request_fallback + + +def test_get_records_returns_all_records_for_address(tmp_path): + storage = MocketRecordStorage(directory=tmp_path, namespace="recording-get-records") + address = ("example.org", 80) + signature = "signature" + storage._records[address][signature] = MocketRecord( + host=address[0], + port=address[1], + request=b"GET / HTTP/1.1\r\nHost: example.org\r\n\r\n", + response=b"HTTP/1.1 200 OK\r\n\r\nok", + ) + + records = storage.get_records(address) + + assert len(records) == 1 + assert records[0].response == b"HTTP/1.1 200 OK\r\n\r\nok" + + +def test_put_record_updates_fallback_signature_without_saving(tmp_path): + storage = MocketRecordStorage( + directory=tmp_path, namespace="recording-put-record-fallback" + ) + address = ("example.org", 80) + request = b"GET / HTTP/1.1\r\nHost: example.org\r\n\r\n" + fallback_signature = _hash_request_fallback(request) + + storage._records[address][fallback_signature] = MocketRecord( + host=address[0], + port=address[1], + request=request, + response=b"HTTP/1.1 200 OK\r\n\r\nold", + ) + + storage.put_record( + address=address, + request=request, + response=b"HTTP/1.1 200 OK\r\n\r\nnew", + ) + + assert storage._records[address][fallback_signature].response.endswith(b"new") + assert not storage.file.exists() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mocket-3.14.3/tests/test_socket.py new/mocket-3.14.4/tests/test_socket.py --- old/mocket-3.14.3/tests/test_socket.py 2020-02-02 01:00:00.000000000 +0100 +++ new/mocket-3.14.4/tests/test_socket.py 2020-02-02 01:00:00.000000000 +0100 @@ -9,8 +9,9 @@ from mocket import Mocket, MocketEntry, Mocketizer, mocketize from mocket.mockhttp import Entry from mocket.socket import MocketSocket -from mocket.ssl.context import MocketSSLContext +from mocket.ssl.context import MocketSSLContext, mock_wrap_socket from mocket.ssl.socket import MocketSSLSocket +from mocket.urllib3 import mock_match_hostname @pytest.mark.parametrize("blocking", (False, True)) @@ -163,6 +164,33 @@ assert ssl_obj._address == ("", 443) +def test_wrap_bio_with_invalid_mocket_address(monkeypatch): + monkeypatch.setattr(Mocket, "_address", "invalid-address") + ssl_obj = MocketSSLContext().wrap_bio( + incoming=None, + outgoing=None, + server_hostname=None, + ) + + assert ssl_obj._host is None + assert ssl_obj._port is None + + +def test_mock_wrap_socket_delegates_to_context(monkeypatch): + expected = MocketSSLSocket() + + def fake_wrap_socket(self, sock, *args, **kwargs): + return expected + + monkeypatch.setattr(MocketSSLContext, "wrap_socket", fake_wrap_socket) + + assert mock_wrap_socket(MocketSocket()) is expected + + +def test_mock_match_hostname_returns_none(): + assert mock_match_hostname("example.org", object()) is None + + def test_getpeercert_does_not_overwrite_empty_host_when_port_missing(monkeypatch): monkeypatch.setattr(Mocket, "_address", ("httpbin.local", 443)) ssl_obj = MocketSSLSocket()
