diff options
author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2020-01-01 05:39:46 +0300 |
---|---|---|
committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2020-01-01 05:39:46 +0300 |
commit | e628afd5cd0c565f1e33abb01cac26180455182f (patch) | |
tree | 3b7cddfe175c444588a0b8d9e80430faeb994b8c /sphinx/environment | |
parent | 9458d631d0393956005754ed8137809e15635467 (diff) | |
parent | c5b653433d3fbdca47396f17161685f50d994320 (diff) |
Merge branch '2.0'
Diffstat (limited to 'sphinx/environment')
-rw-r--r-- | sphinx/environment/__init__.py | 2 | ||||
-rw-r--r-- | sphinx/environment/adapters/__init__.py | 2 | ||||
-rw-r--r-- | sphinx/environment/adapters/asset.py | 2 | ||||
-rw-r--r-- | sphinx/environment/adapters/indexentries.py | 2 | ||||
-rw-r--r-- | sphinx/environment/adapters/toctree.py | 8 | ||||
-rw-r--r-- | sphinx/environment/collectors/__init__.py | 2 | ||||
-rw-r--r-- | sphinx/environment/collectors/asset.py | 2 | ||||
-rw-r--r-- | sphinx/environment/collectors/dependencies.py | 2 | ||||
-rw-r--r-- | sphinx/environment/collectors/indexentries.py | 2 | ||||
-rw-r--r-- | sphinx/environment/collectors/metadata.py | 2 | ||||
-rw-r--r-- | sphinx/environment/collectors/title.py | 2 | ||||
-rw-r--r-- | sphinx/environment/collectors/toctree.py | 2 |
12 files changed, 15 insertions, 15 deletions
diff --git a/sphinx/environment/__init__.py b/sphinx/environment/__init__.py index aa2bfed99..341f22a27 100644 --- a/sphinx/environment/__init__.py +++ b/sphinx/environment/__init__.py @@ -4,7 +4,7 @@ Global creation environment. - :copyright: Copyright 2007-2019 by the Sphinx team, see AUTHORS. + :copyright: Copyright 2007-2020 by the Sphinx team, see AUTHORS. :license: BSD, see LICENSE for details. """ diff --git a/sphinx/environment/adapters/__init__.py b/sphinx/environment/adapters/__init__.py index 45bedefe8..c9cde6364 100644 --- a/sphinx/environment/adapters/__init__.py +++ b/sphinx/environment/adapters/__init__.py @@ -4,6 +4,6 @@ Sphinx environment adapters - :copyright: Copyright 2007-2019 by the Sphinx team, see AUTHORS. + :copyright: Copyright 2007-2020 by the Sphinx team, see AUTHORS. :license: BSD, see LICENSE for details. """ diff --git a/sphinx/environment/adapters/asset.py b/sphinx/environment/adapters/asset.py index bc282de0c..38e4eb064 100644 --- a/sphinx/environment/adapters/asset.py +++ b/sphinx/environment/adapters/asset.py @@ -4,7 +4,7 @@ Assets adapter for sphinx.environment. - :copyright: Copyright 2007-2019 by the Sphinx team, see AUTHORS. + :copyright: Copyright 2007-2020 by the Sphinx team, see AUTHORS. :license: BSD, see LICENSE for details. """ diff --git a/sphinx/environment/adapters/indexentries.py b/sphinx/environment/adapters/indexentries.py index 9394f92bc..1d135bd32 100644 --- a/sphinx/environment/adapters/indexentries.py +++ b/sphinx/environment/adapters/indexentries.py @@ -4,7 +4,7 @@ Index entries adapters for sphinx.environment. - :copyright: Copyright 2007-2019 by the Sphinx team, see AUTHORS. + :copyright: Copyright 2007-2020 by the Sphinx team, see AUTHORS. :license: BSD, see LICENSE for details. """ import bisect diff --git a/sphinx/environment/adapters/toctree.py b/sphinx/environment/adapters/toctree.py index 0975b33cd..fe8f43656 100644 --- a/sphinx/environment/adapters/toctree.py +++ b/sphinx/environment/adapters/toctree.py @@ -4,12 +4,12 @@ Toctree adapter for sphinx.environment. - :copyright: Copyright 2007-2019 by the Sphinx team, see AUTHORS. + :copyright: Copyright 2007-2020 by the Sphinx team, see AUTHORS. :license: BSD, see LICENSE for details. """ +from typing import Any, Iterable, List from typing import cast -from typing import Iterable, List from docutils import nodes from docutils.nodes import Element, Node @@ -314,8 +314,8 @@ class TocTree: node['refuri'] = node['anchorname'] or '#' return toc - def get_toctree_for(self, docname: str, builder: "Builder", collapse: bool, **kwds - ) -> Element: + def get_toctree_for(self, docname: str, builder: "Builder", collapse: bool, + **kwds: Any) -> Element: """Return the global TOC nodetree.""" doctree = self.env.get_doctree(self.env.config.master_doc) toctrees = [] # type: List[Element] diff --git a/sphinx/environment/collectors/__init__.py b/sphinx/environment/collectors/__init__.py index 137a10302..53e3a1c72 100644 --- a/sphinx/environment/collectors/__init__.py +++ b/sphinx/environment/collectors/__init__.py @@ -4,7 +4,7 @@ The data collector components for sphinx.environment. - :copyright: Copyright 2007-2019 by the Sphinx team, see AUTHORS. + :copyright: Copyright 2007-2020 by the Sphinx team, see AUTHORS. :license: BSD, see LICENSE for details. """ diff --git a/sphinx/environment/collectors/asset.py b/sphinx/environment/collectors/asset.py index e1d3abef1..06a0d5198 100644 --- a/sphinx/environment/collectors/asset.py +++ b/sphinx/environment/collectors/asset.py @@ -4,7 +4,7 @@ The image collector for sphinx.environment. - :copyright: Copyright 2007-2019 by the Sphinx team, see AUTHORS. + :copyright: Copyright 2007-2020 by the Sphinx team, see AUTHORS. :license: BSD, see LICENSE for details. """ diff --git a/sphinx/environment/collectors/dependencies.py b/sphinx/environment/collectors/dependencies.py index 63ae63e84..cc0af037e 100644 --- a/sphinx/environment/collectors/dependencies.py +++ b/sphinx/environment/collectors/dependencies.py @@ -4,7 +4,7 @@ The dependencies collector components for sphinx.environment. - :copyright: Copyright 2007-2019 by the Sphinx team, see AUTHORS. + :copyright: Copyright 2007-2020 by the Sphinx team, see AUTHORS. :license: BSD, see LICENSE for details. """ diff --git a/sphinx/environment/collectors/indexentries.py b/sphinx/environment/collectors/indexentries.py index 640eb915b..2ef59909b 100644 --- a/sphinx/environment/collectors/indexentries.py +++ b/sphinx/environment/collectors/indexentries.py @@ -4,7 +4,7 @@ Index entries collector for sphinx.environment. - :copyright: Copyright 2007-2019 by the Sphinx team, see AUTHORS. + :copyright: Copyright 2007-2020 by the Sphinx team, see AUTHORS. :license: BSD, see LICENSE for details. """ diff --git a/sphinx/environment/collectors/metadata.py b/sphinx/environment/collectors/metadata.py index a547d2551..bcff1f273 100644 --- a/sphinx/environment/collectors/metadata.py +++ b/sphinx/environment/collectors/metadata.py @@ -4,7 +4,7 @@ The metadata collector components for sphinx.environment. - :copyright: Copyright 2007-2019 by the Sphinx team, see AUTHORS. + :copyright: Copyright 2007-2020 by the Sphinx team, see AUTHORS. :license: BSD, see LICENSE for details. """ diff --git a/sphinx/environment/collectors/title.py b/sphinx/environment/collectors/title.py index 7d464f874..10cd6c5b0 100644 --- a/sphinx/environment/collectors/title.py +++ b/sphinx/environment/collectors/title.py @@ -4,7 +4,7 @@ The title collector components for sphinx.environment. - :copyright: Copyright 2007-2019 by the Sphinx team, see AUTHORS. + :copyright: Copyright 2007-2020 by the Sphinx team, see AUTHORS. :license: BSD, see LICENSE for details. """ diff --git a/sphinx/environment/collectors/toctree.py b/sphinx/environment/collectors/toctree.py index bacfc4baa..e168bd9c4 100644 --- a/sphinx/environment/collectors/toctree.py +++ b/sphinx/environment/collectors/toctree.py @@ -4,7 +4,7 @@ Toctree collector for sphinx.environment. - :copyright: Copyright 2007-2019 by the Sphinx team, see AUTHORS. + :copyright: Copyright 2007-2020 by the Sphinx team, see AUTHORS. :license: BSD, see LICENSE for details. """ |