Skip to content

[Reverted] Fixes to union simplification, isinstance and more #3025

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 19 commits into from
Mar 29, 2017
Merged

[Reverted] Fixes to union simplification, isinstance and more #3025

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
c53e0ca
Fixes to union simplification and isinstance
JukkaL Mar 14, 2017
dc62a99
Fix #2978.
JukkaL Mar 14, 2017
07d64f5
Add test case
JukkaL Mar 14, 2017
0beffee
Fix test failures
JukkaL Mar 15, 2017
e3ff2c7
Fix meet of a broken named tuple and a good named tuple
JukkaL Mar 18, 2017
4cb8673
Fix erasing union types
JukkaL Mar 19, 2017
fc57a76
Remove references to Void
JukkaL Mar 19, 2017
9cf9114
Proper subtype checks use type promotions
JukkaL Mar 20, 2017
d406157
Don't call union simplification during semantic analysis
JukkaL Mar 20, 2017
d745a50
Add union simplification test cases
JukkaL Mar 20, 2017
a638e72
Address review feedback
JukkaL Mar 24, 2017
ca511d8
Fix test case failures
JukkaL Mar 24, 2017
807924c
Flatten Optional[Union[...]] types
JukkaL Mar 24, 2017
ef46cfa
Add TODO comment about make_simplified_union
JukkaL Mar 27, 2017
6cd09f1
Add test case
JukkaL Mar 27, 2017
39f94a1
Partially address comments about type object types
JukkaL Mar 27, 2017
0826cc3
Fixes to TypedDict proper subtype checks + add tests
JukkaL Mar 27, 2017
baafcd1
Merge branch 'master' into proper-subtype
JukkaL Mar 27, 2017
a06b41c
Merge branch 'master' into proper-subtype
JukkaL Mar 29, 2017
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
Fix meet of a broken named tuple and a good named tuple
  • Loading branch information
@JukkaL
JukkaL committed Mar 20, 2017
commit e3ff2c7864b63cfe6f415b7396ca535d8813cb75
4 changes: 4 additions & 0 deletions mypy/meet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,10 @@ def visit_tuple_type(self, t: TupleType) -> Type:
elif (isinstance(self.s, Instance) and
self.s.type.fullname() == 'builtins.tuple' and self.s.args):
return t.copy_modified(items=[meet_types(it, self.s.args[0]) for it in t.items])
elif (isinstance(self.s, Instance) and t.fallback.type == self.s.type):
# Uh oh, a broken named tuple type (https://github.com/python/mypy/issues/3016).
# Do something reasonable until that bug is fixed.
return t
else:
return self.default(self.s)

Expand Down
2 changes: 1 addition & 1 deletion mypy/test/testtypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@ def test_tuples(self) -> None:

self.assert_meet(self.tuple(self.fx.a, self.fx.a),
self.fx.std_tuple,
NoneTyp())
self.tuple(self.fx.a, self.fx.a))
self.assert_meet(self.tuple(self.fx.a),
self.tuple(self.fx.a, self.fx.a),
NoneTyp())
Expand Down
22 changes: 22 additions & 0 deletions test-data/unit/check-namedtuple.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,3 +427,25 @@ from typing import NamedTuple
def f() -> None:
A = NamedTuple('A', [('x', int)])
A # E: Name 'A' is not defined

[case testNamedTupleWithImportCycle]
import a
[file a.py]
from collections import namedtuple
from b import f

N = namedtuple('N', 'a')

class X(N): pass
[file b.py]
import a

def f(x: a.X) -> None:
# The type of x is broken (https://github.com/python/mypy/issues/3016) but we need to
# do something reasonable here to avoid a regression.
reveal_type(x)
x = a.X(1)
reveal_type(x)
[out]
tmp/b.py:6: error: Revealed type is 'a.X'
tmp/b.py:8: error: Revealed type is 'Tuple[Any, fallback=a.X]'

@gvanrossum gvanrossum Mar 22, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Might be worth adding another test that just uses N instead of X everywhere.

@JukkaL JukkaL Mar 24, 2017

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

This doesn't work because of #3054.