Skip to content

Commit 31a0401

Browse files
committed
module import
1 parent bf8e8b1 commit 31a0401

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

mypy/join.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
is_protocol_implementation,
1818
is_subtype,
1919
)
20-
from mypy.typeops import make_simplified_union
2120
from mypy.types import (
2221
AnyType,
2322
CallableType,
@@ -167,7 +166,7 @@ def join_instances_via_supertype(self, t: Instance, s: Instance) -> ProperType:
167166
return join_types(t, p, self)
168167

169168
if self.prefer_union_over_supertype:
170-
return make_simplified_union([t, s])
169+
return mypy.typeops.make_simplified_union([t, s])
171170

172171
# Compute the "best" supertype of t when joined with s.
173172
# The definition of "best" may evolve; for now it is the one with

0 commit comments

Comments
 (0)