kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Draft: Fix messages that only worked for objects supplied as strings

Browse Source 
Some error messages would only work if objects were supplied as strings. These would fail if objects were passed (as objects) that had already been deleted.
This commit is contained in:
Roy-043
2024-02-03 19:38:00 +01:00
parent e5e08262c2
commit 5d04562e0e
7 changed files with 23 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Mod/Draft/draftmake/make_patharray.py
View File

@@ -170,20 +170,14 @@ def make_path_array(base_object, path_object, count=4,
_err(translate("draft","No active document. Aborting."))
return None
if isinstance(base_object, str):
base_object_str = base_object
found, base_object = utils.find_object(base_object, doc)
if not found:
_err(translate("draft","Wrong input: base_object {} not in document.").format(base_object_str))
_err(translate("draft","Wrong input: base_object not in document."))
return None
if isinstance(path_object, str):
path_object_str = path_object
found, path_object = utils.find_object(path_object, doc)
if not found:
_err(translate("draft","Wrong input: path_object not in document.").format(path_object_str))
_err(translate("draft","Wrong input: path_object not in document."))
return None
try:
@@ -338,20 +332,14 @@ def make_path_twisted_array(base_object, path_object,
_err(translate("draft","No active document. Aborting."))
return None
if isinstance(base_object, str):
base_object_str = base_object
found, base_object = utils.find_object(base_object, doc)
if not found:
_err(translate("draft","Wrong input: base_object not in document.").format(base_object_str))
_err(translate("draft","Wrong input: base_object not in document."))
return None
if isinstance(path_object, str):
path_object_str = path_object
found, path_object = utils.find_object(path_object, doc)
if not found:
_err(translate("draft","Wrong input: path_object not in document.").format(path_object_str))
_err(translate("draft","Wrong input: path_object not in document."))
return None
try:
utils.type_check([(count, (int, float))],