Skip to content

Commit f01efec

Browse files
committed
Merge branch 'master' into better-incompatible-messages
2 parents 4670d2e + e702679 commit f01efec

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

docs/source/config_file.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -906,7 +906,7 @@ Instead of using a ``mypy.ini`` file, a ``pyproject.toml`` file (as specified by
906906
module = 'packagename'
907907
...
908908
909-
* Multi-module specific sections can be moved into a single ``[[tools.mypy.overrides]]`` section with a
909+
* Multi-module specific sections can be moved into a single ``[[tool.mypy.overrides]]`` section with a
910910
module property set to an array of modules:
911911

912912
* For example, ``[mypy-packagename,packagename2]`` would become:

mypy/nodes.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3080,7 +3080,9 @@ def serialize(self, prefix: str, name: str) -> JsonDict:
30803080
and fullname != prefix + '.' + name
30813081
and not (isinstance(self.node, Var)
30823082
and self.node.from_module_getattr)):
3083-
assert not isinstance(self.node, PlaceholderNode)
3083+
assert not isinstance(self.node, PlaceholderNode), (
3084+
'Definition of {} is unexpectedly incomplete'.format(fullname)
3085+
)
30843086
data['cross_ref'] = fullname
30853087
return data
30863088
data['node'] = self.node.serialize()

0 commit comments

Comments
 (0)