pytest_httpserver 1.0.9__tar.gz → 1.0.10__tar.gz

{pytest_httpserver-1.0.9 → pytest_httpserver-1.0.10}/CHANGES.rst

@@ -2,6 +2,29 @@
 Release Notes
 =============
 
+.. _Release Notes_1.0.10:
+
+1.0.10
+======
+
+.. _Release Notes_1.0.10_New Features:
+
+New Features
+------------
+
+- When there's no handler for the request, add more details to the response
+  sent by the server about the request to help debugging.
+
+
+.. _Release Notes_1.0.10_Other Notes:
+
+Other Notes
+-----------
+
+- Use ruff for linting. It includes some source code changes which should not
+  introduce functional changes, or API changes.
+
+
 .. _Release Notes_1.0.9:
 
 1.0.9

{pytest_httpserver-1.0.9 → pytest_httpserver-1.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytest_httpserver
-Version: 1.0.9
+Version: 1.0.10
 Summary: pytest-httpserver is a httpserver for pytest
 Home-page: https://github.com/csernazs/pytest-httpserver
 License: MIT
@@ -27,10 +27,12 @@ Description-Content-Type: text/markdown
 
 [![Build Status](https://github.com/csernazs/pytest-httpserver/workflows/build/badge.svg?branch=master)](https://github.com/csernazs/pytest-httpserver/actions?query=workflow%3Abuild+branch%3Amaster)
 [![Documentation Status](https://readthedocs.org/projects/pytest-httpserver/badge/?version=latest)](https://pytest-httpserver.readthedocs.io/en/latest/?badge=latest)
- [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
-[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=K6PU3AGBZW4QC&item_name=pytest-httpserver&currency_code=EUR&source=url)
+[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 [![codecov](https://codecov.io/gh/csernazs/pytest-httpserver/branch/master/graph/badge.svg?token=MX2JXbHqRH)](https://codecov.io/gh/csernazs/pytest-httpserver)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
+[![Downloads](https://static.pepy.tech/badge/pytest-httpserver/month)](https://pepy.tech/project/pytest-httpserver)
+[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit)
 
 ## pytest_httpserver
 
@@ -144,12 +146,16 @@ documentation](https://pytest-httpserver.readthedocs.io/en/latest/api.html#block
 
 ### Donation
 
-If you want to donate to this project, you can find the donate button at the top
-of the README.
+Currently, this project is based heavily on werkzeug and pytest.
 
-Currently, this project is based heavily on werkzeug. Werkzeug does all the heavy lifting
-behind the scenes, parsing HTTP request and defining Request and Response objects, which
-are currently transparent in the API.
+Werkzeug does all the heavy lifting behind the scenes, parsing HTTP request and
+defining Request and Response objects, which are currently transparent in the
+API.
 
-If you wish to donate, please consider donating to them: https://palletsprojects.com/donate
+If you wish to donate to werkzeug: https://palletsprojects.com/donate
+
+
+Pytest is the de-facto test library for python.
+
+If you wish to donate to pytest: https://opencollective.com/pytest
 

{pytest_httpserver-1.0.9 → pytest_httpserver-1.0.10}/README.md

@@ -1,9 +1,11 @@
 [![Build Status](https://github.com/csernazs/pytest-httpserver/workflows/build/badge.svg?branch=master)](https://github.com/csernazs/pytest-httpserver/actions?query=workflow%3Abuild+branch%3Amaster)
 [![Documentation Status](https://readthedocs.org/projects/pytest-httpserver/badge/?version=latest)](https://pytest-httpserver.readthedocs.io/en/latest/?badge=latest)
- [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
-[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=K6PU3AGBZW4QC&item_name=pytest-httpserver&currency_code=EUR&source=url)
+[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 [![codecov](https://codecov.io/gh/csernazs/pytest-httpserver/branch/master/graph/badge.svg?token=MX2JXbHqRH)](https://codecov.io/gh/csernazs/pytest-httpserver)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
+[![Downloads](https://static.pepy.tech/badge/pytest-httpserver/month)](https://pepy.tech/project/pytest-httpserver)
+[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit)
 
 ## pytest_httpserver
 
@@ -117,11 +119,15 @@ documentation](https://pytest-httpserver.readthedocs.io/en/latest/api.html#block
 
 ### Donation
 
-If you want to donate to this project, you can find the donate button at the top
-of the README.
+Currently, this project is based heavily on werkzeug and pytest.
 
-Currently, this project is based heavily on werkzeug. Werkzeug does all the heavy lifting
-behind the scenes, parsing HTTP request and defining Request and Response objects, which
-are currently transparent in the API.
+Werkzeug does all the heavy lifting behind the scenes, parsing HTTP request and
+defining Request and Response objects, which are currently transparent in the
+API.
 
-If you wish to donate, please consider donating to them: https://palletsprojects.com/donate
+If you wish to donate to werkzeug: https://palletsprojects.com/donate
+
+
+Pytest is the de-facto test library for python.
+
+If you wish to donate to pytest: https://opencollective.com/pytest

{pytest_httpserver-1.0.9 → pytest_httpserver-1.0.10}/doc/conf.py

@@ -66,7 +66,7 @@ author = "Zsolt Cserna"
 # built documents.
 #
 # The short X.Y version.
-version = "1.0.9"
+version = "1.0.10"
 # The full version, including alpha/beta/rc tags.
 release = version
 

{pytest_httpserver-1.0.9 → pytest_httpserver-1.0.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pytest_httpserver"
-version = "1.0.9"
+version = "1.0.10"
 description = "pytest-httpserver is a httpserver for pytest"
 authors = ["Zsolt Cserna <cserna.zsolt@gmail.com>"]
 license = "MIT"
@@ -51,6 +51,7 @@ coverage = ">=6.4.4,<8.0.0"
 types-toml = "^0.10.8"
 toml = "^0.10.2"
 black = "^23.1.0"
+ruff = "^0.2.1"
 
 
 [tool.poetry.group.doc]
@@ -88,3 +89,55 @@ markers = [
 [tool.mypy]
 files = ["pytest_httpserver", "scripts", "tests", "doc"]
 implicit_reexport = false
+
+
+[tool.black]
+line-length = 120
+safe = true
+
+[tool.ruff]
+lint.select = ["ALL"]
+lint.ignore = [
+  "I",
+  "D",
+
+  "ANN",
+  "ARG005",
+  "B011",
+  "B904",
+  "C408",
+  "C901",
+  "COM812",
+  "EM101",
+  "EM103",
+  "FBT002",
+  "FIX002",
+  "INP001",
+  "PGH003",
+  "PLR0912",
+  "PLR0913",
+  "PLR2004",
+  "PLW2901",
+  "PT004",
+  "PT012",
+  "PT013",
+  "PTH118",
+  "PTH120",
+  "RET504",
+  "RET505",
+  "RET506",
+  "RUF005",
+  "S101",
+  "S113",
+  "S603",
+  "S607",
+  "SIM108",
+  "T201",
+  "TD002",
+  "TD003",
+  "TRY003",
+  "UP032",
+]
+line-length = 120
+target-version = "py38"
+exclude = ["doc", "example*.py", "tests/examples/*.py"]

{pytest_httpserver-1.0.9 → pytest_httpserver-1.0.10}/pytest_httpserver/blocking_httpserver.py

@@ -1,15 +1,11 @@
+from __future__ import annotations
+
 from queue import Empty
 from queue import Queue
-from ssl import SSLContext
+from typing import TYPE_CHECKING
 from typing import Any
-from typing import Dict
 from typing import Mapping
-from typing import Optional
 from typing import Pattern
-from typing import Union
-
-from werkzeug.wrappers import Request
-from werkzeug.wrappers import Response
 
 from pytest_httpserver.httpserver import METHOD_ALL
 from pytest_httpserver.httpserver import UNDEFINED
@@ -19,6 +15,12 @@ from pytest_httpserver.httpserver import QueryMatcher
 from pytest_httpserver.httpserver import RequestHandlerBase
 from pytest_httpserver.httpserver import URIPattern
 
+if TYPE_CHECKING:
+    from ssl import SSLContext
+
+    from werkzeug.wrappers import Request
+    from werkzeug.wrappers import Response
+
 
 class BlockingRequestHandler(RequestHandlerBase):
     """
@@ -59,23 +61,23 @@ class BlockingHTTPServer(HTTPServerBase):
         self,
         host=DEFAULT_LISTEN_HOST,
         port=DEFAULT_LISTEN_PORT,
-        ssl_context: Optional[SSLContext] = None,
+        ssl_context: SSLContext | None = None,
         timeout: int = 30,
     ):
         super().__init__(host, port, ssl_context)
         self.timeout = timeout
         self.request_queue: Queue[Request] = Queue()
-        self.request_handlers: Dict[Request, Queue[BlockingRequestHandler]] = {}
+        self.request_handlers: dict[Request, Queue[BlockingRequestHandler]] = {}
 
     def assert_request(
         self,
-        uri: Union[str, URIPattern, Pattern[str]],
+        uri: str | URIPattern | Pattern[str],
         method: str = METHOD_ALL,
-        data: Union[str, bytes, None] = None,
+        data: str | bytes | None = None,
         data_encoding: str = "utf-8",
-        headers: Optional[Mapping[str, str]] = None,
-        query_string: Union[None, QueryMatcher, str, bytes, Mapping] = None,
-        header_value_matcher: Optional[HeaderValueMatcher] = None,
+        headers: Mapping[str, str] | None = None,
+        query_string: None | QueryMatcher | str | bytes | Mapping = None,
+        header_value_matcher: HeaderValueMatcher | None = None,
         json: Any = UNDEFINED,
         timeout: int = 30,
     ) -> BlockingRequestHandler:
@@ -127,7 +129,7 @@ class BlockingHTTPServer(HTTPServerBase):
         try:
             request = self.request_queue.get(timeout=timeout)
         except Empty:
-            raise AssertionError(f"Waiting for request {matcher} timed out")
+            raise AssertionError(f"Waiting for request {matcher} timed out")  # noqa: EM102
 
         diff = matcher.difference(request)
 
@@ -137,7 +139,7 @@ class BlockingHTTPServer(HTTPServerBase):
 
         if diff:
             request_handler.respond_with_response(self.respond_nohandler(request))
-            raise AssertionError(f"Request {matcher} does not match: {diff}")
+            raise AssertionError(f"Request {matcher} does not match: {diff}")  # noqa: EM102
 
         return request_handler
 

{pytest_httpserver-1.0.9 → pytest_httpserver-1.0.10}/pytest_httpserver/httpserver.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import abc
 import ipaddress
 import json
@@ -11,11 +13,11 @@ from contextlib import contextmanager
 from contextlib import suppress
 from copy import copy
 from enum import Enum
-from ssl import SSLContext
+from typing import TYPE_CHECKING
 from typing import Any
 from typing import Callable
+from typing import ClassVar
 from typing import Iterable
-from typing import List
 from typing import Mapping
 from typing import MutableMapping
 from typing import Optional
@@ -30,6 +32,9 @@ from werkzeug.serving import make_server
 from werkzeug.wrappers import Request
 from werkzeug.wrappers import Response
 
+if TYPE_CHECKING:
+    from ssl import SSLContext
+
 URI_DEFAULT = ""
 METHOD_ALL = "__ALL"
 
@@ -54,32 +59,24 @@ class Error(Exception):
     Base class for all exception defined in this package.
     """
 
-    pass
-
 
 class NoHandlerError(Error):
     """
     Raised when a :py:class:`RequestHandler` has no registered method to serve the request.
     """
 
-    pass
-
 
 class HTTPServerError(Error):
     """
     Raised when there's a problem with HTTP server.
     """
 
-    pass
-
 
 class NoMethodFoundForMatchingHeaderValueError(Error):
     """
     Raised when a :py:class:`HeaderValueMatcher` has no registered method to match the header value.
     """
 
-    pass
-
 
 class WaitingSettings:
     """Class for providing default settings and storing them in HTTPServer
@@ -89,7 +86,12 @@ class WaitingSettings:
     :param timeout: time (in seconds) until time is out
     """
 
-    def __init__(self, raise_assertions: bool = True, stop_on_nohandler: bool = True, timeout: float = 5):
+    def __init__(
+        self,
+        raise_assertions: bool = True,  # noqa: FBT001
+        stop_on_nohandler: bool = True,  # noqa: FBT001
+        timeout: float = 5,
+    ):
         self.raise_assertions = raise_assertions
         self.stop_on_nohandler = stop_on_nohandler
         self.timeout = timeout
@@ -105,7 +107,7 @@ class Waiting:
         self._start = time.monotonic()
         self._stop = None
 
-    def complete(self, result: bool):
+    def complete(self, result: bool):  # noqa: FBT001
         self._result = result
         self._stop = time.monotonic()
 
@@ -127,23 +129,23 @@ class HeaderValueMatcher:
         and return whether they are equal as bool.
     """
 
-    DEFAULT_MATCHERS: MutableMapping[str, Callable[[Optional[str], str], bool]] = {}
+    DEFAULT_MATCHERS: ClassVar[MutableMapping[str, Callable[[str | None, str], bool]]] = {}
 
-    def __init__(self, matchers: Optional[Mapping[str, Callable[[Optional[str], str], bool]]] = None):
+    def __init__(self, matchers: Mapping[str, Callable[[str | None, str], bool]] | None = None):
         self.matchers = self.DEFAULT_MATCHERS if matchers is None else matchers
 
     @staticmethod
-    def authorization_header_value_matcher(actual: Optional[str], expected: str) -> bool:
-        callable = getattr(Authorization, "from_header", None)
-        if callable is None:  # Werkzeug < 2.3.0
-            callable = werkzeug.http.parse_authorization_header  # type: ignore[attr-defined]
-        return callable(actual) == callable(expected)
+    def authorization_header_value_matcher(actual: str | None, expected: str) -> bool:
+        func = getattr(Authorization, "from_header", None)
+        if func is None:  # Werkzeug < 2.3.0
+            func = werkzeug.http.parse_authorization_header  # type: ignore[attr-defined]
+        return func(actual) == func(expected)
 
     @staticmethod
-    def default_header_value_matcher(actual: Optional[str], expected: str) -> bool:
+    def default_header_value_matcher(actual: str | None, expected: str) -> bool:
         return actual == expected
 
-    def __call__(self, header_name: str, actual: Optional[str], expected: str) -> bool:
+    def __call__(self, header_name: str, actual: str | None, expected: str) -> bool:
         try:
             matcher = self.matchers[header_name]
         except KeyError:
@@ -181,7 +183,7 @@ class StringQueryMatcher(QueryMatcher):
     Matches a query for a string or bytes specified
     """
 
-    def __init__(self, query_string: Union[bytes, str]):
+    def __init__(self, query_string: bytes | str):
         """
         :param query_string: the query string will be compared to this string or bytes.
             If string is specified, it will be encoded by the encode() method.
@@ -209,7 +211,7 @@ class MappingQueryMatcher(QueryMatcher):
     Matches a query string to a dictionary or MultiDict specified
     """
 
-    def __init__(self, query_dict: Union[Mapping, MultiDict]):
+    def __init__(self, query_dict: Mapping | MultiDict):
         """
         :param query_dict: if dictionary (Mapping) is specified, it will be used as a
             key-value mapping where both key and value should be string. If there are multiple
@@ -232,26 +234,26 @@ class BooleanQueryMatcher(QueryMatcher):
     Matches the query depending on the boolean value
     """
 
-    def __init__(self, result: bool):
+    def __init__(self, result: bool):  # noqa: FBT001
         """
         :param result: if this parameter is true, the query match will be always
             successful. Otherwise, no query match will be successful.
         """
         self.result = result
 
-    def get_comparing_values(self, request_query_string):
+    def get_comparing_values(self, request_query_string):  # noqa: ARG002
         if self.result:
             return (True, True)
         else:
             return (True, False)
 
 
-def _create_query_matcher(query_string: Union[None, QueryMatcher, str, bytes, Mapping]) -> QueryMatcher:
+def _create_query_matcher(query_string: None | QueryMatcher | str | bytes | Mapping) -> QueryMatcher:
     if isinstance(query_string, QueryMatcher):
         return query_string
 
     if query_string is None:
-        return BooleanQueryMatcher(True)
+        return BooleanQueryMatcher(result=True)
 
     if isinstance(query_string, (str, bytes)):
         return StringQueryMatcher(query_string)
@@ -272,7 +274,6 @@ class URIPattern(abc.ABC):
             with "/" and does not contain the query part.
         :return: True if there's a match, False otherwise
         """
-        pass
 
 
 class RequestMatcher:
@@ -306,13 +307,13 @@ class RequestMatcher:
 
     def __init__(
         self,
-        uri: Union[str, URIPattern, Pattern[str]],
+        uri: str | URIPattern | Pattern[str],
         method: str = METHOD_ALL,
-        data: Union[str, bytes, None] = None,
+        data: str | bytes | None = None,
         data_encoding: str = "utf-8",
-        headers: Optional[Mapping[str, str]] = None,
-        query_string: Union[None, QueryMatcher, str, bytes, Mapping] = None,
-        header_value_matcher: Optional[HVMATCHER_T] = None,
+        headers: Mapping[str, str] | None = None,
+        query_string: None | QueryMatcher | str | bytes | Mapping = None,
+        header_value_matcher: HVMATCHER_T | None = None,
         json: Any = UNDEFINED,
     ):
         if json is not UNDEFINED and data is not None:
@@ -383,7 +384,7 @@ class RequestMatcher:
             #
             # also, python will raise TypeError when self.uri is a conflicting type
 
-            return self.uri == URI_DEFAULT or path == self.uri
+            return self.uri in (URI_DEFAULT, path)
 
     def match_json(self, request: Request) -> bool:
         """
@@ -409,7 +410,7 @@ class RequestMatcher:
 
         return json_received == self.json
 
-    def difference(self, request: Request) -> List[Tuple]:
+    def difference(self, request: Request) -> list[tuple]:
         """
         Calculates the difference between the matcher and the request.
 
@@ -421,12 +422,12 @@ class RequestMatcher:
         matches the fields set in the matcher object.
         """
 
-        retval: List[Tuple] = []
+        retval: list[tuple] = []
 
         if not self.match_uri(request):
             retval.append(("uri", request.path, self.uri))
 
-        if self.method != METHOD_ALL and self.method != request.method:
+        if self.method not in (METHOD_ALL, request.method):
             retval.append(("method", request.method, self.method))
 
         if not self.query_matcher.match(request.query_string):
@@ -468,7 +469,7 @@ class RequestHandlerBase(abc.ABC):
         self,
         response_json,
         status: int = 200,
-        headers: Optional[Mapping[str, str]] = None,
+        headers: Mapping[str, str] | None = None,
         content_type: str = "application/json",
     ):
         """
@@ -485,11 +486,11 @@ class RequestHandlerBase(abc.ABC):
 
     def respond_with_data(
         self,
-        response_data: Union[str, bytes] = "",
+        response_data: str | bytes = "",
         status: int = 200,
-        headers: Optional[HEADERS_T] = None,
-        mimetype: Optional[str] = None,
-        content_type: Optional[str] = None,
+        headers: HEADERS_T | None = None,
+        mimetype: str | None = None,
+        content_type: str | None = None,
     ):
         """
         Prepares a response with raw data.
@@ -514,8 +515,6 @@ class RequestHandlerBase(abc.ABC):
         :param response: the response object which will be responded
         """
 
-        pass
-
 
 class RequestHandler(RequestHandlerBase):
     """
@@ -529,7 +528,7 @@ class RequestHandler(RequestHandlerBase):
 
     def __init__(self, matcher: RequestMatcher):
         self.matcher = matcher
-        self.request_handler: Optional[Callable[[Request], Response]] = None
+        self.request_handler: Callable[[Request], Response] | None = None
 
     def respond(self, request: Request) -> Response:
         """
@@ -576,7 +575,7 @@ class RequestHandlerList(list):
 
     """
 
-    def match(self, request: Request) -> Optional[RequestHandler]:
+    def match(self, request: Request) -> RequestHandler | None:
         """
         Returns the first request handler which matches the specified request. Otherwise, it returns `None`.
         """
@@ -619,7 +618,7 @@ class HTTPServerBase(abc.ABC):  # pylint: disable=too-many-instance-attributes
         self,
         host: str,
         port: int,
-        ssl_context: Optional[SSLContext] = None,
+        ssl_context: SSLContext | None = None,
     ):
         """
         Initializes the instance.
@@ -629,9 +628,9 @@ class HTTPServerBase(abc.ABC):  # pylint: disable=too-many-instance-attributes
         self.port = port
         self.server = None
         self.server_thread = None
-        self.assertions: List[str] = []
-        self.handler_errors: List[Exception] = []
-        self.log: List[Tuple[Request, Response]] = []
+        self.assertions: list[str] = []
+        self.handler_errors: list[Exception] = []
+        self.log: list[tuple[Request, Response]] = []
         self.ssl_context = ssl_context
         self.no_handler_status_code = 500
 
@@ -821,9 +820,9 @@ class HTTPServerBase(abc.ABC):  # pylint: disable=too-many-instance-attributes
         As the result, there's an assertion added (which can be raised by :py:meth:`check_assertions`).
 
         """
-        text = "No handler found for request {!r}.\n".format(request)
+        text = "No handler found for request {!r} with data {!r}.".format(request, request.data)
         self.add_assertion(text + extra_message)
-        return Response("No handler found for this request", self.no_handler_status_code)
+        return Response(text + extra_message, self.no_handler_status_code)
 
     @abc.abstractmethod
     def dispatch(self, request: Request) -> Response:
@@ -833,7 +832,6 @@ class HTTPServerBase(abc.ABC):  # pylint: disable=too-many-instance-attributes
         :param request: the request object from the werkzeug library
         :return: the response object what the handler responded, or a response which contains the error
         """
-        pass
 
     @Request.application  # type: ignore
     def application(self, request: Request):
@@ -916,15 +914,15 @@ class HTTPServer(HTTPServerBase):  # pylint: disable=too-many-instance-attribute
         self,
         host=DEFAULT_LISTEN_HOST,
         port=DEFAULT_LISTEN_PORT,
-        ssl_context: Optional[SSLContext] = None,
-        default_waiting_settings: Optional[WaitingSettings] = None,
+        ssl_context: SSLContext | None = None,
+        default_waiting_settings: WaitingSettings | None = None,
     ):
         """
         Initializes the instance.
         """
         super().__init__(host, port, ssl_context)
 
-        self.ordered_handlers: List[RequestHandler] = []
+        self.ordered_handlers: list[RequestHandler] = []
         self.oneshot_handlers = RequestHandlerList()
         self.handlers = RequestHandlerList()
         self.permanently_failed = False
@@ -957,13 +955,13 @@ class HTTPServer(HTTPServerBase):  # pylint: disable=too-many-instance-attribute
 
     def expect_request(
         self,
-        uri: Union[str, URIPattern, Pattern[str]],
+        uri: str | URIPattern | Pattern[str],
         method: str = METHOD_ALL,
-        data: Union[str, bytes, None] = None,
+        data: str | bytes | None = None,
         data_encoding: str = "utf-8",
-        headers: Optional[Mapping[str, str]] = None,
-        query_string: Union[None, QueryMatcher, str, bytes, Mapping] = None,
-        header_value_matcher: Optional[HVMATCHER_T] = None,
+        headers: Mapping[str, str] | None = None,
+        query_string: None | QueryMatcher | str | bytes | Mapping = None,
+        header_value_matcher: HVMATCHER_T | None = None,
         handler_type: HandlerType = HandlerType.PERMANENT,
         json: Any = UNDEFINED,
     ) -> RequestHandler:
@@ -1040,13 +1038,13 @@ class HTTPServer(HTTPServerBase):  # pylint: disable=too-many-instance-attribute
 
     def expect_oneshot_request(
         self,
-        uri: Union[str, URIPattern, Pattern[str]],
+        uri: str | URIPattern | Pattern[str],
         method: str = METHOD_ALL,
-        data: Union[str, bytes, None] = None,
+        data: str | bytes | None = None,
         data_encoding: str = "utf-8",
-        headers: Optional[Mapping[str, str]] = None,
-        query_string: Union[None, QueryMatcher, str, bytes, Mapping] = None,
-        header_value_matcher: Optional[HVMATCHER_T] = None,
+        headers: Mapping[str, str] | None = None,
+        query_string: None | QueryMatcher | str | bytes | Mapping = None,
+        header_value_matcher: HVMATCHER_T | None = None,
         json: Any = UNDEFINED,
     ) -> RequestHandler:
         """
@@ -1095,13 +1093,13 @@ class HTTPServer(HTTPServerBase):  # pylint: disable=too-many-instance-attribute
 
     def expect_ordered_request(
         self,
-        uri: Union[str, URIPattern, Pattern[str]],
+        uri: str | URIPattern | Pattern[str],
         method: str = METHOD_ALL,
-        data: Union[str, bytes, None] = None,
+        data: str | bytes | None = None,
         data_encoding: str = "utf-8",
-        headers: Optional[Mapping[str, str]] = None,
-        query_string: Union[None, QueryMatcher, str, bytes, Mapping] = None,
-        header_value_matcher: Optional[HVMATCHER_T] = None,
+        headers: Mapping[str, str] | None = None,
+        query_string: None | QueryMatcher | str | bytes | Mapping = None,
+        header_value_matcher: HVMATCHER_T | None = None,
         json: Any = UNDEFINED,
     ) -> RequestHandler:
         """
@@ -1185,7 +1183,7 @@ class HTTPServer(HTTPServerBase):  # pylint: disable=too-many-instance-attribute
 
         """
         if self._waiting_settings.stop_on_nohandler:
-            self._set_waiting_result(False)
+            self._set_waiting_result(value=False)
 
         return super().respond_nohandler(request, self.format_matchers() + extra_message)
 
@@ -1263,7 +1261,7 @@ class HTTPServer(HTTPServerBase):  # pylint: disable=too-many-instance-attribute
 
         return response
 
-    def _set_waiting_result(self, value: bool) -> None:
+    def _set_waiting_result(self, value: bool) -> None:  # noqa: FBT001
         """Set waiting_result
 
         Setting is implemented as putting value to queue without waiting. If queue is full we simply ignore the
@@ -1274,14 +1272,14 @@ class HTTPServer(HTTPServerBase):  # pylint: disable=too-many-instance-attribute
 
     def _update_waiting_result(self) -> None:
         if not self.oneshot_handlers and not self.ordered_handlers:
-            self._set_waiting_result(True)
+            self._set_waiting_result(value=True)
 
     @contextmanager
     def wait(
         self,
-        raise_assertions: Optional[bool] = None,
-        stop_on_nohandler: Optional[bool] = None,
-        timeout: Optional[float] = None,
+        raise_assertions: bool | None = None,
+        stop_on_nohandler: bool | None = None,
+        timeout: float | None = None,
     ):
         """Context manager to wait until the first of following event occurs: all ordered and oneshot handlers were
         executed, unexpected request was received (if `stop_on_nohandler` is set to `True`), or time was out
@@ -1331,7 +1329,7 @@ class HTTPServer(HTTPServerBase):  # pylint: disable=too-many-instance-attribute
             waiting.complete(result=False)
             if self._waiting_settings.raise_assertions:
                 raise AssertionError(
-                    "Wait timeout occurred, but some handlers left:\n" "{}".format(self.format_matchers())
+                    "Wait timeout occurred, but some handlers left:\n{}".format(self.format_matchers())
                 )
         if self._waiting_settings.raise_assertions and not waiting.result:
             self.check_assertions()

{pytest_httpserver-1.0.9 → pytest_httpserver-1.0.10}/pytest_httpserver/pytest_plugin.py

@@ -54,14 +54,14 @@ def make_httpserver(httpserver_listen_address, httpserver_ssl_context):
         server.stop()
 
 
-def pytest_sessionfinish(session, exitstatus):  # pylint: disable=unused-argument
+def pytest_sessionfinish(session, exitstatus):  # noqa: ARG001
     if Plugin.SERVER is not None:
         Plugin.SERVER.clear()
         if Plugin.SERVER.is_running():
             Plugin.SERVER.stop()
 
 
-@pytest.fixture
+@pytest.fixture()
 def httpserver(make_httpserver):
     server = make_httpserver
     yield server
@@ -78,7 +78,7 @@ def make_httpserver_ipv4(httpserver_ssl_context):
         server.stop()
 
 
-@pytest.fixture
+@pytest.fixture()
 def httpserver_ipv4(make_httpserver_ipv4):
     server = make_httpserver_ipv4
     yield server
@@ -95,7 +95,7 @@ def make_httpserver_ipv6(httpserver_ssl_context):
         server.stop()
 
 
-@pytest.fixture
+@pytest.fixture()
 def httpserver_ipv6(make_httpserver_ipv6):
     server = make_httpserver_ipv6
     yield server

{pytest_httpserver-1.0.9 → pytest_httpserver-1.0.10}/tests/test_blocking_httpserver.py

@@ -40,7 +40,7 @@ def then_the_response_is_got_from(server_connection, response):
     assert server_connection.get(timeout=9).json() == response
 
 
-@pytest.fixture
+@pytest.fixture()
 def httpserver():
     server = BlockingHTTPServer(timeout=1)
     server.start()
@@ -97,7 +97,10 @@ def test_ignores_when_request_is_not_asserted(httpserver: BlockingHTTPServer):
     )
 
     with when_a_request_is_being_sent_to_the_server(request) as server_connection:
-        assert server_connection.get(timeout=9).text == "No handler found for this request"
+        assert (
+            server_connection.get(timeout=9).text == "No handler found for request "
+            f"<Request 'http://localhost:{httpserver.port}/my/path' [GET]> with data b''."
+        )
 
 
 def test_raises_assertion_error_when_request_was_not_responded(httpserver: BlockingHTTPServer):

{pytest_httpserver-1.0.9 → pytest_httpserver-1.0.10}/tests/test_handler_errors.py

@@ -7,7 +7,7 @@ from pytest_httpserver import HTTPServer
 
 def test_check_assertions_raises_handler_assertions(httpserver: HTTPServer):
     def handler(_):
-        assert 1 == 2
+        assert False  # noqa: PT015
 
     httpserver.expect_request("/foobar").respond_with_handler(handler)
 
@@ -29,7 +29,7 @@ def test_check_handler_errors_raises_handler_error(httpserver: HTTPServer):
 
     httpserver.check_assertions()
 
-    with pytest.raises(ValueError):
+    with pytest.raises(ValueError):  # noqa: PT011
         httpserver.check_handler_errors()
 
 
@@ -48,10 +48,10 @@ def test_check_handler_errors_correct_order(httpserver: HTTPServer):
 
     httpserver.check_assertions()
 
-    with pytest.raises(ValueError):
+    with pytest.raises(ValueError):  # noqa: PT011
         httpserver.check_handler_errors()
 
-    with pytest.raises(OSError):
+    with pytest.raises(OSError):  # noqa: PT011
         httpserver.check_handler_errors()
 
     httpserver.check_handler_errors()
@@ -69,7 +69,7 @@ def test_missing_matcher_raises_exception(httpserver):
 
 def test_check_raises_errors_in_order(httpserver):
     def handler1(_):
-        assert 1 == 2
+        assert False  # noqa: PT015
 
     def handler2(_):
         pass  # does nothing
@@ -88,5 +88,5 @@ def test_check_raises_errors_in_order(httpserver):
     with pytest.raises(AssertionError):
         httpserver.check()
 
-    with pytest.raises(ValueError):
+    with pytest.raises(ValueError):  # noqa: PT011
         httpserver.check()

{pytest_httpserver-1.0.9 → pytest_httpserver-1.0.10}/tests/test_json_matcher.py

@@ -36,5 +36,5 @@ def test_json_matcher_with_invalid_json(httpserver: HTTPServer):
 
 
 def test_data_and_json_mutually_exclusive(httpserver: HTTPServer):
-    with pytest.raises(ValueError):
+    with pytest.raises(ValueError):  # noqa: PT011
         httpserver.expect_request("/foo", json={}, data="foo")

{pytest_httpserver-1.0.9 → pytest_httpserver-1.0.10}/tests/test_parse_qs.py

@@ -1,6 +1,6 @@
+from __future__ import annotations
+
 import urllib.parse
-from typing import List
-from typing import Tuple
 
 import pytest
 
@@ -17,6 +17,6 @@ parse_qsl_semicolon_cases = [
 ]
 
 
-@pytest.mark.parametrize("qs,expected", parse_qsl_semicolon_cases)
-def test_qsl(qs: str, expected: List[Tuple[bytes, bytes]]):
+@pytest.mark.parametrize(("qs", "expected"), parse_qsl_semicolon_cases)
+def test_qsl(qs: str, expected: list[tuple[bytes, bytes]]):
     assert urllib.parse.parse_qsl(qs, keep_blank_values=True) == expected

{pytest_httpserver-1.0.9 → pytest_httpserver-1.0.10}/tests/test_port_changing.py

@@ -9,7 +9,7 @@ PORT_KEY = "PYTEST_HTTPSERVER_PORT"
 HOST_KEY = "PYTEST_HTTPSERVER_HOST"
 
 
-@pytest.fixture
+@pytest.fixture()
 def tmpenv():
     old_vars = {}
     for key in (HOST_KEY, PORT_KEY):
@@ -37,7 +37,7 @@ def test_port_changing_by_environment(httpserver: HTTPServer):
     assert httpserver.port == int(os.environ[PORT_KEY])
 
 
-def test_get_httpserver_listen_address_with_env(tmpenv):
+def test_get_httpserver_listen_address_with_env(tmpenv):  # noqa: ARG001
     address = get_httpserver_listen_address()
     assert address[0] == "5.5.5.5"
     assert address[1] == 12345

{pytest_httpserver-1.0.9 → pytest_httpserver-1.0.10}/tests/test_querymatcher.py

@@ -28,7 +28,7 @@ def test_qm_bytes():
 
 
 def test_qm_boolean():
-    qm = BooleanQueryMatcher(True)
+    qm = BooleanQueryMatcher(result=True)
     assert_match(qm, b"k1=v1")
 
 

{pytest_httpserver-1.0.9 → pytest_httpserver-1.0.10}/tests/test_release.py

@@ -1,5 +1,4 @@
-# TODO: skip if poetry is not available or add mark to test it explicitly
-
+from __future__ import annotations
 
 import email
 import re
@@ -10,11 +9,13 @@ import zipfile
 from dataclasses import dataclass
 from pathlib import Path
 from typing import Iterable
-from typing import Tuple
 
 import pytest
 import toml
 
+# TODO: skip if poetry is not available or add mark to test it explicitly
+
+
 pytestmark = pytest.mark.release
 
 NAME = "pytest-httpserver"
@@ -45,7 +46,7 @@ class Wheel:
 
     def extract(self):
         with zipfile.ZipFile(self.path) as zf:
-            zf.extractall(self.wheel_out_dir)
+            zf.extractall(self.wheel_out_dir)  # noqa: S202
 
     def get_meta(self, version: str, name: str = NAME_UNDERSCORE) -> email.message.Message:
         metadata_path = self.wheel_out_dir.joinpath(f"{name}-{version}.dist-info", "METADATA")
@@ -65,7 +66,7 @@ class Sdist:
 
     def extract(self):
         with tarfile.open(self.path, mode="r:gz") as tf:
-            tf.extractall(self.sdist_out_dir)
+            tf.extractall(self.sdist_out_dir)  # noqa: S202
 
 
 @dataclass
@@ -104,7 +105,7 @@ def version(pyproject) -> str:
     return pyproject["tool"]["poetry"]["version"]
 
 
-def version_to_tuple(version: str) -> Tuple:
+def version_to_tuple(version: str) -> tuple:
     return tuple([int(x) for x in version.split(".")])