Skip to content

Commit 6364a0b

Browse files
committed
Fix bugs revealed by patch_parent fix
This commit tweaks some subtly broken imports that were not caught before due to the automatic patching patch_parent performed.
1 parent 438f505 commit 6364a0b

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

mypy/checkexpr.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
from mypy.constraints import get_actual_type
3737
from mypy.checkstrformat import StringFormatterChecker
3838
from mypy.expandtype import expand_type
39-
import mypy.checkexpr
4039

4140
from mypy import experiments
4241

@@ -61,15 +60,15 @@ class ExpressionChecker:
6160
# This is shared with TypeChecker, but stored also here for convenience.
6261
msg = None # type: MessageBuilder
6362

64-
strfrm_checker = None # type: mypy.checkstrformat.StringFormatterChecker
63+
strfrm_checker = None # type: StringFormatterChecker
6564

6665
def __init__(self,
6766
chk: 'mypy.checker.TypeChecker',
6867
msg: MessageBuilder) -> None:
6968
"""Construct an expression type checker."""
7069
self.chk = chk
7170
self.msg = msg
72-
self.strfrm_checker = mypy.checkexpr.StringFormatterChecker(self, self.chk, self.msg)
71+
self.strfrm_checker = StringFormatterChecker(self, self.chk, self.msg)
7372

7473
def visit_name_expr(self, e: NameExpr) -> Type:
7574
"""Type check a name expression.

mypy/checkstrformat.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
if False:
1414
# break import cycle only needed for mypy
1515
import mypy.checker
16+
import mypy.checkexpr
1617
from mypy import messages
1718
from mypy.messages import MessageBuilder
1819

0 commit comments

Comments
 (0)