attempt 2

wjakob · Feb 18, 2024 · c95e121 · c95e121
1 parent 26e7818
commit c95e121
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/src/nb_func.cpp b/src/nb_func.cpp
@@ -939,7 +939,7 @@ static uint32_t nb_func_render_signature(const func_data *f,
 
                     buf.put(": ");
                     if (has_args && f->args[arg_index].none) {
-                        #if PY_VERSION_HEX < 0x03090000
+                        #if PY_VERSION_HEX < 0x030A0000
                             buf.put("Optional[");
                         #else
                             // See below
@@ -952,7 +952,7 @@ static uint32_t nb_func_render_signature(const func_data *f,
                 // Default argument
                 if (has_args) {
                     if (f->args[arg_index].none) {
-                        #if PY_VERSION_HEX < 0x03090000
+                        #if PY_VERSION_HEX < 0x030A0000
                             buf.put(']');
                         #else
                             buf.put(" | None");

diff --git a/tests/test_stl.py b/tests/test_stl.py
@@ -390,7 +390,7 @@ def test35_string_and_string_view():
 
 def test36_std_optional_copyable(clean):
     t.optional_copyable(t.Copyable())
-    if sys.version_info < (3, 9):
+    if sys.version_info < (3, 10):
         assert t.optional_copyable.__doc__ == (
             "optional_copyable(x: Optional[test_stl_ext.Copyable]) -> None"
         )
@@ -406,7 +406,7 @@ def test36_std_optional_copyable(clean):
 
 def test37_std_optional_copyable_ptr(clean):
     t.optional_copyable_ptr(t.Copyable())
-    if sys.version_info < (3, 9):
+    if sys.version_info < (3, 10):
         assert t.optional_copyable_ptr.__doc__ == (
             "optional_copyable_ptr(x: Optional[test_stl_ext.Copyable]) -> None"
         )
@@ -426,7 +426,7 @@ def test38_std_optional_none():
 
 def test39_std_optional_ret_opt_movable(clean):
     assert t.optional_ret_opt_movable().value == 5
-    if sys.version_info < (3, 9):
+    if sys.version_info < (3, 10):
         assert t.optional_ret_opt_movable.__doc__ == (
             "optional_ret_opt_movable() -> Optional[test_stl_ext.Movable]"
         )
@@ -458,7 +458,7 @@ def test42_std_optional_unbound_type():
         assert method(3) == 3
         assert method(None) is None
         assert method() is None
-        if sys.version_info < (3, 9):
+        if sys.version_info < (3, 10):
             assert method.__doc__ == (
                 f"{method_name}(x: Optional[int] = None) -> Optional[int]"
             )
@@ -475,7 +475,7 @@ def test42a_std_optional_non_assignable():
 def test43_std_variant_copyable(clean):
     t.variant_copyable(t.Copyable())
     t.variant_copyable(5)
-    if sys.version_info < (3, 9):
+    if sys.version_info < (3, 10):
         assert t.variant_copyable.__doc__ == (
             "variant_copyable(arg: Union[test_stl_ext.Copyable, int], /) -> None"
         )
@@ -494,7 +494,7 @@ def test44_std_variant_copyable_none(clean):
     t.variant_copyable_none(t.Copyable())
     t.variant_copyable_none(5)
     t.variant_copyable_none(None)
-    if sys.version_info < (3, 9):
+    if sys.version_info < (3, 10):
         assert t.variant_copyable_none.__doc__ == (
             "variant_copyable_none(x: Optional[Union[int, test_stl_ext.Copyable]]) -> None"
         )
@@ -512,7 +512,7 @@ def test44_std_variant_copyable_none(clean):
 def test45_std_variant_copyable_ptr(clean):
     t.variant_copyable_ptr(t.Copyable())
     t.variant_copyable_ptr(5)
-    if sys.version_info < (3, 9):
+    if sys.version_info < (3, 10):
         assert t.variant_copyable_ptr.__doc__ == (
             "variant_copyable_ptr(arg: Union[test_stl_ext.Copyable, int], /) -> None"
         )
@@ -530,7 +530,7 @@ def test46_std_variant_copyable_ptr_none(clean):
     t.variant_copyable_ptr_none(t.Copyable())
     t.variant_copyable_ptr_none(5)
     t.variant_copyable_ptr_none(None)
-    if sys.version_info < (3, 9):
+    if sys.version_info < (3, 10):
         assert t.variant_copyable_ptr_none.__doc__ == (
             "variant_copyable_ptr_none(x: Optional[Union[test_stl_ext.Copyable, int]]) -> None"
         )
@@ -545,7 +545,7 @@ def test46_std_variant_copyable_ptr_none(clean):
 
 def test47_std_variant_ret_var_copyable():
     assert t.variant_ret_var_copyable().value == 5
-    if sys.version_info < (3, 9):
+    if sys.version_info < (3, 10):
         assert t.variant_ret_var_copyable.__doc__ == (
             "variant_ret_var_copyable() -> Union[test_stl_ext.Copyable, int]"
         )
@@ -557,7 +557,7 @@ def test47_std_variant_ret_var_copyable():
 
 def test48_std_variant_ret_var_none():
     assert t.variant_ret_var_none() is None
-    if sys.version_info < (3, 9):
+    if sys.version_info < (3, 10):
         assert t.variant_ret_var_none.__doc__ == (
             "variant_ret_var_none() -> Union[None, test_stl_ext.Copyable, int]"
         )
@@ -573,7 +573,7 @@ def test49_std_variant_unbound_type():
     assert t.variant_unbound_type([5]) == [5]
     assert t.variant_unbound_type((1,2,3)) == (1,2,3)
     assert t.variant_unbound_type(5) == 5
-    if sys.version_info < (3, 9):
+    if sys.version_info < (3, 10):
         assert t.variant_unbound_type.__doc__ == (
             "variant_unbound_type(x: Optional[Union[list, tuple, int]] = None)"
             " -> Union[None, list, tuple, int]"