mirror of
https://github.com/sphinx-doc/sphinx.git
synced 2025-02-25 18:55:22 -06:00
Cloase #9445: :py:property: directive now supports :classmethod: option
Since python 3.9, `classmethod` starts to support creating a "class property". This allows to describe it.
This commit is contained in:
parent
939c7bb7ff
commit
120525563c
3
CHANGES
3
CHANGES
@ -13,6 +13,9 @@ Deprecated
|
|||||||
Features added
|
Features added
|
||||||
--------------
|
--------------
|
||||||
|
|
||||||
|
* #9445: py domain: ``:py:property:`` directive supports ``:classmethod:``
|
||||||
|
option to describe the class property
|
||||||
|
|
||||||
Bugs fixed
|
Bugs fixed
|
||||||
----------
|
----------
|
||||||
|
|
||||||
|
@ -329,6 +329,13 @@ The following directives are provided for module and class contents:
|
|||||||
|
|
||||||
Indicate the property is abstract.
|
Indicate the property is abstract.
|
||||||
|
|
||||||
|
.. rst:directive:option:: classmethod
|
||||||
|
:type: no value
|
||||||
|
|
||||||
|
Indicate the property is a classmethod.
|
||||||
|
|
||||||
|
.. versionaddedd: 4.2
|
||||||
|
|
||||||
.. rst:directive:option:: type: type of the property
|
.. rst:directive:option:: type: type of the property
|
||||||
:type: text
|
:type: text
|
||||||
|
|
||||||
|
@ -852,6 +852,7 @@ class PyProperty(PyObject):
|
|||||||
option_spec = PyObject.option_spec.copy()
|
option_spec = PyObject.option_spec.copy()
|
||||||
option_spec.update({
|
option_spec.update({
|
||||||
'abstractmethod': directives.flag,
|
'abstractmethod': directives.flag,
|
||||||
|
'classmethod': directives.flag,
|
||||||
'type': directives.unchanged,
|
'type': directives.unchanged,
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -865,10 +866,13 @@ class PyProperty(PyObject):
|
|||||||
return fullname, prefix
|
return fullname, prefix
|
||||||
|
|
||||||
def get_signature_prefix(self, sig: str) -> str:
|
def get_signature_prefix(self, sig: str) -> str:
|
||||||
prefix = ['property']
|
prefix = []
|
||||||
if 'abstractmethod' in self.options:
|
if 'abstractmethod' in self.options:
|
||||||
prefix.insert(0, 'abstract')
|
prefix.append('abstract')
|
||||||
|
if 'classmethod' in self.options:
|
||||||
|
prefix.append('class')
|
||||||
|
|
||||||
|
prefix.append('property')
|
||||||
return ' '.join(prefix) + ' '
|
return ' '.join(prefix) + ' '
|
||||||
|
|
||||||
def get_index_text(self, modname: str, name_cls: Tuple[str, str]) -> str:
|
def get_index_text(self, modname: str, name_cls: Tuple[str, str]) -> str:
|
||||||
|
@ -813,8 +813,12 @@ def test_pyattribute(app):
|
|||||||
def test_pyproperty(app):
|
def test_pyproperty(app):
|
||||||
text = (".. py:class:: Class\n"
|
text = (".. py:class:: Class\n"
|
||||||
"\n"
|
"\n"
|
||||||
" .. py:property:: prop\n"
|
" .. py:property:: prop1\n"
|
||||||
" :abstractmethod:\n"
|
" :abstractmethod:\n"
|
||||||
|
" :type: str\n"
|
||||||
|
"\n"
|
||||||
|
" .. py:property:: prop2\n"
|
||||||
|
" :classmethod:\n"
|
||||||
" :type: str\n")
|
" :type: str\n")
|
||||||
domain = app.env.get_domain('py')
|
domain = app.env.get_domain('py')
|
||||||
doctree = restructuredtext.parse(app, text)
|
doctree = restructuredtext.parse(app, text)
|
||||||
@ -822,15 +826,25 @@ def test_pyproperty(app):
|
|||||||
[desc, ([desc_signature, ([desc_annotation, "class "],
|
[desc, ([desc_signature, ([desc_annotation, "class "],
|
||||||
[desc_name, "Class"])],
|
[desc_name, "Class"])],
|
||||||
[desc_content, (addnodes.index,
|
[desc_content, (addnodes.index,
|
||||||
|
desc,
|
||||||
|
addnodes.index,
|
||||||
desc)])]))
|
desc)])]))
|
||||||
assert_node(doctree[1][1][0], addnodes.index,
|
assert_node(doctree[1][1][0], addnodes.index,
|
||||||
entries=[('single', 'prop (Class property)', 'Class.prop', '', None)])
|
entries=[('single', 'prop1 (Class property)', 'Class.prop1', '', None)])
|
||||||
assert_node(doctree[1][1][1], ([desc_signature, ([desc_annotation, "abstract property "],
|
assert_node(doctree[1][1][1], ([desc_signature, ([desc_annotation, "abstract property "],
|
||||||
[desc_name, "prop"],
|
[desc_name, "prop1"],
|
||||||
[desc_annotation, ": str"])],
|
[desc_annotation, ": str"])],
|
||||||
[desc_content, ()]))
|
[desc_content, ()]))
|
||||||
assert 'Class.prop' in domain.objects
|
assert_node(doctree[1][1][2], addnodes.index,
|
||||||
assert domain.objects['Class.prop'] == ('index', 'Class.prop', 'property', False)
|
entries=[('single', 'prop2 (Class property)', 'Class.prop2', '', None)])
|
||||||
|
assert_node(doctree[1][1][3], ([desc_signature, ([desc_annotation, "class property "],
|
||||||
|
[desc_name, "prop2"],
|
||||||
|
[desc_annotation, ": str"])],
|
||||||
|
[desc_content, ()]))
|
||||||
|
assert 'Class.prop1' in domain.objects
|
||||||
|
assert domain.objects['Class.prop1'] == ('index', 'Class.prop1', 'property', False)
|
||||||
|
assert 'Class.prop2' in domain.objects
|
||||||
|
assert domain.objects['Class.prop2'] == ('index', 'Class.prop2', 'property', False)
|
||||||
|
|
||||||
|
|
||||||
def test_pydecorator_signature(app):
|
def test_pydecorator_signature(app):
|
||||||
|
Loading…
Reference in New Issue
Block a user