archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Partly revert "Fix T77276: Generating Python API docs raises many warnings"

Browse Source 
This commit reverts the "noindex" part of the original commit.
using noindex made it imposible to link to a specific property.

The original warnings do not pose an issue so until a proper solution is 
found I am reverting this commit.

This reverts commit 953c232db3
This commit is contained in:
Aaron Carlisle
2020-07-27 13:01:28 -04:00
parent 1ae8855f8e
commit e893430a63
1 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
doc/python_api/sphinx_doc_gen.py
View File

@@ -696,13 +696,11 @@ def py_descr2sphinx(ident, fw, descr, module_name, type_name, identifier):
doc = undocumented_message(module_name, type_name, identifier) doc = undocumented_message(module_name, type_name, identifier)
if type(descr) == GetSetDescriptorType: if type(descr) == GetSetDescriptorType:
fw(ident + ".. attribute:: %s\n" % identifier) fw(ident + ".. attribute:: %s\n\n" % identifier)
fw(ident + " :noindex:\n\n")
write_indented_lines(ident + " ", fw, doc, False) write_indented_lines(ident + " ", fw, doc, False)
fw("\n") fw("\n")
elif type(descr) == MemberDescriptorType: # same as above but use 'data' elif type(descr) == MemberDescriptorType: # same as above but use 'data'
fw(ident + ".. data:: %s\n" % identifier) fw(ident + ".. data:: %s\n\n" % identifier)
fw(ident + " :noindex:\n\n")
write_indented_lines(ident + " ", fw, doc, False) write_indented_lines(ident + " ", fw, doc, False)
fw("\n") fw("\n")
elif type(descr) in {MethodDescriptorType, ClassMethodDescriptorType}: elif type(descr) in {MethodDescriptorType, ClassMethodDescriptorType}:
@@ -742,14 +740,11 @@ def pyprop2sphinx(ident, fw, identifier, py_prop):
''' '''
# readonly properties use "data" directive, variables use "attribute" directive # readonly properties use "data" directive, variables use "attribute" directive
if py_prop.fset is None: if py_prop.fset is None:
fw(ident + ".. data:: %s\n" % identifier) fw(ident + ".. data:: %s\n\n" % identifier)
fw(ident + " :noindex:\n\n")
else: else:
fw(ident + ".. attribute:: %s\n" % identifier) fw(ident + ".. attribute:: %s\n\n" % identifier)
fw(ident + " :noindex:\n\n")
write_indented_lines(ident + " ", fw, py_prop.__doc__) write_indented_lines(ident + " ", fw, py_prop.__doc__)
if py_prop.fset is None: if py_prop.fset is None:
fw("\n")
fw(ident + " (readonly)\n\n") fw(ident + " (readonly)\n\n")
else: else:
fw("\n") fw("\n")
@@ -915,8 +910,7 @@ def pymodule2sphinx(basepath, module_name, module, title):
elif issubclass(value_type, (bool, int, float, str, tuple)): elif issubclass(value_type, (bool, int, float, str, tuple)):
# constant, not much fun we can do here except to list it. # constant, not much fun we can do here except to list it.
# TODO, figure out some way to document these! # TODO, figure out some way to document these!
fw(".. data:: %s\n" % attribute) fw(".. data:: %s\n\n" % attribute)
fw(" :noindex:\n\n")
write_indented_lines(" ", fw, "constant value %s" % repr(value), False) write_indented_lines(" ", fw, "constant value %s" % repr(value), False)
fw("\n") fw("\n")
else: else:
@@ -1126,8 +1120,7 @@ def pycontext2sphinx(basepath):
type_descr = prop.get_type_description( type_descr = prop.get_type_description(
class_fmt=":class:`bpy.types.%s`", collection_id=_BPY_PROP_COLLECTION_ID) class_fmt=":class:`bpy.types.%s`", collection_id=_BPY_PROP_COLLECTION_ID)
fw(".. data:: %s\n" % prop.identifier) fw(".. data:: %s\n\n" % prop.identifier)
fw(" :noindex:\n\n")
if prop.description: if prop.description:
fw(" %s\n\n" % prop.description) fw(" %s\n\n" % prop.description)
@@ -1172,8 +1165,7 @@ def pycontext2sphinx(basepath):
i = 0 i = 0
while char_array[i] is not None: while char_array[i] is not None:
member = ctypes.string_at(char_array[i]).decode(encoding="ascii") member = ctypes.string_at(char_array[i]).decode(encoding="ascii")
fw(".. data:: %s\n" % member) fw(".. data:: %s\n\n" % member)
fw(" :noindex:\n\n")
member_type, is_seq = context_type_map[member] member_type, is_seq = context_type_map[member]
fw(" :type: %s :class:`bpy.types.%s`\n\n" % ("sequence of " if is_seq else "", member_type)) fw(" :type: %s :class:`bpy.types.%s`\n\n" % ("sequence of " if is_seq else "", member_type))
unique.add(member) unique.add(member)
@@ -1379,11 +1371,9 @@ def pyrna2sphinx(basepath):
type_descr = prop.get_type_description(class_fmt=":class:`%s`", collection_id=_BPY_PROP_COLLECTION_ID) type_descr = prop.get_type_description(class_fmt=":class:`%s`", collection_id=_BPY_PROP_COLLECTION_ID)
# readonly properties use "data" directive, variables properties use "attribute" directive # readonly properties use "data" directive, variables properties use "attribute" directive
if 'readonly' in type_descr: if 'readonly' in type_descr:
fw(" .. data:: %s\n" % prop.identifier) fw(" .. data:: %s\n\n" % prop.identifier)
fw(" :noindex:\n\n")
else: else:
fw(" .. attribute:: %s\n" % prop.identifier) fw(" .. attribute:: %s\n\n" % prop.identifier)
fw(" :noindex:\n\n")
if prop.description: if prop.description:
fw(" %s\n\n" % prop.description) fw(" %s\n\n" % prop.description)