httpdbg 2.2.0__tar.gz → 2.3.0__tar.gz

{httpdbg-2.2.0 → httpdbg-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: httpdbg
-Version: 2.2.0
+Version: 2.3.0
 Summary: A very simple tool to debug HTTP(S) client and server requests.
 Author-email: cle-b <cle@tictac.pm>
 License-Expression: Apache-2.0
@@ -10,16 +10,16 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Software Development :: Testing
 Classifier: Topic :: Utilities
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Dynamic: license-file

{httpdbg-2.2.0 → httpdbg-2.3.0}/httpdbg/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.2.0"
+__version__ = "2.3.0"
 
 __all__ = ["export_html", "httprecord", "HTTPRecords"]
 

{httpdbg-2.2.0 → httpdbg-2.3.0}/httpdbg/__main__.py

@@ -2,7 +2,6 @@ import argparse
 from pathlib import Path
 import sys
 import time
-from typing import Union
 
 from httpdbg import __version__
 from httpdbg.args import read_args
@@ -32,7 +31,7 @@ def pyhttpdbg(
 
     def run_recorder(
         records: HTTPRecords,
-        initiators: Union[list[str], None],
+        initiators: list[str] | None,
         record_server: bool,
         test_mode: bool,
     ):

{httpdbg-2.2.0 → httpdbg-2.3.0}/httpdbg/hooks/aiohttp.py

@@ -1,6 +1,6 @@
 from collections.abc import Callable
+from collections.abc import Generator
 from contextlib import contextmanager
-from typing import Generator
 
 from httpdbg.hooks.utils import getcallargs
 from httpdbg.hooks.utils import decorate

{httpdbg-2.2.0 → httpdbg-2.3.0}/httpdbg/hooks/all.py

@@ -1,6 +1,5 @@
+from collections.abc import Generator
 from contextlib import contextmanager
-from typing import Generator
-from typing import Union
 
 from httpdbg.hooks.aiohttp import hook_aiohttp
 from httpdbg.hooks.external import watcher_external
@@ -24,7 +23,7 @@ from httpdbg.records import HTTPRecords
 @contextmanager
 def httprecord(
     records: HTTPRecords = None,
-    initiators: Union[list[str], None] = None,
+    initiators: list[str] | None = None,
     client: bool = True,
     server: bool = False,
     ignore: tuple[tuple[str, int], ...] = (),

{httpdbg-2.2.0 → httpdbg-2.3.0}/httpdbg/hooks/external.py

@@ -1,12 +1,11 @@
+from collections.abc import Generator
 from contextlib import contextmanager
-from typing import Generator
 import glob
 import os
 import pickle
 import tempfile
 import time
 import threading
-from typing import Union
 
 from httpdbg.env import HTTPDBG_MULTIPROCESS_DIR
 from httpdbg.log import logger
@@ -16,7 +15,7 @@ from httpdbg.records import HTTPRecords
 @contextmanager
 def watcher_external(
     records: HTTPRecords,
-    initiators: Union[list[str], None] = None,
+    initiators: list[str] | None = None,
     server: bool = False,
 ) -> Generator[HTTPRecords, None, None]:
     if HTTPDBG_MULTIPROCESS_DIR not in os.environ:

{httpdbg-2.2.0 → httpdbg-2.3.0}/httpdbg/hooks/fastapi.py

@@ -1,10 +1,9 @@
 from collections.abc import Callable
+from collections.abc import Generator
 from contextlib import contextmanager
+import datetime
 import functools
 from functools import wraps
-from typing import Generator
-
-import datetime
 
 from httpdbg.hooks.utils import decorate
 from httpdbg.hooks.utils import getcallargs

{httpdbg-2.2.0 → httpdbg-2.3.0}/httpdbg/hooks/flask.py

@@ -1,8 +1,8 @@
 from collections.abc import Callable
+from collections.abc import Generator
 from contextlib import contextmanager
 import functools
 from functools import wraps
-from typing import Generator
 
 
 from httpdbg.hooks.utils import getcallargs

{httpdbg-2.2.0 → httpdbg-2.3.0}/httpdbg/hooks/generic.py

@@ -1,13 +1,12 @@
 import builtins
 from collections.abc import Callable
+from collections.abc import Generator
 from contextlib import contextmanager
 import functools
 import importlib
 import inspect
 from types import ModuleType
 from typing import Any
-from typing import Generator
-from typing import Union
 
 from httpdbg.hooks.utils import decorate
 from httpdbg.hooks.utils import undecorate
@@ -42,7 +41,7 @@ def set_hook_for_generic(records: HTTPRecords, method: Any):
 
 @contextmanager
 def hook_generic(
-    records: HTTPRecords, initiators: Union[list[str], None] = None
+    records: HTTPRecords, initiators: list[str] | None = None
 ) -> Generator[None, None, None]:
     if initiators:
         # we add a hook for a generic initiator only if the module is imported

{httpdbg-2.2.0 → httpdbg-2.3.0}/httpdbg/hooks/h2.py

@@ -1,8 +1,7 @@
 from collections.abc import Callable
+from collections.abc import Generator
 from contextlib import contextmanager
 import random
-from typing import Generator
-from typing import Union
 
 from httpdbg.hooks.recordhttp2 import HTTP2Record
 from httpdbg.hooks.utils import decorate
@@ -67,7 +66,7 @@ class TracerHTTP2:
         stream_id: int,
         headers: list[tuple[bytes, bytes]],
         is_client: bool = True,
-    ) -> Union[HTTP2Record, None]:
+    ) -> HTTP2Record | None:
         record = None
         if not is_client:
             if f"{socket_id}-{stream_id}" in self.sockets:

{httpdbg-2.2.0 → httpdbg-2.3.0}/httpdbg/hooks/http.py

@@ -1,7 +1,6 @@
 from collections.abc import Callable
+from collections.abc import Generator
 from contextlib import contextmanager
-from typing import Generator
-
 
 from httpdbg.hooks.utils import decorate
 from httpdbg.hooks.utils import undecorate

{httpdbg-2.2.0 → httpdbg-2.3.0}/httpdbg/hooks/httpx.py

@@ -1,6 +1,6 @@
 from collections.abc import Callable
+from collections.abc import Generator
 from contextlib import contextmanager
-from typing import Generator
 
 from httpdbg.hooks.utils import getcallargs
 from httpdbg.hooks.utils import decorate

{httpdbg-2.2.0 → httpdbg-2.3.0}/httpdbg/hooks/pytest.py

@@ -1,6 +1,6 @@
 from collections.abc import Callable
+from collections.abc import Generator
 from contextlib import contextmanager
-from typing import Generator
 
 from httpdbg.hooks.utils import decorate
 from httpdbg.hooks.utils import getcallargs

{httpdbg-2.2.0 → httpdbg-2.3.0}/httpdbg/hooks/record.py

@@ -1,6 +1,5 @@
 from abc import ABC, abstractmethod
 import datetime
-from typing import Union
 from urllib.parse import urlparse
 
 from httpdbg.utils import get_new_uuid
@@ -98,12 +97,12 @@ class HTTPRecord(ABC):
     ) -> None:
         self.id = get_new_uuid()
         self.address: tuple[str, int] = ("", 0)
-        self._url: Union[str, None] = None
+        self._url: str | None = None
         self.initiator_id: str = initiator_id
-        self.exception: Union[Exception, None] = None
-        self.ssl: Union[bool, None] = None
+        self.exception: Exception | None = None
+        self.ssl: bool | None = None
         self.tbegin: datetime.datetime = datetime.datetime.now(datetime.timezone.utc)
-        self.tag: Union[str, None] = tag
+        self.tag: str | None = tag
         self.group_id: str = group_id
         self.is_client: bool = is_client
         if tbegin:

{httpdbg-2.2.0 → httpdbg-2.3.0}/httpdbg/hooks/requests.py

@@ -1,6 +1,6 @@
 from collections.abc import Callable
+from collections.abc import Generator
 from contextlib import contextmanager
-from typing import Generator
 
 from httpdbg.hooks.utils import getcallargs
 from httpdbg.hooks.utils import decorate

{httpdbg-2.2.0 → httpdbg-2.3.0}/httpdbg/hooks/socket.py

@@ -1,14 +1,13 @@
 import asyncio
 import asyncio.proactor_events
 from collections.abc import Callable
+from collections.abc import Generator
 from contextlib import contextmanager
 import datetime
 import platform
 import socket
 import ssl
 import sys
-from typing import Generator
-from typing import Union
 
 from httpdbg.initiator import httpdbg_initiator
 from httpdbg.log import logger
@@ -28,7 +27,7 @@ class SocketRawData(object):
         self.address: tuple[str, int] = address
         self.ssl: bool = ssl
         self._rawdata: bytes = bytes()
-        self.record: Union[HTTP1Record, None] = None
+        self.record: HTTP1Record | None = None
         self.tbegin: datetime.datetime = datetime.datetime.now(datetime.timezone.utc)
 
     @property
@@ -42,7 +41,7 @@ class SocketRawData(object):
         )
         self._rawdata = value
 
-    def http_detected(self) -> Union[bool, None]:
+    def http_detected(self) -> bool | None:
         end_of_first_line = self.rawdata[:2048].find(b"\r\n")
         if end_of_first_line == -1:
             if len(self.rawdata) > 2048:
@@ -66,14 +65,14 @@ class TracerHTTP1:
         self,
         ignore: tuple[tuple[str, int], ...] = (),
     ):
-        self.sockets: dict[int, Union[SocketRawData, None]] = (
+        self.sockets: dict[int, SocketRawData | None] = (
             {}
         )  # if None, this is not a HTTP/1 request
         self.ignore: tuple[tuple[str, int], ...] = ignore
 
     def get_socket_data(
         self, obj, extra_sock=None, force_new=False, request=None, is_uvicorn=False
-    ) -> Union[SocketRawData, None]:
+    ) -> SocketRawData | None:
         """Record a new SocketRawData (or get an existing one) and return it."""
         socketdata = None
 

{httpdbg-2.2.0 → httpdbg-2.3.0}/httpdbg/hooks/starlette.py

@@ -1,7 +1,7 @@
 from collections.abc import Callable
+from collections.abc import Generator
 from contextlib import contextmanager
 from functools import wraps
-from typing import Generator
 
 from httpdbg.hooks.utils import decorate
 from httpdbg.hooks.utils import getcallargs

{httpdbg-2.2.0 → httpdbg-2.3.0}/httpdbg/hooks/template_sitecustomize.py

@@ -4,7 +4,6 @@ import pickle
 import sys
 import time
 import threading
-from typing import Union
 import uuid
 
 from httpdbg import HTTPRecords
@@ -25,7 +24,7 @@ class HttpdbgRecorder:
             os.environ[HTTPDBG_MULTIPROCESS_DIR], str(uuid.uuid1())
         )
         self.context = None
-        self.records: Union[HTTPRecords, None] = None
+        self.records: HTTPRecords | None = None
 
     def _save_to_disk_loop(self):
         while self._running:

{httpdbg-2.2.0 → httpdbg-2.3.0}/httpdbg/hooks/unittest.py

@@ -1,9 +1,9 @@
 from collections.abc import Callable
+from collections.abc import Generator
 from contextlib import contextmanager
 import inspect
 import os
 import typing
-from typing import Generator
 
 from httpdbg.initiator import httpdbg_group
 from httpdbg.initiator import httpdbg_tag

{httpdbg-2.2.0 → httpdbg-2.3.0}/httpdbg/hooks/urllib3.py

@@ -1,6 +1,6 @@
 from collections.abc import Callable
+from collections.abc import Generator
 from contextlib import contextmanager
-from typing import Generator
 
 from httpdbg.hooks.utils import getcallargs
 from httpdbg.hooks.utils import decorate

{httpdbg-2.2.0 → httpdbg-2.3.0}/httpdbg/hooks/uvicorn.py

@@ -1,8 +1,8 @@
 from collections.abc import Callable
+from collections.abc import Generator
 from contextlib import contextmanager
 import datetime
 import typing
-from typing import Generator
 
 from httpdbg.hooks.utils import decorate
 from httpdbg.hooks.utils import undecorate

{httpdbg-2.2.0 → httpdbg-2.3.0}/httpdbg/initiator.py

@@ -1,4 +1,5 @@
 from collections.abc import Callable
+from collections.abc import Generator
 from contextlib import contextmanager
 import datetime
 import functools
@@ -7,8 +8,6 @@ import linecache
 import os
 import platform
 import traceback
-from typing import Generator
-from typing import Union
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -347,7 +346,7 @@ def httpdbg_group(
 @contextmanager
 def httpdbg_endpoint(
     records: "HTTPRecords", original_method: Callable, *args, **kwargs
-) -> Generator[Union[Group, None], None, None]:
+) -> Generator[Group | None, None, None]:
 
     filename = inspect.getsourcefile(original_method)
     if filename:

{httpdbg-2.2.0 → httpdbg-2.3.0}/httpdbg/log.py

@@ -3,7 +3,6 @@ from functools import cache
 import logging
 import os
 from pathlib import Path
-from typing import Union
 
 from httpdbg.env import HTTPDBG_LOG_LEVEL
 from httpdbg.env import HTTPDBG_LOG_PATH
@@ -18,7 +17,7 @@ class LogLevel(Enum):
     CRITICAL = "critical"
 
 
-def set_env_for_logging(log_level: LogLevel, path: Union[Path, None]):
+def set_env_for_logging(log_level: LogLevel, path: Path | None):
 
     os.environ[HTTPDBG_LOG_LEVEL] = str(
         {

{httpdbg-2.2.0 → httpdbg-2.3.0}/httpdbg/mode_console.py

@@ -1,6 +1,4 @@
 import code
-from typing import Optional
-from typing import Union
 
 from httpdbg.records import HTTPRecords
 from httpdbg.initiator import httpdbg_group
@@ -18,7 +16,7 @@ class InteractiveConsoleWithHistory(code.InteractiveConsole):
         self.incomplete_block: bool = False
         super().__init__(locals)
 
-    def push(self, line: str, filename: Optional[str] = None) -> bool:
+    def push(self, line: str, *args, **kwargs) -> bool:
         if line:  # if the line is empty, we don't add it in the history
             if (
                 self.incomplete_block
@@ -43,17 +41,14 @@ class InteractiveConsoleWithHistory(code.InteractiveConsole):
         full_label = ">>> " + "\n>>> ".join(latest_history)
 
         with httpdbg_group(self.records, label, full_label):
-            if filename is None:
-                self.incomplete_block = super().push(line)
-            else:
-                self.incomplete_block = super().push(line, filename)
+            self.incomplete_block = super().push(line, *args, **kwargs)
 
         return self.incomplete_block
 
 
 def run_console(
     records: HTTPRecords, test_mode: bool = False
-) -> Union[InteractiveConsoleWithHistory, None]:
+) -> InteractiveConsoleWithHistory | None:
     try:
         vars = globals()
         vars.update(locals())

{httpdbg-2.2.0 → httpdbg-2.3.0}/httpdbg/preview.py

@@ -1,6 +1,3 @@
-from typing import Union
-
-
 def parse_content_type(content_type: str) -> tuple[str, dict[str, str]]:
     s = content_type.split(";")
     media_type = s[0]
@@ -14,8 +11,8 @@ def parse_content_type(content_type: str) -> tuple[str, dict[str, str]]:
 
 def generate_preview(
     raw_data: bytes, content_type: str, content_encoding: str
-) -> dict[str, Union[str, bool]]:
-    body: dict[str, Union[str, bool]] = {}
+) -> dict[str, str | bool]:
+    body: dict[str, str | bool] = {}
 
     body["content_type"] = content_type
 

{httpdbg-2.2.0 → httpdbg-2.3.0}/httpdbg/records.py

@@ -1,6 +1,5 @@
 import datetime
 import sys
-from typing import Union
 
 from httpdbg.hooks.record import HTTPRecord
 from httpdbg.initiator import Group
@@ -38,10 +37,10 @@ class HTTPRecords:
         self.requests: dict[str, HTTPRecord] = {}
         self.requests_already_loaded = 0
         self.initiators: dict[str, Initiator] = {}
-        self.current_initiator: Union[str, None] = None
+        self.current_initiator: str | None = None
         self.groups: dict[str, Group] = {}
-        self.current_group: Union[str, None] = None
-        self.current_tag: Union[str, None] = None
+        self.current_group: str | None = None
+        self.current_tag: str | None = None
         self._tracerhttp1: TracerHTTP1 = TracerHTTP1(ignore=self.ignore)
         self._tracerhttp2: TracerHTTP2 = TracerHTTP2(ignore=self.ignore)
 

{httpdbg-2.2.0 → httpdbg-2.3.0}/httpdbg/server.py

@@ -1,7 +1,7 @@
+from collections.abc import Generator
 from contextlib import contextmanager
 from http.server import HTTPServer
 import threading
-from typing import Generator
 
 from httpdbg.exception import HttpdbgException
 from httpdbg.records import HTTPRecords

{httpdbg-2.2.0 → httpdbg-2.3.0}/httpdbg/webapp/api.py

@@ -1,7 +1,6 @@
 from json import JSONEncoder
 import traceback
 from typing import Any
-from typing import Union
 
 from httpdbg.records import HTTPRecords
 from httpdbg.records import HTTPRecord
@@ -71,7 +70,7 @@ class RequestListPayload(JSONEncoder):
             records, HTTPRecords
         ), "This encoder works only for HTTPRecords object."
 
-        payload: dict[str, dict[str, Union[str, dict]]] = {
+        payload: dict[str, dict[str, str | dict]] = {
             "session": {
                 "id": records.session.id,
                 "command_line": records.session.command_line,

{httpdbg-2.2.0 → httpdbg-2.3.0}/httpdbg/webapp/static/index.htm

@@ -299,7 +299,14 @@
                                 </div>
 
                                 <script id="template_headers" type="x-tmpl-mustache">
-                                       <b>{{ method }}</b> <a href="{{ url }}">{{ url }}</a>
+                                       <button title="copy to clipboard" onclick="navigator.clipboard.writeText({{url_to_clipboard}});"><svg class="icon"><use href="#files-papers-outline-icon"></use></svg></button>
+                                       <span class="header-cookie-key">{{verb}}</span>
+                                       {{#is_http}}
+                                       <a class="header-cookie-value" target="_blank" href="{{url}}">{{url}}</a>
+                                       {{/is_http}}
+                                       {{^is_http}}
+                                       <span class="header-cookie-value" title="Warning: This URL uses a non-HTTP/HTTPS scheme and has been disabled for security reasons.">{{url}}</span>
+                                       {{/is_http}}
                                        <hr>
                                             <span class="header-cookie-key">status:</span>
                                             <span class="header-cookie-value">{{ status_code }} {{ reason }} {{#http100}}(after 100 Continue){{/http100}}</span>

{httpdbg-2.2.0 → httpdbg-2.3.0}/httpdbg/webapp/static/render.js

@@ -156,6 +156,14 @@ function fill_content(request_id, name) {
 
     var req = global.requests[request_id];
 
+    try {
+        const parsed_url = new URL(req.url);
+        req.is_http = ["http:", "https:"].includes(parsed_url.protocol);
+    } catch {
+        req.is_http = false;
+    }
+    req.url_to_clipboard = "global.requests['" + request_id + "'].url";
+
     update_with_template("template_title", document.querySelector("#title > div[name='" + name + "']"), req);
 
     update_with_template("template_headers", document.querySelector("#headers > div[name='" + name + "']"), req);

{httpdbg-2.2.0 → httpdbg-2.3.0}/httpdbg.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: httpdbg
-Version: 2.2.0
+Version: 2.3.0
 Summary: A very simple tool to debug HTTP(S) client and server requests.
 Author-email: cle-b <cle@tictac.pm>
 License-Expression: Apache-2.0
@@ -10,16 +10,16 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Software Development :: Testing
 Classifier: Topic :: Utilities
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Dynamic: license-file

{httpdbg-2.2.0 → httpdbg-2.3.0}/pyproject.toml

@@ -9,7 +9,7 @@ authors = [
 ]
 description="A very simple tool to debug HTTP(S) client and server requests."
 readme="README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 license = "Apache-2.0"
 license-files = ["LICENSE"]
 classifiers = [
@@ -17,12 +17,12 @@ classifiers = [
     "Intended Audience :: Developers",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
-    "Programming Language :: Python :: 3.14",    
+    "Programming Language :: Python :: 3.14",
+    "Programming Language :: Python :: 3.15",
     "Topic :: Internet :: WWW/HTTP",
     "Topic :: Software Development :: Testing",
     "Topic :: Utilities",