diff options
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | sphinx/domains/python.py | 2 | ||||
| -rw-r--r-- | sphinx/locale/__init__.py | 6 | ||||
| -rw-r--r-- | sphinx/themes/basic/static/documentation_options.js_t | 2 |
5 files changed, 7 insertions, 7 deletions
@@ -141,7 +141,7 @@ Features added hardcoded links detector feature * #9494, #9456: html search: Add a config variable :confval:`html_show_search_summary` to enable/disable the search summaries -* #9337: HTML theme, add option ``enable_search_shortcuts`` that enables :kbd:'/' as +* #9337: HTML theme, add option ``enable_search_shortcuts`` that enables :kbd:`/` as a Quick search shortcut and :kbd:`Esc` shortcut that removes search highlighting. * #10107: i18n: Allow to suppress translation warnings by adding ``#noqa`` @@ -41,7 +41,7 @@ extras_require = { 'lint': [ 'flake8>=3.5.0', 'isort', - 'mypy>=0.931', + 'mypy>=0.950', 'docutils-stubs', "types-typed-ast", "types-requests", diff --git a/sphinx/domains/python.py b/sphinx/domains/python.py index 8b8340b0c..8fc185325 100644 --- a/sphinx/domains/python.py +++ b/sphinx/domains/python.py @@ -1426,7 +1426,7 @@ def builtin_resolver(app: Sphinx, env: BuildEnvironment, if s.startswith('typing.'): s = s.split('.', 1)[1] - return s in typing.__all__ # type: ignore + return s in typing.__all__ if node.get('refdomain') != 'py': return None diff --git a/sphinx/locale/__init__.py b/sphinx/locale/__init__.py index b9bdff0f9..ae320054a 100644 --- a/sphinx/locale/__init__.py +++ b/sphinx/locale/__init__.py @@ -59,19 +59,19 @@ class _TranslationProxy(UserString): def __add__(self, other: str) -> str: # type: ignore return self.data + other - def __radd__(self, other: str) -> str: + def __radd__(self, other: str) -> str: # type: ignore return other + self.data def __mod__(self, other: str) -> str: # type: ignore return self.data % other - def __rmod__(self, other: str) -> str: + def __rmod__(self, other: str) -> str: # type: ignore return other % self.data def __mul__(self, other: Any) -> str: # type: ignore return self.data * other - def __rmul__(self, other: Any) -> str: + def __rmul__(self, other: Any) -> str: # type: ignore return other * self.data def __getattr__(self, name: str) -> Any: diff --git a/sphinx/themes/basic/static/documentation_options.js_t b/sphinx/themes/basic/static/documentation_options.js_t index 0e3b92769..693e91799 100644 --- a/sphinx/themes/basic/static/documentation_options.js_t +++ b/sphinx/themes/basic/static/documentation_options.js_t @@ -10,5 +10,5 @@ var DOCUMENTATION_OPTIONS = { SOURCELINK_SUFFIX: '{{ sourcelink_suffix }}', NAVIGATION_WITH_KEYS: {{ 'true' if theme_navigation_with_keys|tobool else 'false'}}, SHOW_SEARCH_SUMMARY: {{ 'true' if show_search_summary else 'false' }}, - ENABLE_SEARCH_SHORTCUTS: {{ 'true' if enable_search_shortcuts|tobool else 'true'}}, + ENABLE_SEARCH_SHORTCUTS: {{ 'true' if enable_search_shortcuts|tobool else 'false'}}, }; |