Add some typing to astroid.inference
#1415
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
DanielNoord
added
the
Maintenance
Pierre-Sassoulas
approved these changes
Mar 1, 2022
cdce8p
requested changes
Mar 2, 2022
There was a problem hiding this comment.
Regarding the mypy bug. The issue is probably more general. object.__new__ is defined correctly in typeshed, but the decorator is just not applied to the class like it's the case with functions. An example
from typing import Any, Callable
def change_class_to_int(cls: type[object]) -> int:
return 1
def change_return_to_int(func: Callable[..., Any]) -> int:
return 2
@change_class_to_int
class A:
...
@change_return_to_int
def func() -> None:
...
reveal_type(A)
reveal_type(func)
cdce8p
reviewed
Mar 2, 2022
| @@ -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 | |||
There was a problem hiding this comment.
Can you add a type hint to the definition of retval in L840?
DanielNoord
changed the title
util.Uninferableastroid.inference
cdce8p
requested changes
Mar 2, 2022
astroid/inference.py
Outdated
| @@ -837,7 +843,7 @@ def _do_compare( | |||
| >>> _do_compare([1, 3], '<=', [2, 4]) | |||
| util.Uninferable | |||
| """ | |||
| retval = None | |||
| retval: Union[Literal[None], bool, Type[util.Uninferable]] = None | |||
There was a problem hiding this comment.
Suggested change
| retval: Union[Literal[None], bool, Type[util.Uninferable]] = None | |
| retval: Union[None, bool] = None |
Literal[None] is not necessary. Both mypy and pyright understand None.
Additionally, Uninferable is never assigned to retval, only returned directly.
There was a problem hiding this comment.
Hmm there a quite a bit of Literal[None]'s in the codebase. Perhaps we should update those at some point.
Co-authored-by: Marc Mueller <[email protected]>
cdce8p
approved these changes
Mar 3, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Steps
Description
The typing on this is incorrect I believe.
https://github.com/PyCQA/astroid/blob/c0d2e5c89a1525e9f500c43b04529628a70e070f/astroid/util.py#L33-L34
I don't think
mypyrecognises that the decorator onUninferablemakesutil.Uninferablean instance instead of the type. I checked the issue tracker and there is no issue about this yet, so I am slightly doubting whether I am in correct in this, but I think this is the correct fix.Edit: Seeing as
pyrightdoes get this right I opened python/mypy#12265.Type of Changes
Related Issue