Merge branch '1.7'

This commit is contained in:
Takeshi KOMIYA
2018-07-17 00:37:40 +09:00
19 changed files with 196 additions and 101 deletions

View File

@@ -231,7 +231,7 @@ def test_Signature_partialmethod():
@pytest.mark.skipif(sys.version_info < (3, 5),
reason='type annotation test is available on py35 or above')
def test_Signature_annotations():
from typing_test_data import f0, f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11
from typing_test_data import f0, f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12
# Class annotations
sig = inspect.Signature(f0).format_args()
@@ -284,6 +284,10 @@ def test_Signature_annotations():
sig = inspect.Signature(f11, has_retval=False).format_args()
assert sig == '(x: CustomAnnotation, y: 123)'
# tuple with more than two items
sig = inspect.Signature(f12).format_args()
assert sig == '() -> Tuple[int, str, int]'
def test_safe_getattr_with_default():
class Foo(object):