blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Fix T84469: Online manual raises an exception with key-map options 

Report an error instead of raising a Python exception.

Currently these properties aren't written to the manual
so it's best to show an error.
This commit is contained in:
Campbell Barton 2021-01-07 23:24:23 +11:00
parent c55b578c9e
commit 987e9e2145
Notes: blender-bot 2023-02-14 05:22:18 +01:00 
Referenced by issue #84469, Spacebar Action Play/Tools/Search buttons trigger an error after clicking on "Online Python Reference"
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
release/scripts/startup/bl_operators/wm.py
View File

@ -974,7 +974,7 @@ class WM_OT_path_open(Operator):
return {'FINISHED'}
def _wm_doc_get_id(doc_id, do_url=True, url_prefix=""):
def _wm_doc_get_id(doc_id, do_url=True, url_prefix="", report=None):
def operator_exists_pair(a, b):
# Not fast, this is only for docs.
@ -1025,6 +1025,11 @@ def _wm_doc_get_id(doc_id, do_url=True, url_prefix=""):
# Check class for dynamically registered types.
rna_class = bpy.types.PropertyGroup.bl_rna_get_subclass_py(class_name)
if rna_class is None:
if report is not None:
report({'ERROR'}, iface_("Type \"%s\" can not be found") % class_name)
return None
# Detect if this is a inherited member and use that name instead.
rna_parent = rna_class.bl_rna
rna_prop = rna_parent.properties.get(class_prop)
@ -1084,9 +1089,9 @@ class WM_OT_doc_view_manual(Operator):
return url
def execute(self, _context):
rna_id = _wm_doc_get_id(self.doc_id, do_url=False)
rna_id = _wm_doc_get_id(self.doc_id, do_url=False, report=self.report)
if rna_id is None:
return {'PASS_THROUGH'}
return {'CANCELLED'}
url = self._lookup_rna_url(rna_id)
@ -1118,9 +1123,9 @@ class WM_OT_doc_view(Operator):
_prefix = ("https://docs.blender.org/api/master")
def execute(self, _context):
url = _wm_doc_get_id(self.doc_id, do_url=True, url_prefix=self._prefix)
url = _wm_doc_get_id(self.doc_id, do_url=True, url_prefix=self._prefix, report=self.report)
if url is None:
return {'PASS_THROUGH'}
return {'CANCELLED'}
import webbrowser
webbrowser.open(url)