build: use latest pyo3 API

winstxnhdw · winstxnhdw · commit 9884e970e8b7 · 2026-01-15T02:52:03.000+08:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,17 +12,20 @@ readme = "README.md"
 license-file = "LICENSE"
 repository = "https://github.com/litestar-org/fast-query-parsers"
 version = "1.0.3"
-edition = "2021"
+edition = "2024"
 
 [lib]
 name = "fast_query_parsers"
 crate-type = ["cdylib"]
 
+[build-dependencies]
+pyo3-build-config = { version = "0.27.2", features = ["resolve-config"] }
+
 [dependencies]
-lazy_static = "1.4.0"
-pyo3 = { version = "0.19.2", features = ["extension-module", "abi3-py38"] }
-pythonize = "0.19.0"
-regex = { version = "1.9.3", features = ["perf"] }
-rustc-hash = "1.1.0"
-serde_json = "1.0.105"
+lazy_static = "1.5.0"
+pyo3 = { version = "0.27.2", default-features = false, features = ["macros"] }
+pythonize = "0.27.0"
+regex = "1.12.2"
+rustc-hash = "2.1.1"
+serde_json = "1.0.145"
 urlencoding = "2.1.3"
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@
 | CI/CD     |     | [![Publish](https://github.com/litestar-org/fast-query-parsers/actions/workflows/publish.yaml/badge.svg)](https://github.com/litestar-org/fast-query-parsers/actions/workflows/publish.yaml) [![CI](https://github.com/litestar-org/fast-query-parsers/actions/workflows/ci.yaml/badge.svg)](https://github.com/litestar-org/fast-query-parsers/actions/workflows/ci.yaml)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
 | Package   |     | [![PyPI - Version](https://img.shields.io/pypi/v/fast-query-parsers?labelColor=202235&color=edb641&logo=python&logoColor=edb641)](https://badge.fury.io/py/litestar) ![PyPI - Support Python Versions](https://img.shields.io/pypi/pyversions/fast-query-parsers?labelColor=202235&color=edb641&logo=python&logoColor=edb641) ![PyPI - Downloads](https://img.shields.io/pypi/dm/fast-query-parsers?logo=python&label=fast-query-parsers%20downloads&labelColor=202235&color=edb641&logoColor=edb641)                                                                                                                                                                                                                                                                                                                                                                                                                   |
 | Community |     | [![Reddit](https://img.shields.io/reddit/subreddit-subscribers/litestarapi?label=r%2FLitestar&logo=reddit&labelColor=202235&color=edb641&logoColor=edb641)](https://reddit.com/r/litestarapi) [![Discord](https://img.shields.io/discord/919193495116337154?labelColor=202235&color=edb641&label=chat%20on%20discord&logo=discord&logoColor=edb641)](https://discord.gg/X3FJqy8d2j) [![Matrix](https://img.shields.io/badge/chat%20on%20Matrix-bridged-202235?labelColor=202235&color=edb641&logo=matrix&logoColor=edb641)](https://matrix.to/#/#litestar:matrix.org) [![Medium](https://img.shields.io/badge/Medium-202235?labelColor=202235&color=edb641&logo=medium&logoColor=edb641)](https://blog.litestar.dev) [![Twitter](https://img.shields.io/twitter/follow/LitestarAPI?labelColor=202235&color=edb641&logo=twitter&logoColor=edb641&style=flat)](https://twitter.com/LitestarAPI) [![Blog](https://img.shields.io/badge/Blog-litestar.dev-202235?logo=blogger&labelColor=202235&color=edb641&logoColor=edb641)](https://blog.litestar.dev) |
-| Meta      |     | [![Litestar Project](https://img.shields.io/badge/Litestar%20Org-%E2%AD%90%20Fast%20Query%20Parsers-202235.svg?logo=python&labelColor=202235&color=edb641&logoColor=edb641)](https://github.com/litestar-org/fast-query-parsers) [![License - MIT](https://img.shields.io/badge/license-MIT-202235.svg?logo=python&labelColor=202235&color=edb641&logoColor=edb641)](https://spdx.org/licenses/) [![Litestar Sponsors](https://img.shields.io/badge/Sponsor-%E2%9D%A4-%23edb641.svg?&logo=github&logoColor=edb641&labelColor=202235)](https://github.com/sponsors/litestar-org) [![linting - Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json&labelColor=202235)](https://github.com/astral-sh/ruff) [![code style - Black](https://img.shields.io/badge/code%20style-black-000000.svg?logo=python&labelColor=202235&logoColor=edb641)](https://github.com/psf/black)                                                                                                         |
+| Meta      |     | [![Litestar Project](https://img.shields.io/badge/Litestar%20Org-%E2%AD%90%20Fast%20Query%20Parsers-202235.svg?logo=python&labelColor=202235&color=edb641&logoColor=edb641)](https://github.com/litestar-org/fast-query-parsers) [![License - MIT](https://img.shields.io/badge/license-MIT-202235.svg?logo=python&labelColor=202235&color=edb641&logoColor=edb641)](https://spdx.org/licenses/) [![Litestar Sponsors](https://img.shields.io/badge/Sponsor-%E2%9D%A4-%23edb641.svg?&logo=github&logoColor=edb641&labelColor=202235)](https://github.com/sponsors/litestar-org) [![linting - Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json&labelColor=202235)](https://github.com/astral-sh/ruff)|
 
 <!-- prettier-ignore-end -->
 </div>
@@ -122,13 +122,13 @@ To actually mimic the parsing done by `parse_url_encoded_dict` we will need a ut
 from collections import defaultdict
 from contextlib import suppress
 from json import loads, JSONDecodeError
-from typing import Any, DefaultDict, Dict, List
+from typing import Any
 from urllib.parse import parse_qsl
 
 
-def parse_url_encoded_form_data(encoded_data: bytes) -> Dict[str, Any]:
-    """Parse an url encoded form data into dict of parsed values"""
-    decoded_dict: DefaultDict[str, List[Any]] = defaultdict(list)
+def parse_url_encoded_form_data(encoded_data: bytes) -> dict[str, Any]:
+    """Parse a url encoded form data into dict of parsed values"""
+    decoded_dict: defaultdict[str, list[Any]] = defaultdict(list)
     for k, v in parse_qsl(encoded_data.decode(), keep_blank_values=True):
         with suppress(JSONDecodeError):
             v = loads(v) if isinstance(v, str) else v
diff --git a/benchmarks.py b/benchmarks.py
@@ -1,7 +1,9 @@
+from __future__ import annotations
+
 from collections import defaultdict
 from contextlib import suppress
 from json import JSONDecodeError, loads
-from typing import Any, DefaultDict, Dict, List
+from typing import Any
 from urllib.parse import parse_qs as stdlib_parse_qs
 from urllib.parse import parse_qsl as stdlib_parse_qsl
 from urllib.parse import urlencode
@@ -19,11 +21,11 @@
         ("calories", "122.53"),
         ("healthy", True),
         ("polluting", False),
-    ]
+    ],
 ).encode()
 
 
-def parse_url_encoded_form_data(encoded_data: bytes) -> Dict[str, Any]:
+def parse_url_encoded_form_data(encoded_data: bytes) -> dict[str, Any]:
     """Parse an url encoded form data dict.
 
     Args:
@@ -35,15 +37,15 @@ def parse_url_encoded_form_data(encoded_data: bytes) -> Dict[str, Any]:
         A parsed dict.
 
     """
-    decoded_dict: DefaultDict[str, List[Any]] = defaultdict(list)
+    decoded_dict: defaultdict[str, list[Any]] = defaultdict(list)
     for k, v in stdlib_parse_qsl(encoded_data.decode(), keep_blank_values=True):
         with suppress(JSONDecodeError):
             v = loads(v) if isinstance(v, str) else v  # noqa: PLW2901
         decoded_dict[k].append(v)
     return {k: v if len(v) > 1 else v[0] for k, v in decoded_dict.items()}
 
 
-def bench_qsl(runner: pyperf.Runner):
+def bench_qsl(runner: pyperf.Runner) -> None:
     runner.bench_func(
         "stdlib parse_qsl parsing query string",
         lambda: stdlib_parse_qsl(b"key=1&key=2&key=3&another=a&zorg=5=".decode(), keep_blank_values=True),
@@ -59,7 +61,7 @@ def bench_qsl(runner: pyperf.Runner):
     runner.bench_func("parse_query_string urlencoded query string", lambda: parse_query_string(url_encoded_query, "&"))
 
 
-def bench_qs(runner: pyperf.Runner):
+def bench_qs(runner: pyperf.Runner) -> None:
     runner.bench_func(
         "stdlib parse_qs parsing url-encoded values into dict",
         lambda: stdlib_parse_qs(url_encoded_query.decode()),
@@ -69,7 +71,8 @@ def bench_qs(runner: pyperf.Runner):
         lambda: parse_url_encoded_form_data(url_encoded_query),
     )
     runner.bench_func(
-        "parse_url_encoded_dict parsing url-encoded values into dict", lambda: parse_url_encoded_dict(url_encoded_query)
+        "parse_url_encoded_dict parsing url-encoded values into dict",
+        lambda: parse_url_encoded_dict(url_encoded_query),
     )
 
 
diff --git a/build.rs b/build.rs
@@ -0,0 +1,3 @@
+fn main() {
+    pyo3_build_config::use_pyo3_cfgs();
+}
diff --git a/pyproject.toml b/pyproject.toml
@@ -58,41 +58,7 @@ line-length = 120
 target-version = "py38"
 
 [tool.ruff.lint]
-select = [
-    "A",   # flake8-builtins
-    "B",   # flake8-bugbear
-    "BLE", # flake8-blind-except
-    "C4",  # flake8-comprehensions
-    "D",   # pydocstyle
-    "DJ",  # flake8-django
-    "DTZ", # flake8-datetimez
-    "E",   # pycodestyle errors
-    "ERA", # eradicate
-    "EXE", # flake8-executable
-    "F",   # pyflakes
-    "G",   # flake8-logging-format
-    "I",   # isort
-    "ICN", # flake8-import-conventions
-    "ISC", # flake8-implicit-str-concat
-    "N",   # pep8-naming
-    "PIE", # flake8-pie
-    "PLC", # pylint - convention
-    "PLE", # pylint - error
-    "PLW", # pylint - warning
-    "PTH", # flake8-use-pathlib
-    "Q",   # flake8-quotes
-    "RET", # flake8-return
-    "RUF", # Ruff-specific rules
-    "S",   # flake8-bandit
-    "SIM", # flake8-simplify
-    "T10", # flake8-debugger
-    "T20", # flake8-print
-    "TC",  # flake8-type-checking
-    "TID", # flake8-tidy-imports
-    "UP",  # pyupgrade
-    "W",   # pycodestyle - warning
-    "YTT", # flake8-2020
-]
+select = ["ALL"]
 ignore = [
     "A003", # flake8-builtins - class attribute {name} is shadowing a python builtin
     "B010", # flake8-bugbear - do not call setattr with a constant attribute value
diff --git a/src/lib.rs b/src/lib.rs
@@ -1,28 +1,32 @@
 mod query_string;
 
 use pyo3::prelude::*;
+use pyo3::types::PyAny;
 use pythonize::pythonize;
 
 pub use query_string::{parse_query_string as parse_qs, parse_query_string_to_json};
 
 // parse query string into a list of tuples.
 #[pyfunction]
 #[pyo3(text_signature = "(qs, separator)")]
-fn parse_query_string(qs: &[u8], separator: char) -> PyResult<Vec<(String, String)>> {
-    Ok(parse_qs(qs, separator))
+fn parse_query_string(qs: &[u8], separator: char) -> Vec<(String, String)> {
+    parse_qs(qs, separator)
 }
 
 // parse query string into a python object.
 #[pyfunction]
-#[pyo3(signature = (qs, parse_numbers=true),text_signature = "(qs, parse_numbers=true)")]
-fn parse_url_encoded_dict(py: Python, qs: &[u8], parse_numbers: bool) -> PyResult<PyObject> {
-    Ok(pythonize(py, &parse_query_string_to_json(qs, parse_numbers)).unwrap())
+#[pyo3(signature = (qs, parse_numbers=true), text_signature = "(qs, parse_numbers=true)")]
+fn parse_url_encoded_dict(py: Python, qs: &[u8], parse_numbers: bool) -> Py<PyAny> {
+    pythonize(py, &parse_query_string_to_json(qs, parse_numbers))
+        .unwrap()
+        .into()
 }
 
-#[pymodule]
-fn fast_query_parsers(_py: Python<'_>, m: &PyModule) -> PyResult<()> {
-    m.add_function(wrap_pyfunction!(parse_query_string, m)?)?;
-    m.add_function(wrap_pyfunction!(parse_url_encoded_dict, m)?)?;
+#[pyo3::prelude::pymodule(gil_used = false)]
+mod fast_query_parsers {
+    #[pymodule_export]
+    use super::parse_query_string;
 
-    Ok(())
+    #[pymodule_export]
+    use super::parse_url_encoded_dict;
 }
diff --git a/src/query_string.rs b/src/query_string.rs
@@ -3,7 +3,7 @@ use std::convert::Infallible;
 use lazy_static::lazy_static;
 use regex::Regex;
 use rustc_hash::FxHashMap;
-use serde_json::{from_str, Value};
+use serde_json::{Value, from_str};
 use urlencoding::decode;
 
 lazy_static! {
@@ -93,7 +93,7 @@ pub fn parse_query_string_to_json(bs: &[u8], parse_numbers: bool) -> Value {
 
 #[cfg(test)]
 mod tests {
-    use serde_json::{json, to_string, Value};
+    use serde_json::{Value, json, to_string};
 
     use super::*;
 
diff --git a/tests/test_parse_qs.py b/tests/test_parse_qs.py
@@ -17,7 +17,7 @@
 
 
 def test_parse_urlencoded_with_parse_numbers() -> None:
-    result = parse_url_encoded_dict(encoded, True)
+    result = parse_url_encoded_dict(encoded, parse_numbers=True)
     assert result == {
         "value": [10, 12],
         "veggies": ["tomato", "potato", "aubergine"],
@@ -30,7 +30,7 @@ def test_parse_urlencoded_with_parse_numbers() -> None:
 
 
 def test_parse_urlencoded_without_parse_numbers() -> None:
-    result = parse_url_encoded_dict(encoded, False)
+    result = parse_url_encoded_dict(encoded, parse_numbers=False)
     assert result == {
         "value": ["10", "12"],
         "veggies": ["tomato", "potato", "aubergine"],
diff --git a/tests/test_parse_qsl.py b/tests/test_parse_qsl.py
@@ -1,4 +1,5 @@
-from typing import List, Tuple
+from __future__ import annotations
+
 from urllib.parse import parse_qsl, urlencode
 
 import pytest
@@ -7,7 +8,7 @@
 
 
 @pytest.mark.parametrize(
-    "qs, expected",
+    ("qs", "expected"),
     [
         ("", []),
         ("&", []),
@@ -19,64 +20,47 @@
         ("&a=b", [("a", "b")]),
         ("a=a+b&b=b+c", [("a", "a b"), ("b", "b c")]),
         ("a=1&a=2", [("a", "1"), ("a", "2")]),
-        ("", []),
-        ("&", []),
-        ("&&", []),
-        ("=", [("", "")]),
-        ("=a", [("", "a")]),
-        ("a", [("a", "")]),
-        ("a=", [("a", "")]),
-        ("&a=b", [("a", "b")]),
-        ("a=a+b&b=b+c", [("a", "a b"), ("b", "b c")]),
-        ("a=1&a=2", [("a", "1"), ("a", "2")]),
-        (";a=b", [(";a", "b")]),
-        ("a=a+b;b=b+c", [("a", "a b;b=b c")]),
         (";a=b", [(";a", "b")]),
         ("a=a+b;b=b+c", [("a", "a b;b=b c")]),
     ],
 )
-def test_parse_qsl_standard_separator(qs: str, expected: List[Tuple[str, str]]) -> None:
+def test_parse_qsl_standard_separator(qs: str, expected: list[tuple[str, str]]) -> None:
     result = parse_query_string(qs.encode(), "&")
     assert result == parse_qsl(qs, keep_blank_values=True) == expected
 
 
 @pytest.mark.parametrize(
-    "qs, expected",
+    ("qs", "expected"),
     [
         (";", []),
         (";;", []),
         (";a=b", [("a", "b")]),
         ("a=a+b;b=b+c", [("a", "a b"), ("b", "b c")]),
         ("a=1;a=2", [("a", "1"), ("a", "2")]),
-        (";", []),
-        (";;", []),
-        (";a=b", [("a", "b")]),
-        ("a=a+b;b=b+c", [("a", "a b"), ("b", "b c")]),
-        ("a=1;a=2", [("a", "1"), ("a", "2")]),
     ],
 )
-def test_parse_qsl_semicolon_separator(qs: str, expected: List[Tuple[str, str]]) -> None:
+def test_parse_qsl_semicolon_separator(qs: str, expected: list[tuple[str, str]]) -> None:
     result = parse_query_string(qs.encode(), ";")
     assert result == parse_qsl(qs, separator=";", keep_blank_values=True) == expected
 
 
 @pytest.mark.parametrize(
     "values",
-    (
+    [
         (("first", "x@test.com"), ("second", "aaa")),
         (("first", "&@A.ac"), ("second", "aaa")),
         (("first", "a@A.ac&"), ("second", "aaa")),
         (("first", "a@A&.ac"), ("second", "aaa")),
-    ),
+    ],
 )
-def test_query_parsing_of_escaped_values(values: Tuple[Tuple[str, str], Tuple[str, str]]) -> None:
+def test_query_parsing_of_escaped_values(values: tuple[tuple[str, str], tuple[str, str]]) -> None:
     url_encoded = urlencode(values)
     assert parse_query_string(url_encoded.encode(), "&") == list(values)
 
 
 def test_parses_non_ascii_text() -> None:
     assert parse_query_string("arabic_text=اختبار اللغة العربية".encode(), "&") == [
-        ("arabic_text", "اختبار اللغة العربية")
+        ("arabic_text", "اختبار اللغة العربية"),
     ]
 
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+fn main() {`
	`2`	`+ pyo3_build_config::use_pyo3_cfgs();`
	`3`	`+}`