diff --git a/CHANGELOG.md b/CHANGELOG.md index 785a1887e13..a0c94be44f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * Changed `SceneObject.frame` to read-only result of `Frame.from_transformation(SceneObject.worldtransformation)`, representing the local coordinate system of the scene object in world coordinates. * Changed `SceneObject.worldtransformation` to the multiplication of all transformations from the scene object to the root of the scene tree, there will no longer be an additional transformation in relation to the object's frame. * Fixed call to `astar_shortest_path` in `Graph.shortest_path`. +* Fixed `AttributeError` on certain imports in IronPython. ### Removed diff --git a/src/compas/data/data.py b/src/compas/data/data.py index 03b2f50a5b8..1c7813cdc1f 100644 --- a/src/compas/data/data.py +++ b/src/compas/data/data.py @@ -6,7 +6,7 @@ from typing import TypeVar # noqa: F401 D = TypeVar("D", bound="Data") -except ImportError: +except (ImportError, AttributeError): pass import hashlib diff --git a/src/compas/data/encoders.py b/src/compas/data/encoders.py index 2122f1101b5..4356d60e92b 100644 --- a/src/compas/data/encoders.py +++ b/src/compas/data/encoders.py @@ -4,7 +4,7 @@ try: from typing import Type # noqa: F401 -except ImportError: +except (ImportError, AttributeError): pass import json diff --git a/src/compas/datastructures/datastructure.py b/src/compas/datastructures/datastructure.py index a10ad61c431..eb80f94399e 100644 --- a/src/compas/datastructures/datastructure.py +++ b/src/compas/datastructures/datastructure.py @@ -4,7 +4,7 @@ try: from typing import TypeVar # noqa: F401 -except ImportError: +except (ImportError, AttributeError): pass else: G = TypeVar("G", bound="Datastructure") diff --git a/src/compas/geometry/geometry.py b/src/compas/geometry/geometry.py index 4a16b2bbfbc..082bb02cfc8 100644 --- a/src/compas/geometry/geometry.py +++ b/src/compas/geometry/geometry.py @@ -4,7 +4,7 @@ try: from typing import TypeVar # noqa: F401 -except ImportError: +except (ImportError, AttributeError): pass else: G = TypeVar("G", bound="Geometry")