Merge branch '4.3.x' into 4.x

This commit is contained in:
Takeshi KOMIYA 2022-01-09 01:08:08 +09:00
commit 441c2e306a
4 changed files with 7 additions and 7 deletions

View File

@ -43,7 +43,7 @@ extras_require = {
'lint': [
'flake8>=3.5.0',
'isort',
'mypy>=0.930',
'mypy>=0.931',
'docutils-stubs',
"types-typed-ast",
"types-requests",

View File

@ -9,7 +9,7 @@
import os
import warnings
from os import path
from typing import TYPE_CHECKING, Any, Dict, List, Tuple, cast
from typing import TYPE_CHECKING, Any, Dict, List, Sequence, Tuple, cast
from docutils import nodes
from docutils.nodes import Node, make_id, system_message
@ -68,7 +68,7 @@ class Figure(images.Figure):
class Meta(MetaBase, SphinxDirective):
def run(self) -> List[Node]:
def run(self) -> Sequence[Node]:
result = super().run()
for node in result:
# for docutils-0.17 or older. Since docutils-0.18, patching is no longer needed

View File

@ -4,7 +4,7 @@
Locale utilities.
:copyright: Copyright 2007-2021 by the Sphinx team, see AUTHORS.
:copyright: Copyright 2007-2022 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""

View File

@ -25,17 +25,17 @@ try:
except ImportError:
# python-requests package in Debian jessie does not provide ``requests.packages.urllib3``.
# So try to import the exceptions from urllib3 package.
from urllib3.exceptions import SSLError # type: ignore
from urllib3.exceptions import SSLError
try:
from requests.packages.urllib3.exceptions import InsecureRequestWarning
except ImportError:
try:
# for Debian-jessie
from urllib3.exceptions import InsecureRequestWarning # type: ignore
from urllib3.exceptions import InsecureRequestWarning
except ImportError:
# for requests < 2.4.0
InsecureRequestWarning = None # type: ignore
InsecureRequestWarning = None
useragent_header = [('User-Agent',