Skip to content

Commit 48e98d1

Browse files
committed
Compatibility fixes for sphinx 2.0
1 parent dd2914b commit 48e98d1

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

autodocsumm/__init__.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,12 @@
1919
ModuleAnalyzer, bool_option, AttributeDocumenter, DataDocumenter, Options,
2020
prepare_docstring)
2121
import sphinx.ext.autodoc as ad
22-
from sphinx.ext.autosummary import Autosummary, ViewList, mangle_signature
22+
from sphinx.ext.autosummary import Autosummary, mangle_signature
2323
from docutils import nodes
24+
from docutils.statemachine import ViewList
2425

2526
if sphinx.__version__ >= '1.7':
26-
from sphinx.ext.autodoc import Signature, AutodocRegistry, get_documenters
27+
from sphinx.ext.autodoc import Signature, get_documenters
2728
from sphinx.ext.autodoc.directive import (
2829
AutodocDirective, AUTODOC_DEFAULT_OPTIONS, DocumenterBridge,
2930
process_documenter_options)
@@ -36,7 +37,8 @@
3637
from sphinx.util import force_decode
3738
else:
3839
from sphinx.ext.autodoc import force_decode
39-
40+
41+
4042
try:
4143
from cyordereddict import OrderedDict
4244
except ImportError:
@@ -53,7 +55,7 @@
5355
__author__ = "Philipp Sommer"
5456

5557

56-
sphinx_version = list(map(float, re.findall('\d+', sphinx.__version__)[:3]))
58+
sphinx_version = list(map(float, re.findall(r'\d+', sphinx.__version__)[:3]))
5759

5860

5961
class AutosummaryDocumenter(object):
@@ -416,12 +418,13 @@ def run(self):
416418
doc_nodes = AutodocDirective.run(self)
417419
if 'autosummary' not in self.options:
418420
return doc_nodes
419-
self.warnings = []
420421
try:
421422
self.env = self.state.document.settings.env
422423
except AttributeError:
423424
pass # is set automatically with sphinx >= 1.8.0
424-
self.result = ViewList()
425+
if sphinx_version < [2, 0]:
426+
self.warning = []
427+
self.result = ViewList()
425428
documenter = self.autosummary_documenter
426429
grouped_documenters = documenter.get_grouped_documenters()
427430
summ_nodes = self.autosumm_nodes(documenter, grouped_documenters)

0 commit comments

Comments
 (0)