diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2020-03-12 01:37:08 +0900 |
|---|---|---|
| committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2020-03-12 01:37:08 +0900 |
| commit | f85b870ad59f39c8637160a4cd4d865ce1e1628e (patch) | |
| tree | 6a484557a18503238e26a014b37879a046ed5b3a | |
| parent | 25f75b0c5870261e2db4737581f9bd5cc1890dbc (diff) | |
| parent | 419cd210f84c02ae62c4cf2b5b19faf85684449f (diff) | |
| download | sphinx-git-f85b870ad59f39c8637160a4cd4d865ce1e1628e.tar.gz | |
Merge branch '2.x' into 3.x
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | sphinx/application.py | 2 | ||||
| -rw-r--r-- | sphinx/util/console.py | 2 | ||||
| -rw-r--r-- | sphinx/util/nodes.py | 2 |
4 files changed, 4 insertions, 4 deletions
@@ -44,7 +44,7 @@ extras_require = { 'lint': [ 'flake8>=3.5.0', 'flake8-import-order', - 'mypy>=0.761', + 'mypy>=0.770', 'docutils-stubs', ], 'test': [ diff --git a/sphinx/application.py b/sphinx/application.py index fbc637e60..74aa2d630 100644 --- a/sphinx/application.py +++ b/sphinx/application.py @@ -489,7 +489,7 @@ class Sphinx: other values. """ logger.debug('[app] adding config value: %r', - (name, default, rebuild) + ((types,) if types else ())) # type: ignore + (name, default, rebuild) + ((types,) if types else ())) if rebuild in (False, True): rebuild = 'env' if rebuild else '' self.config.add(name, default, rebuild, types) diff --git a/sphinx/util/console.py b/sphinx/util/console.py index f4c80d288..08aad8ab1 100644 --- a/sphinx/util/console.py +++ b/sphinx/util/console.py @@ -35,7 +35,7 @@ def get_terminal_width() -> int: import termios import fcntl import struct - call = fcntl.ioctl(0, termios.TIOCGWINSZ, + call = fcntl.ioctl(0, termios.TIOCGWINSZ, # type: ignore struct.pack('hhhh', 0, 0, 0, 0)) height, width = struct.unpack('hhhh', call)[:2] terminal_width = width diff --git a/sphinx/util/nodes.py b/sphinx/util/nodes.py index 474a704a1..d62b1b29b 100644 --- a/sphinx/util/nodes.py +++ b/sphinx/util/nodes.py @@ -199,7 +199,7 @@ def is_translatable(node: Node) -> bool: if isinstance(node, addnodes.translatable): return True - if isinstance(node, nodes.Inline) and 'translatable' not in node: + if isinstance(node, nodes.Inline) and 'translatable' not in node: # type: ignore # inline node must not be translated if 'translatable' is not set return False |