FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Check deferred nodes after all first passes in an import cycle by gvanrossum · Pull Request #2264 · python/mypy · GitHub

  1. python
  2. mypy

Repository navigation

Check deferred nodes after all first passes in an import cycle - #2264

Merged
JukkaL merged 21 commits into
masterfrom
checker-per-file
Oct 24, 2016
ConversationCommits (21)ChecksFiles changed
Merged

Check deferred nodes after all first passes in an import cycle#2264
JukkaL merged 21 commits into
masterfrom
checker-per-file

Conversation

gvanrossum commented Oct 17, 2016

Copy link
Copy Markdown
Member

Might fix #481.

This was referenced Oct 17, 2016
Closed
Closed
JukkaL reviewed Oct 19, 2016
View reviewed changes
Comment thread test-data/unit/check-modules.test
[file b.py]
import a
def g() -> int:
return a.y

JukkaL Oct 19, 2016

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Reveal the type of a.y (to verify that it doesn't somehow fall back to Any).

JukkaL reviewed Oct 19, 2016
View reviewed changes
Comment thread test-data/unit/check-modules.test
[file a.py]
import b
def f() -> int:
return b.x

JukkaL Oct 19, 2016

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Reveal the type of b.x.

JukkaL reviewed Oct 19, 2016
View reviewed changes
Comment thread mypy/checker.py Outdated
in options.strict_optional_whitelist)

def check_first_pass(self) -> None:
"""Type check the entire file, but defer functions with forward references."""

JukkaL Oct 19, 2016

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Be more explicit about forward reference mean. In particular, they mean references to definitions whose types haven't been inferred yet.

JukkaL commented Oct 19, 2016

Copy link
Copy Markdown
Collaborator

Looks good to me! This hopefully fixes one of the biggest pain points mypy users with large code bases have had.

I'd like to see some more test cases before merging:

  1. Add test case where two passes aren't enough, to verify that we still
    generate cannot determine type errors when needed.
  2. Add test case for referring to a decorated function whose type might not be inferred
    (another common case where we had trouble before).
  3. Add test case where we generate an error only on the second pass (to verify
    that the import context is shown correctly). For example, something like this (partial example):
def f() -> None:
    a = b.x  # Type of b.x only available during second pass
    a + 1   # Error that we can't report during first pass

gvanrossum commented Oct 19, 2016

Copy link
Copy Markdown
Member Author

I'll add more tests. I also discovered that reveal_type() needs to check for current_node_deferred.

gvanrossum mentioned this pull request Oct 20, 2016
Merged

gvanrossum commented Oct 22, 2016

Copy link
Copy Markdown
Member Author

Rebased, generalized the multi-pass machinery, and added a test that would require 3 passes.

Still needs tests for (2) and (3). Also, there are still some print() calls left.

gvanrossum commented Oct 22, 2016

Copy link
Copy Markdown
Member Author

I could use a hint for (2).

gvanrossum commented Oct 23, 2016

Copy link
Copy Markdown
Member Author

I think I have all the required tests now. Jukka, can you double-check?

codecov-io commented Oct 23, 2016 •
edited
Loading

Copy link
Copy Markdown

Current coverage is 84.90% (diff: 100%)

Merging #2264 into master will increase coverage by 1.80%

@@             master      #2264   diff @@
==========================================
  Files            72         72           
  Lines         19037      20953   +1916   
  Methods           0          0           
  Messages          0          0           
  Branches       3919       4824    +905   
==========================================
+ Hits          15819      17790   +1971   
+ Misses         2618       2588     -30   
+ Partials        600        575     -25

Powered by Codecov. Last update 15adf8b...f1b8872

JukkaL reviewed Oct 24, 2016
View reviewed changes
Comment thread mypy/checker.py Outdated
return False
self.errors.set_file(self.path)
self.pass_num += 1
print('---', self.path, 'pass', self.pass_num + 1, '---')

JukkaL Oct 24, 2016

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Remove print.

JukkaL reviewed Oct 24, 2016
View reviewed changes
Comment thread mypy/checker.py Outdated
for node, type_name in todo:
if node in done:
continue
print(type_name, '.', node.fullname() or node.name())

JukkaL Oct 24, 2016

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Remove another print.

JukkaL reviewed Oct 24, 2016
View reviewed changes
Comment thread test-data/unit/check-modules.test Outdated
tmp/a.py:4: error: Cannot determine type of 'x2'

[case testErrorInPassTwo]
# flags: --hide-error-context

JukkaL Oct 24, 2016

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Don't hide error context to test the it works correctly for errors reported in the second pass.

JukkaL reviewed Oct 24, 2016
View reviewed changes
Comment thread test-data/unit/check-modules.test
import a
x = 1 + 1
[out]
tmp/a.py:4: error: Unsupported operand types for + ("int" and "str")

JukkaL Oct 24, 2016 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Maybe also test this the other way as well (error reported in b.py in addition a.py).

JukkaL reviewed Oct 24, 2016
View reviewed changes
Comment thread test-data/unit/check-modules.test Outdated
[file b.py]
from typing import Any
import a
def deco(f: Any) -> Any:

JukkaL Oct 24, 2016

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

This decorator probably doesn't trigger a second pass, since simple decorator signatures are special cased in semantic analysis. A more complex decorator signature such as Callable[[T], int] -> Callable[[T]], str] is needed.

JukkaL reviewed Oct 24, 2016
View reviewed changes
Comment thread test-data/unit/check-modules.test Outdated
[file a.py]
import b
def g() -> None:
f()

JukkaL Oct 24, 2016

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Make sure that the decorator function returns an interesting type (not Any) and do reveal_type(f()) here to verify that decorator got applied correctly.

gvanrossum commented Oct 24, 2016

Copy link
Copy Markdown
Member Author

Ready for review/merge.

JukkaL commented Oct 24, 2016

Copy link
Copy Markdown
Collaborator

LGTM now -- thanks for the updates!

JukkaL merged commit 68c6e96 into master Oct 24, 2016
gvanrossum deleted the checker-per-file branch October 24, 2016 17:05
gvanrossum mentioned this pull request Oct 24, 2016
Merged

gvanrossum commented Oct 25, 2016 via email

Copy link
Copy Markdown
Member Author

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
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

JukkaL JukkaL left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Make it easier to work with circular module dependencies

3 participants

Back | FazBrowse Home | New Git URL