Merge branch 'main' into update-types-310

Author: moreal

Cargo.toml

@@ -71,7 +71,8 @@ opt-level = 3
 
 [profile.test]
 opt-level = 3
-lto = "thin"
+# https://github.com/rust-lang/rust/issues/92869
+# lto = "thin"
 
 [profile.bench]
 lto = true

Lib/inspect.py

@@ -302,14 +302,17 @@ def isabstract(object):
     """Return true if the object is an abstract base class (ABC)."""
     if not isinstance(object, type):
         return False
-    if object.__flags__ & TPFLAGS_IS_ABSTRACT:
-        return True
+    # TODO: RUSTPYTHON
+    # TPFLAGS_IS_ABSTRACT is not being set for abstract classes, so this implementation differs from CPython.
+    # if object.__flags__ & TPFLAGS_IS_ABSTRACT:
+    #     return True
     if not issubclass(type(object), abc.ABCMeta):
         return False
     if hasattr(object, '__abstractmethods__'):
         # It looks like ABCMeta.__new__ has finished running;
         # TPFLAGS_IS_ABSTRACT should have been accurate.
-        return False
+        # return False
+        return bool(getattr(object, '__abstractmethods__'))
     # It looks like ABCMeta.__new__ has not finished running yet; we're
     # probably in __init_subclass__. We'll look for abstractmethods manually.
     for name, value in object.__dict__.items():