diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-03 18:44:36 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-03 18:44:36 +0300 |
commit | a43ebc63fafeb3b945529117a2efacc80399d272 (patch) | |
tree | d8ab3e90e50177874f2423b3bc1486548dccd7dd /doc/python_api/sphinx_doc_gen.py | |
parent | b46e987a70682fcfc227ec71e9726c3ad6a230db (diff) | |
parent | 265ec400ab1945cd7bc78d50b7d8f184c01fdd10 (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/collision.c
Diffstat (limited to 'doc/python_api/sphinx_doc_gen.py')
-rw-r--r-- | doc/python_api/sphinx_doc_gen.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py index 6e7d2e45f3a..9b58f7b3888 100644 --- a/doc/python_api/sphinx_doc_gen.py +++ b/doc/python_api/sphinx_doc_gen.py @@ -461,7 +461,7 @@ if ARGS.sphinx_build_pdf: # --------------------------------API DUMP-------------------------------------- -# lame, python wont give some access +# lame, python won't give some access ClassMethodDescriptorType = type(dict.__dict__['fromkeys']) MethodDescriptorType = type(dict.get) GetSetDescriptorType = type(int.real) @@ -645,7 +645,7 @@ def pyfunc2sphinx(ident, fw, module_name, type_name, identifier, py_func, is_cla if not is_class: func_type = "function" - # ther rest are class methods + # the rest are class methods elif arg_str.startswith("(self, ") or arg_str == "(self)": arg_str = "()" if (arg_str == "(self)") else ("(" + arg_str[7:]) func_type = "method" @@ -779,7 +779,7 @@ def pymodule2sphinx(basepath, module_name, module, title): fw(".. module:: %s\n\n" % module_name) if module.__doc__: - # Note, may contain sphinx syntax, dont mangle! + # Note, may contain sphinx syntax, don't mangle! fw(module.__doc__.strip()) fw("\n\n") @@ -1076,7 +1076,7 @@ def pycontext2sphinx(basepath): def write_contex_cls(): fw(title_string("Global Context", "-")) - fw("These properties are avilable in any contexts.\n\n") + fw("These properties are available in any contexts.\n\n") # very silly. could make these global and only access once. # structs, funcs, ops, props = rna_info.BuildRNAInfo() @@ -1100,7 +1100,7 @@ def pycontext2sphinx(basepath): if prop.description: fw(" %s\n\n" % prop.description) - # special exception, cant use genric code here for enums + # special exception, can't use generic code here for enums if prop.type == "enum": enum_text = pyrna_enum2sphinx(prop) if enum_text: @@ -1222,7 +1222,7 @@ def pyrna2sphinx(basepath): if prop.name or prop.description: fw(ident + " " + ", ".join(val for val in (prop.name, prop.description) if val) + "\n\n") - # special exception, cant use genric code here for enums + # special exception, can't use generic code here for enums if enum_text: write_indented_lines(ident + " ", fw, enum_text) fw("\n") @@ -1321,7 +1321,7 @@ def pyrna2sphinx(basepath): if prop.description: fw(" %s\n\n" % prop.description) - # special exception, cant use genric code here for enums + # special exception, can't use generic code here for enums if prop.type == "enum": enum_text = pyrna_enum2sphinx(prop) if enum_text: @@ -1354,7 +1354,7 @@ def pyrna2sphinx(basepath): elif func.return_values: # multiple return values fw(" :return (%s):\n" % ", ".join(prop.identifier for prop in func.return_values)) for prop in func.return_values: - # TODO, pyrna_enum2sphinx for multiple return values... actually dont + # TODO, pyrna_enum2sphinx for multiple return values... actually don't # think we even use this but still!!! type_descr = prop.get_type_description( as_ret=True, class_fmt=":class:`%s`", collection_id=_BPY_PROP_COLLECTION_ID) |