Skip to content
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

Teach stubgen to work with complex and unary expressions #15661

Merged
merged 3 commits into from
Jul 13, 2023
+89 −5
Merged

Teach stubgen to work with complex and unary expressions #15661

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7d09d7
Teach `stubtest` to work with `complex` and unary expressions
sobolevn Jul 13, 2023
ec71ebe
Only allow some unary expressions
sobolevn Jul 13, 2023
a1e6e78
Merge branch 'master' into stubgen-complex
sobolevn Jul 13, 2023
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
18 changes: 16 additions & 2 deletions mypy/stubgen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
CallExpr,
ClassDef,
ComparisonExpr,
ComplexExpr,
Decorator,
DictExpr,
EllipsisExpr,
Expand Down Expand Up @@ -1396,6 +1397,8 @@ def is_private_member(self, fullname: str) -> bool:
def get_str_type_of_node(
self, rvalue: Expression, can_infer_optional: bool = False, can_be_any: bool = True
) -> str:
rvalue = self.unwrap_unary_expr(rvalue)
Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure we should be doing this with all possible rvalues. Some unary expressions change the type:

>>> type(-True)
<class 'int'>

Copy link
Member

Choose a reason for hiding this comment

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

I guess it's pretty unlikely that this would ever come up in real code, but it would still be nice to be correct here imo :)

Copy link
Member Author

Choose a reason for hiding this comment

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

Hm, ~True is also a well-known anti-pattern. I agree, I will include only some cases. Like not bool and +|- int|float|complex


if isinstance(rvalue, IntExpr):
return "int"
if isinstance(rvalue, StrExpr):
Expand All @@ -1404,8 +1407,13 @@ def get_str_type_of_node(
return "bytes"
if isinstance(rvalue, FloatExpr):
return "float"
if isinstance(rvalue, UnaryExpr) and isinstance(rvalue.expr, IntExpr):
return "int"
if isinstance(rvalue, ComplexExpr): # 1j
return "complex"
if isinstance(rvalue, OpExpr) and rvalue.op in ("-", "+"): # -1j + 1
if isinstance(self.unwrap_unary_expr(rvalue.left), ComplexExpr) or isinstance(
self.unwrap_unary_expr(rvalue.right), ComplexExpr
):
return "complex"
if isinstance(rvalue, NameExpr) and rvalue.name in ("True", "False"):
return "bool"
if can_infer_optional and isinstance(rvalue, NameExpr) and rvalue.name == "None":
Expand All @@ -1417,6 +1425,12 @@ def get_str_type_of_node(
else:
return ""

def unwrap_unary_expr(self, expr: Expression) -> Expression:
# Unwrap (possibly nested) unary expressions:
while isinstance(expr, UnaryExpr):
expr = expr.expr
return expr

def print_annotation(self, t: Type) -> str:
printer = AnnotationPrinter(self)
return t.accept(printer)
Expand Down
37 changes: 33 additions & 4 deletions test-data/unit/stubgen.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,39 @@ class A:

def g() -> None: ...

[case testVariable]
x = 1
[out]
x: int
[case testVariables]
i = 1
s = 'a'
f = 1.5
c1 = 1j
c2 = 0j + 1
bl1 = True
bl2 = False
bts = b''
[out]
i: int
s: str
f: float
c1: complex
c2: complex
bl1: bool
bl2: bool
bts: bytes

[case testVariablesWithUnary]
i = ++1
f = -1.5
c1 = -1j
c2 = -1j + 1
bl1 = not True
bl2 = not False
[out]
i: int
f: float
c1: complex
c2: complex
bl1: bool
bl2: bool

[case testAnnotatedVariable]
x: int = 1
Expand Down