Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-22 13:15:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Use lowercase builtin collection names (#4833)

Browse Source
This commit is contained in:
Sergei Izmailov 2023-09-13 04:46:58 +09:00 committed by GitHub
parent c83605936b
commit c9149d995c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/pybind11/cast.h
View File

@ -661,7 +661,7 @@ public:
} }
static constexpr auto name static constexpr auto name
= const_name("Tuple[") + concat(make_caster<Ts>::name...) + const_name("]"); = const_name("tuple[") + concat(make_caster<Ts>::name...) + const_name("]");
template <typename T> template <typename T>
using cast_op_type = type; using cast_op_type = type;

8
include/pybind11/stl.h
View File

@ -100,7 +100,7 @@ public:
return s.release(); return s.release();
} }
PYBIND11_TYPE_CASTER(type, const_name("Set[") + key_conv::name + const_name("]")); PYBIND11_TYPE_CASTER(type, const_name("set[") + key_conv::name + const_name("]"));
}; };
template <typename Type, typename Key, typename Value> template <typename Type, typename Key, typename Value>
@ -157,7 +157,7 @@ public:
} }
PYBIND11_TYPE_CASTER(Type, PYBIND11_TYPE_CASTER(Type,
const_name("Dict[") + key_conv::name + const_name(", ") + value_conv::name const_name("dict[") + key_conv::name + const_name(", ") + value_conv::name
+ const_name("]")); + const_name("]"));
}; };
@ -208,7 +208,7 @@ public:
return l.release(); return l.release();
} }
PYBIND11_TYPE_CASTER(Type, const_name("List[") + value_conv::name + const_name("]")); PYBIND11_TYPE_CASTER(Type, const_name("list[") + value_conv::name + const_name("]"));
}; };
template <typename Type, typename Alloc> template <typename Type, typename Alloc>
@ -274,7 +274,7 @@ public:
PYBIND11_TYPE_CASTER(ArrayType, PYBIND11_TYPE_CASTER(ArrayType,
const_name<Resizable>(const_name(""), const_name("Annotated[")) const_name<Resizable>(const_name(""), const_name("Annotated["))
+ const_name("List[") + value_conv::name + const_name("]") + const_name("list[") + value_conv::name + const_name("]")
+ const_name<Resizable>(const_name(""), + const_name<Resizable>(const_name(""),
const_name(", FixedSize(") const_name(", FixedSize(")
+ const_name<Size>() + const_name(")]"))); + const_name<Size>() + const_name(")]")));

4
tests/test_builtin_casters.py
View File

@ -352,7 +352,7 @@ def test_tuple(doc):
assert ( assert (
doc(m.pair_passthrough) doc(m.pair_passthrough)
== """ == """
pair_passthrough(arg0: Tuple[bool, str]) -> Tuple[str, bool] pair_passthrough(arg0: tuple[bool, str]) -> tuple[str, bool]
Return a pair in reversed order Return a pair in reversed order
""" """
@ -360,7 +360,7 @@ def test_tuple(doc):
assert ( assert (
doc(m.tuple_passthrough) doc(m.tuple_passthrough)
== """ == """
tuple_passthrough(arg0: Tuple[bool, str, int]) -> Tuple[int, str, bool] tuple_passthrough(arg0: tuple[bool, str, int]) -> tuple[int, str, bool]
Return a triple in reversed order Return a triple in reversed order
""" """

2
tests/test_kwargs_and_defaults.py
View File

@ -8,7 +8,7 @@ def test_function_signatures(doc):
assert doc(m.kw_func1) == "kw_func1(x: int, y: int) -> str" assert doc(m.kw_func1) == "kw_func1(x: int, y: int) -> str"
assert doc(m.kw_func2) == "kw_func2(x: int = 100, y: int = 200) -> str" assert doc(m.kw_func2) == "kw_func2(x: int = 100, y: int = 200) -> str"
assert doc(m.kw_func3) == "kw_func3(data: str = 'Hello world!') -> None" assert doc(m.kw_func3) == "kw_func3(data: str = 'Hello world!') -> None"
assert doc(m.kw_func4) == "kw_func4(myList: List[int] = [13, 17]) -> str" assert doc(m.kw_func4) == "kw_func4(myList: list[int] = [13, 17]) -> str"
assert doc(m.kw_func_udl) == "kw_func_udl(x: int, y: int = 300) -> str" assert doc(m.kw_func_udl) == "kw_func_udl(x: int, y: int = 300) -> str"
assert doc(m.kw_func_udl_z) == "kw_func_udl_z(x: int, y: int = 0) -> str" assert doc(m.kw_func_udl_z) == "kw_func_udl_z(x: int, y: int = 0) -> str"
assert doc(m.args_function) == "args_function(*args) -> tuple" assert doc(m.args_function) == "args_function(*args) -> tuple"

24
tests/test_stl.py
View File

@ -16,8 +16,8 @@ def test_vector(doc):
assert m.load_bool_vector([True, False]) assert m.load_bool_vector([True, False])
assert m.load_bool_vector((True, False)) assert m.load_bool_vector((True, False))
assert doc(m.cast_vector) == "cast_vector() -> List[int]" assert doc(m.cast_vector) == "cast_vector() -> list[int]"
assert doc(m.load_vector) == "load_vector(arg0: List[int]) -> bool" assert doc(m.load_vector) == "load_vector(arg0: list[int]) -> bool"
# Test regression caused by 936: pointers to stl containers weren't castable # Test regression caused by 936: pointers to stl containers weren't castable
assert m.cast_ptr_vector() == ["lvalue", "lvalue"] assert m.cast_ptr_vector() == ["lvalue", "lvalue"]
@ -39,10 +39,10 @@ def test_array(doc):
assert m.load_array(lst) assert m.load_array(lst)
assert m.load_array(tuple(lst)) assert m.load_array(tuple(lst))
assert doc(m.cast_array) == "cast_array() -> Annotated[List[int], FixedSize(2)]" assert doc(m.cast_array) == "cast_array() -> Annotated[list[int], FixedSize(2)]"
assert ( assert (
doc(m.load_array) doc(m.load_array)
== "load_array(arg0: Annotated[List[int], FixedSize(2)]) -> bool" == "load_array(arg0: Annotated[list[int], FixedSize(2)]) -> bool"
) )
@ -53,8 +53,8 @@ def test_valarray(doc):
assert m.load_valarray(lst) assert m.load_valarray(lst)
assert m.load_valarray(tuple(lst)) assert m.load_valarray(tuple(lst))
assert doc(m.cast_valarray) == "cast_valarray() -> List[int]" assert doc(m.cast_valarray) == "cast_valarray() -> list[int]"
assert doc(m.load_valarray) == "load_valarray(arg0: List[int]) -> bool" assert doc(m.load_valarray) == "load_valarray(arg0: list[int]) -> bool"
def test_map(doc): def test_map(doc):
@ -66,8 +66,8 @@ def test_map(doc):
assert "key2" in d assert "key2" in d
assert m.load_map(d) assert m.load_map(d)
assert doc(m.cast_map) == "cast_map() -> Dict[str, str]" assert doc(m.cast_map) == "cast_map() -> dict[str, str]"
assert doc(m.load_map) == "load_map(arg0: Dict[str, str]) -> bool" assert doc(m.load_map) == "load_map(arg0: dict[str, str]) -> bool"
def test_set(doc): def test_set(doc):
@ -78,8 +78,8 @@ def test_set(doc):
assert m.load_set(s) assert m.load_set(s)
assert m.load_set(frozenset(s)) assert m.load_set(frozenset(s))
assert doc(m.cast_set) == "cast_set() -> Set[str]" assert doc(m.cast_set) == "cast_set() -> set[str]"
assert doc(m.load_set) == "load_set(arg0: Set[str]) -> bool" assert doc(m.load_set) == "load_set(arg0: set[str]) -> bool"
def test_recursive_casting(): def test_recursive_casting():
@ -303,7 +303,7 @@ def test_stl_pass_by_pointer(msg):
msg(excinfo.value) msg(excinfo.value)
== """ == """
stl_pass_by_pointer(): incompatible function arguments. The following argument types are supported: stl_pass_by_pointer(): incompatible function arguments. The following argument types are supported:
1. (v: List[int] = None) -> List[int] 1. (v: list[int] = None) -> list[int]
Invoked with: Invoked with:
""" """
@ -315,7 +315,7 @@ def test_stl_pass_by_pointer(msg):
msg(excinfo.value) msg(excinfo.value)
== """ == """
stl_pass_by_pointer(): incompatible function arguments. The following argument types are supported: stl_pass_by_pointer(): incompatible function arguments. The following argument types are supported:
1. (v: List[int] = None) -> List[int] 1. (v: list[int] = None) -> list[int]
Invoked with: None Invoked with: None
""" """