From b8275f280268713cfec03f8a733ff4daa84d15c4 Mon Sep 17 00:00:00 2001 From: Andrej730 Date: Tue, 7 May 2024 21:39:06 +0500 Subject: [PATCH] fix errors using deprecated api after ab696b9 #4632 --- src/ifcopenshell-python/ifcopenshell/api/__init__.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/ifcopenshell-python/ifcopenshell/api/__init__.py b/src/ifcopenshell-python/ifcopenshell/api/__init__.py index a4e99ad318..2e6e2c1370 100644 --- a/src/ifcopenshell-python/ifcopenshell/api/__init__.py +++ b/src/ifcopenshell-python/ifcopenshell/api/__init__.py @@ -158,9 +158,6 @@ def run( for listener in pre_listeners.get(usecase_path, {}).values(): listener(usecase_path, ifc_file, settings) - # see #4531 - if usecase_path in ARGUMENTS_DEPRECATION: - usecase_path, settings = ARGUMENTS_DEPRECATION[usecase_path](usecase_path, settings) # TODO: settings serialization for client-server systems # def serialise_entity_instance(entity): @@ -304,10 +301,15 @@ def wrap_usecase(usecase_path, usecase): def wrapper(*args, should_run_listeners: bool = True, **settings): ifc_file = args[0] if args else None + nonlocal usecase_path if should_run_listeners: for listener in pre_listeners.get(usecase_path, {}).values(): listener(usecase_path, ifc_file, settings) + # see #4531 + if usecase_path in ARGUMENTS_DEPRECATION: + usecase_path, settings = ARGUMENTS_DEPRECATION[usecase_path](usecase_path, settings) + try: result = usecase(*args, **settings) except TypeError as e: