summaryrefslogtreecommitdiff
path: root/sphinx/domains/python.py
diff options
context:
space:
mode:
authorTakeshi KOMIYA <i.tkomiya@gmail.com>2017-01-12 11:38:12 +0900
committerGitHub <noreply@github.com>2017-01-12 11:38:12 +0900
commit603cf3a84afebbe3d4f46dc43802803328c72602 (patch)
treef237e77764bb2110656c8c0cafdda4bcf1a753bf /sphinx/domains/python.py
parent929683df270c18a221e38217e2ab85386f5aa590 (diff)
parent7a84cb2f83abc4192e52106280dabcffb99bc3c0 (diff)
downloadsphinx-git-603cf3a84afebbe3d4f46dc43802803328c72602.tar.gz
Merge branch 'master' into split_app.status_iterator
Diffstat (limited to 'sphinx/domains/python.py')
-rw-r--r--sphinx/domains/python.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/sphinx/domains/python.py b/sphinx/domains/python.py
index 886b1f863..2efc6db0b 100644
--- a/sphinx/domains/python.py
+++ b/sphinx/domains/python.py
@@ -27,7 +27,7 @@ from sphinx.util.docfields import Field, GroupedField, TypedField
if False:
# For type annotation
- from typing import Any, Iterator, Tuple, Union # NOQA
+ from typing import Any, Iterable, Iterator, Tuple, Union # NOQA
from sphinx.application import Sphinx # NOQA
from sphinx.builders import Builder # NOQA
from sphinx.environment import BuildEnvironment # NOQA
@@ -582,7 +582,7 @@ class PythonModuleIndex(Index):
shortname = l_('modules')
def generate(self, docnames=None):
- # type: (List[unicode]) -> Tuple[List[Tuple[unicode, List[List[Union[unicode, int]]]]], bool] # NOQA
+ # type: (Iterable[unicode]) -> Tuple[List[Tuple[unicode, List[List[Union[unicode, int]]]]], bool] # NOQA
content = {} # type: Dict[unicode, List]
# list of prefixes to ignore
ignores = None # type: List[unicode]