Skip to content

Commit 399966a

Browse files
author
Sylvain MARIE
committed
Now converters={'*': ...} does not appear as a type hint error. Fixed #64
1 parent ca8f616 commit 399966a

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

pyfields/validate_n_convert.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
try: # python 3.5+
1616
# noinspection PyUnresolvedReferences
17-
from typing import Callable, Type, Any, TypeVar, Union, Iterable, Tuple, Mapping, Optional, Dict
17+
from typing import Callable, Type, Any, TypeVar, Union, Iterable, Tuple, Mapping, Optional, Dict, Literal
1818
from valid8.common_syntax import ValidationFuncs
1919
use_type_hints = sys.version_info > (3, 0)
2020
except ImportError:
@@ -356,11 +356,11 @@ def __init__(self, convert_fun, name=None, accepts_fun=None):
356356
Tuple[ValidationFuncOrLambda, ConverterFuncOrLambda],
357357
Tuple[ValidType, ConverterFuncOrLambda]]
358358

359-
TypeDef = Union[Type, Tuple[Type, ...]]
359+
TypeDef = Union[Type, Tuple[Type, ...], Literal['*'], str] # todo remove str whe pycharm understands Literal
360360
OneOrSeveralConverterDefinitions = Union[Converter,
361361
ConverterFuncOrLambda,
362-
Iterable[Tuple[TypeDef, ConverterFunc]],
363-
Mapping[TypeDef, ConverterFunc]]
362+
Iterable[Tuple[TypeDef, ConverterFuncOrLambda]],
363+
Mapping[TypeDef, ConverterFuncOrLambda]]
364364
Converters = OneOrSeveralConverterDefinitions
365365

366366

pyfields/validate_n_convert.pyi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from valid8 import Validator, ValidationError, ValidationFailure
66
from valid8.base import getfullargspec as v8_getfullargspec, get_callable_name, is_mini_lambda
77

8-
from typing import Callable, Type, Any, TypeVar, Union, Iterable, Tuple, Mapping, Optional, Dict
8+
from typing import Callable, Type, Any, TypeVar, Union, Iterable, Tuple, Mapping, Optional, Dict, Literal
99

1010

1111
T = TypeVar('T')
@@ -119,11 +119,11 @@ ConverterFuncDefinition = Union[Converter,
119119
Tuple[ValidationFuncOrLambda, ConverterFuncOrLambda],
120120
Tuple[ValidType, ConverterFuncOrLambda]]
121121

122-
TypeDef = Union[Type, Tuple[Type, ...]]
122+
TypeDef = Union[Type, Tuple[Type, ...], Literal['*'], str] # todo remove str whe pycharm understands Literal
123123
OneOrSeveralConverterDefinitions = Union[Converter,
124124
ConverterFuncOrLambda,
125-
Iterable[Tuple[TypeDef, ConverterFunc]],
126-
Mapping[TypeDef, ConverterFunc]]
125+
Iterable[Tuple[TypeDef, ConverterFuncOrLambda]],
126+
Mapping[TypeDef, ConverterFuncOrLambda]]
127127
Converters = OneOrSeveralConverterDefinitions
128128

129129

0 commit comments

Comments
 (0)