Skip to content

pep612: more semantic analysis for paramspec #9422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JukkaL merged 13 commits into from
Sep 8, 2020
Merged

pep612: more semantic analysis for paramspec #9422

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6417364
types: add TypeVarLikeDef, ParamSpecDef
Apr 7, 2020
489a3f8
tvar_scope: support ParamSpec
Apr 7, 2020
dbfd6b5
semanal: disallow paramspec in generic class for now
Apr 7, 2020
8cb584f
tests: add some basic tests from PEP 612
Feb 25, 2020
335fdf6
types: change type of CallableType.variables
Apr 7, 2020
fe7b655
applytype: use zip, closure
Aug 2, 2020
21a15ae
anal: generalise TypeVarList, TypeVariableQuery
Aug 2, 2020
77dd1cd
typeanal: error for unbound ParamSpec
Aug 2, 2020
c7a80de
typeanal: error for invalid location for ParamSpec
Aug 2, 2020
af72219
applytype: make get_target_type top level
Sep 7, 2020
12fab24
tvar_scope: [minor] fix docstring nit
Sep 7, 2020
1c1d15c
typeanal: use helper to construct callable for paramspec
Sep 7, 2020
465113a
typeanal: add hint for correct usage of ParamSpec
Sep 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
applytype: make get_target_type top level
  • Loading branch information
hauntsaninja
hauntsaninja committed Sep 7, 2020
commit af722194b00b799ba4626cf955e85ffa0a2383eb
82 changes: 46 additions & 36 deletions mypy/applytype.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,49 @@
from mypy.nodes import Context


def get_target_type(
tvar: TypeVarLikeDef,
type: ProperType,
callable: CallableType,
report_incompatible_typevar_value: Callable[[CallableType, Type, str, Context], None],
context: Context,
skip_unsatisfied: bool
) -> Optional[Type]:
# TODO(shantanu): fix for ParamSpecDef
assert isinstance(tvar, TypeVarDef)
values = get_proper_types(tvar.values)
if values:
if isinstance(type, AnyType):
return type
if isinstance(type, TypeVarType) and type.values:
# Allow substituting T1 for T if every allowed value of T1
# is also a legal value of T.
if all(any(mypy.sametypes.is_same_type(v, v1) for v in values)
for v1 in type.values):
return type
matching = []
for value in values:
if mypy.subtypes.is_subtype(type, value):
matching.append(value)
if matching:
best = matching[0]
# If there are more than one matching value, we select the narrowest
for match in matching[1:]:
if mypy.subtypes.is_subtype(match, best):
best = match
return best
if skip_unsatisfied:
return None
report_incompatible_typevar_value(callable, type, tvar.name, context)
else:
upper_bound = tvar.upper_bound
if not mypy.subtypes.is_subtype(type, upper_bound):
if skip_unsatisfied:
return None
report_incompatible_typevar_value(callable, type, tvar.name, context)
return type


def apply_generic_arguments(
callable: CallableType, orig_types: Sequence[Optional[Type]],
report_incompatible_typevar_value: Callable[[CallableType, Type, str, Context], None],
Expand All @@ -34,47 +77,14 @@ def apply_generic_arguments(
# Create a map from type variable id to target type.
id_to_type = {} # type: Dict[TypeVarId, Type]

def get_target_type(tvar: TypeVarLikeDef, type: ProperType) -> Optional[Type]:
# TODO(shantanu): fix for ParamSpecDef
assert isinstance(tvar, TypeVarDef)
values = get_proper_types(tvar.values)
if values:
if isinstance(type, AnyType):
return type
if isinstance(type, TypeVarType) and type.values:
# Allow substituting T1 for T if every allowed value of T1
# is also a legal value of T.
if all(any(mypy.sametypes.is_same_type(v, v1) for v in values)
for v1 in type.values):
return type
matching = []
for value in values:
if mypy.subtypes.is_subtype(type, value):
matching.append(value)
if matching:
best = matching[0]
# If there are more than one matching value, we select the narrowest
for match in matching[1:]:
if mypy.subtypes.is_subtype(match, best):
best = match
return best
if skip_unsatisfied:
return None
report_incompatible_typevar_value(callable, type, tvar.name, context)
else:
upper_bound = tvar.upper_bound
if not mypy.subtypes.is_subtype(type, upper_bound):
if skip_unsatisfied:
return None
report_incompatible_typevar_value(callable, type, tvar.name, context)
return type

for tvar, type in zip(tvars, types):
assert not isinstance(type, PartialType), "Internal error: must never apply partial type"
if type is None:
continue

target_type = get_target_type(tvar, type)
target_type = get_target_type(
tvar, type, callable, report_incompatible_typevar_value, context, skip_unsatisfied
)
if target_type is not None:
id_to_type[tvar.id] = target_type

Expand Down