Fix #1770 (#1771)

pydantic · Oct 8, 2020 · b99c37e · b99c37e
1 parent 55e78cc
commit b99c37e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/changes/1770-selimb.md b/changes/1770-selimb.md
@@ -0,0 +1 @@
+Fix false positive from mypy plugin when a class nested within a `BaseModel` is named `Model`.
diff --git a/pydantic/mypy.py b/pydantic/mypy.py
@@ -328,7 +328,7 @@ def add_construct_method(self, fields: List['PydanticModelField']) -> None:
         construct_arguments = [fields_set_argument] + construct_arguments
 
         obj_type = ctx.api.named_type('__builtins__.object')
-        self_tvar_name = 'Model'
+        self_tvar_name = '_PydanticBaseModel'  # Make sure it does not conflict with other names in the class
         tvar_fullname = ctx.cls.fullname + '.' + self_tvar_name
         tvd = TypeVarDef(self_tvar_name, tvar_fullname, -1, [], obj_type)
         self_tvar_expr = TypeVarExpr(self_tvar_name, tvar_fullname, [], obj_type)

diff --git a/tests/mypy/modules/plugin_success.py b/tests/mypy/modules/plugin_success.py
@@ -123,3 +123,13 @@ class AddProject:
 
 class TypeAliasAsAttribute(BaseModel):
     __type_alias_attribute__ = Union[str, bytes]
+
+
+class NestedModel(BaseModel):
+    class Model(BaseModel):
+        id: str
+
+    model: Model
+
+
+_ = NestedModel.Model