Skip to content

Add some typing to astroid.inference #1415

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
merged 8 commits into from
Mar 3, 2022
Merged

Add some typing to astroid.inference #1415

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d4d25e3
Fix typing issues related to ``util.Uninferable``
DanielNoord Mar 1, 2022
39559df
Fix the assertion :)
DanielNoord Mar 1, 2022
397911a
Review
DanielNoord Mar 2, 2022
28c4a12
Review 2
DanielNoord Mar 2, 2022
ca659eb
Review
DanielNoord Mar 2, 2022
06176b2
Oops
DanielNoord Mar 2, 2022
004f48d
Add ignore
DanielNoord Mar 2, 2022
e1ff89c
Apply suggestions from code review
DanielNoord Mar 3, 2022
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
11 changes: 6 additions & 5 deletions astroid/inference.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import functools
import itertools
import operator
from typing import Any, Callable, Dict, Iterable, Optional
from typing import Any, Callable, Dict, Iterable, Iterator, Optional, Type, Union

import wrapt

Expand Down Expand Up @@ -837,7 +837,7 @@ def _do_compare(
>>> _do_compare([1, 3], '<=', [2, 4])
util.Uninferable
"""
retval = None
retval: Union[None, bool] = None
if op in UNINFERABLE_OPS:
return util.Uninferable
op_func = COMPARE_OPS[op]
Expand All @@ -862,14 +862,15 @@ def _do_compare(
return util.Uninferable
# (or both, but "True | False" is basically the same)

assert retval is not None
return retval # it was all the same value
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a type hint to the definition of retval in L840?



def _infer_compare(
self: nodes.Compare, context: Optional[InferenceContext] = None
) -> Any:
) -> Iterator[Union[nodes.Const, Type[util.Uninferable]]]:
"""Chained comparison inference logic."""
retval = True
retval: Union[bool, Type[util.Uninferable]] = True

ops = self.ops
left_node = self.left
Expand All @@ -887,7 +888,7 @@ def _infer_compare(
break # short-circuit
lhs = rhs # continue
if retval is util.Uninferable:
yield retval
yield retval # type: ignore[misc]
else:
yield nodes.Const(retval)

Expand Down