|
17 | 17 | from collections import Iterable |
18 | 18 |
|
19 | 19 | try: |
20 | | - from typing import Union, Callable, List, Any, Sequence, Optional, Type # noqa |
| 20 | + from typing import Union, Callable, List, Any, Sequence, Optional, Type, Tuple # noqa |
21 | 21 | from types import ModuleType # noqa |
22 | 22 | except ImportError: |
23 | 23 | pass |
@@ -613,7 +613,7 @@ def nostyle(cls, |
613 | 613 | _IDGEN = object() |
614 | 614 |
|
615 | 615 |
|
616 | | -def parametrize(argnames=None, # type: Union[str, List[str]] |
| 616 | +def parametrize(argnames=None, # type: Union[str, Tuple[str], List[str]] |
617 | 617 | argvalues=None, # type: Iterable[Any] |
618 | 618 | indirect=False, # type: bool |
619 | 619 | ids=None, # type: Union[Callable, Iterable[str]] |
@@ -722,16 +722,16 @@ def __repr__(self): |
722 | 722 | % (self.idgen, self.params, self.caught.__class__, self.caught) |
723 | 723 |
|
724 | 724 |
|
725 | | -def _parametrize_plus(argnames=None, |
726 | | - argvalues=None, |
727 | | - indirect=False, # type: bool |
728 | | - ids=None, # type: Union[Callable, Iterable[str]] |
729 | | - idstyle=None, # type: Optional[Union[str, Callable]] |
730 | | - idgen=_IDGEN, # type: Union[str, Callable] |
731 | | - auto_refs=True, # type: bool |
732 | | - scope=None, # type: str |
733 | | - hook=None, # type: Callable[[Callable], Callable] |
734 | | - debug=False, # type: bool |
| 725 | +def _parametrize_plus(argnames=None, # type: Union[str, Tuple[str], List[str]] |
| 726 | + argvalues=None, # type: Iterable[Any] |
| 727 | + indirect=False, # type: bool |
| 728 | + ids=None, # type: Union[Callable, Iterable[str]] |
| 729 | + idstyle=None, # type: Optional[Union[str, Callable]] |
| 730 | + idgen=_IDGEN, # type: Union[str, Callable] |
| 731 | + auto_refs=True, # type: bool |
| 732 | + scope=None, # type: str |
| 733 | + hook=None, # type: Callable[[Callable], Callable] |
| 734 | + debug=False, # type: bool |
735 | 735 | **args): |
736 | 736 | """ |
737 | 737 |
|
@@ -1096,7 +1096,11 @@ def wrapped_test_func(*args, **kwargs): # noqa |
1096 | 1096 | return parametrize_plus_decorate, True |
1097 | 1097 |
|
1098 | 1098 |
|
1099 | | -def _get_argnames_argvalues(argnames=None, argvalues=None, **args): |
| 1099 | +def _get_argnames_argvalues( |
| 1100 | + argnames=None, # type: Union[str, Tuple[str], List[str]] |
| 1101 | + argvalues=None, # type: Iterable[Any] |
| 1102 | + **args |
| 1103 | +): |
1100 | 1104 | """ |
1101 | 1105 |
|
1102 | 1106 | :param argnames: |
|
0 commit comments