Tin/py311

tests/test_annotations.py

@@ -94,6 +94,10 @@ class C:
         assert 1 == len(attr.fields(C))
         assert_init_annotations(C, x=typing.List[int])
 
+    @pytest.mark.skipif(
+        sys.version_info[:2] < (3, 11),
+        reason="Incompatible behavior on older Pythons",
+    )
     @pytest.mark.parametrize("slots", [True, False])
     def test_auto_attribs(self, slots):
         """
@@ -149,7 +153,7 @@ class C:
             x=typing.List[int],
             y=int,
             z=int,
-            foo=typing.Optional[typing.Any],
+            foo=typing.Any,
         )
 
     @pytest.mark.parametrize("slots", [True, False])
@@ -384,8 +388,9 @@ def noop():
 
         assert attr.converters.optional(noop).__annotations__ == {}
 
-    @pytest.mark.xfail(
-        sys.version_info[:2] == (3, 6), reason="Does not work on 3.6."
+    @pytest.mark.skipif(
+        sys.version_info[:2] < (3, 11),
+        reason="Incompatible behavior on older Pythons",
     )
     @pytest.mark.parametrize("slots", [True, False])
     def test_annotations_strings(self, slots):
@@ -417,7 +422,7 @@ class C:
             x=typing.List[int],
             y=int,
             z=int,
-            foo=typing.Optional[typing.Any],
+            foo=typing.Any,
         )
 
     @pytest.mark.parametrize("slots", [True, False])

tests/test_slots.py

@@ -660,10 +660,12 @@ def test_no_getstate_setstate_for_dict_classes(self):
         As long as getstate_setstate is None, nothing is done to dict
         classes.
         """
-        i = C1(1, 2)
-
-        assert None is getattr(i, "__getstate__", None)
-        assert None is getattr(i, "__setstate__", None)
+        assert getattr(object, "__getstate__", None) == getattr(
+            C1, "__getstate__", None
+        )
+        assert getattr(object, "__setstate__", None) == getattr(
+            C1, "__setstate__", None
+        )
 
     def test_no_getstate_setstate_if_option_false(self):
         """
@@ -674,10 +676,12 @@ def test_no_getstate_setstate_if_option_false(self):
         class C:
             x = attr.ib()
 
-        i = C(42)
-
-        assert None is getattr(i, "__getstate__", None)
-        assert None is getattr(i, "__setstate__", None)
+        assert getattr(object, "__getstate__", None) == getattr(
+            C, "__getstate__", None
+        )
+        assert getattr(object, "__setstate__", None) == getattr(
+            C, "__setstate__", None
+        )
 
     @pytest.mark.parametrize("cls", [C2(1), C2Slots(1)])
     def test_getstate_set_state_force_true(self, cls):