IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merged in JonnyJD/sphinx-fix-none-property (pull request #179)

Browse Source 
autodoc: fix annotation None for properties
This commit is contained in:
Georg Brandl
2013-10-10 07:17:31 +02:00
parent 0b22e43653 2e07e7dc25
commit 5287dc6c61
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sphinx/ext/autodoc.py
View File

@@ -1252,13 +1252,14 @@ class AttributeDocumenter(ClassLevelDocumenter):
def add_directive_header(self, sig): def add_directive_header(self, sig):
ClassLevelDocumenter.add_directive_header(self, sig) ClassLevelDocumenter.add_directive_header(self, sig)
if not self._datadescriptor and not self.options.annotation: if not self.options.annotation:
try: if not self._datadescriptor:
objrepr = safe_repr(self.object) try:
except ValueError: objrepr = safe_repr(self.object)
pass except ValueError:
else: pass
self.add_line(u' :annotation: = ' + objrepr, '<autodoc>') else:
self.add_line(u' :annotation: = ' + objrepr, '<autodoc>')
elif self.options.annotation is SUPPRESS: elif self.options.annotation is SUPPRESS:
pass pass
else: else: