diff --git a/include/pybind11/pytypes.h b/include/pybind11/pytypes.h index 7d8e137560..2b0f522e06 100644 --- a/include/pybind11/pytypes.h +++ b/include/pybind11/pytypes.h @@ -2569,18 +2569,17 @@ template // Always a dict // https://docs.python.org/3/howto/annotations.html#accessing-the-annotations-dict-of-an-object-in-python-3-9-and-older object object_api::annotations() const { - // Python 3.8, 3.9 - #if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 9 - if (isinstance(derived())){ - return getattr(derived(), "__dict__").get("__annotations__", dict()); - } - else{ - return getattr(derived(), "__annotations__", dict()); - } - // Python 3.10+ - #else +// Python 3.8, 3.9 +#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 9 + if (isinstance(derived())) { + return getattr(derived(), "__dict__").get("__annotations__", dict()); + } else { return getattr(derived(), "__annotations__", dict()); - #endif + } +// Python 3.10+ +#else + return getattr(derived(), "__annotations__", dict()); +#endif } template diff --git a/tests/test_pytypes.py b/tests/test_pytypes.py index c59a094a73..6d9f1e28ba 100644 --- a/tests/test_pytypes.py +++ b/tests/test_pytypes.py @@ -1102,12 +1102,12 @@ def test_dict_ranges(tested_dict, expected): assert m.dict_iterator_default_initialization() assert m.transform_dict_plus_one(tested_dict) == expected + # https://docs.python.org/3/howto/annotations.html#accessing-the-annotations-dict-of-an-object-in-python-3-9-and-older def get_annotations_helper(o): if isinstance(o, type): - return o.__dict__.get('__annotations__', {}) - else: - return getattr(o, '__annotations__', {}) + return o.__dict__.get("__annotations__", {}) + return getattr(o, "__annotations__", {}) def test_module_attribute_types() -> None: