From 2e9e2715efac89084afd276f1447499c304a6c5c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 6 Apr 2022 11:42:46 +1000 Subject: Cleanup: use context.path_resolve instead of eval(..) --- release/scripts/modules/rna_prop_ui.py | 2 +- release/scripts/modules/rna_xml.py | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/release/scripts/modules/rna_prop_ui.py b/release/scripts/modules/rna_prop_ui.py index 1890735a40a..002b6e08290 100644 --- a/release/scripts/modules/rna_prop_ui.py +++ b/release/scripts/modules/rna_prop_ui.py @@ -43,7 +43,7 @@ def rna_idprop_context_value(context, context_member, property_type): rna_item = pin_id context_member = "space_data.pin_id" else: - rna_item = eval("context." + context_member) + rna_item = context.path_resolve(context_member) return rna_item, context_member diff --git a/release/scripts/modules/rna_xml.py b/release/scripts/modules/rna_xml.py index 5a76c7878b8..d576aeec860 100644 --- a/release/scripts/modules/rna_xml.py +++ b/release/scripts/modules/rna_xml.py @@ -345,14 +345,10 @@ def xml2rna( def _get_context_val(context, path): - path_full = "context." + path try: - value = eval(path_full) - except: - import traceback - traceback.print_exc() - print("Error: %r could not be found" % path_full) - + value = context.path_resolve(path) + except Exception as ex: + print("Error: %r, path %r not found" % (ex, path)) value = Ellipsis return value -- cgit v1.2.3