Merge branch 'stable' into 4477_invalid_buildinfo_file

This commit is contained in:
Takeshi KOMIYA 2018-01-25 00:38:03 +09:00
commit 467c2d7cb7

View File

@ -10,6 +10,7 @@
:license: BSD, see LICENSE for details. :license: BSD, see LICENSE for details.
""" """
import sys
from six import PY3 from six import PY3
from sphinx.testing.util import SphinxTestApp, Struct # NOQA from sphinx.testing.util import SphinxTestApp, Struct # NOQA
@ -1116,9 +1117,14 @@ def test_type_hints():
verify_arg_spec(f1, '(x: typing.List[int]) -> typing.List[int]') verify_arg_spec(f1, '(x: typing.List[int]) -> typing.List[int]')
# TypeVars and generic types with TypeVars # TypeVars and generic types with TypeVars
verify_arg_spec(f2, '(x: typing.List[T],' if sys.version_info < (3, 7):
' y: typing.List[T_co],' verify_arg_spec(f2, '(x: typing.List[T],'
' z: T) -> typing.List[T_contra]') ' y: typing.List[T_co],'
' z: T) -> typing.List[T_contra]')
else:
verify_arg_spec(f2, '(x: typing.List[~T],'
' y: typing.List[+T_co],'
' z: T) -> typing.List[-T_contra]')
# Union types # Union types
verify_arg_spec(f3, '(x: typing.Union[str, numbers.Integral]) -> None') verify_arg_spec(f3, '(x: typing.Union[str, numbers.Integral]) -> None')