Fix argument name collision (pydantic#1367)

kittipatv · web-flow · commit c5af109e5741 · 2020-04-15T22:52:07.000+01:00
fix pydantic#1366 * Fix argument name collision * change qoutes * make mypy happy? * Adding change file
diff --git a/changes/1367-kittipatv.md b/changes/1367-kittipatv.md
@@ -0,0 +1 @@
+Renaming `model_name` argument of `main.create_model()` to `__model_name` to allow using `model_name` as a field name.
diff --git a/pydantic/generics.py b/pydantic/generics.py
@@ -48,7 +48,7 @@ def __class_getitem__(cls: Type[GenericModelT], params: Union[Type[Any], Tuple[T
         created_model = cast(
             Type[GenericModel],  # casting ensures mypy is aware of the __concrete__ and __parameters__ attributes
             create_model(
-                model_name=model_name,
+                model_name,
                 __module__=cls.__module__,
                 __base__=cls,
                 __config__=None,
diff --git a/pydantic/main.py b/pydantic/main.py
@@ -773,7 +773,7 @@ def __values__(self) -> 'DictStrAny':
 
 
 def create_model(
-    model_name: str,
+    __model_name: str,
     *,
     __config__: Type[BaseConfig] = None,
     __base__: Type[BaseModel] = None,
@@ -783,7 +783,7 @@ def create_model(
 ) -> Type[BaseModel]:
     """
     Dynamically create a model.
-    :param model_name: name of the created model
+    :param __model_name: name of the created model
     :param __config__: config class to use for the new model
     :param __base__: base class for the new model to inherit from
     :param __validators__: a dict of method names and @validator class methods
@@ -825,7 +825,7 @@ def create_model(
     if __config__:
         namespace['Config'] = inherit_config(__config__, BaseConfig)
 
-    return type(model_name, (__base__,), namespace)
+    return type(__model_name, (__base__,), namespace)
 
 
 _missing = object()
diff --git a/tests/test_dataclasses.py b/tests/test_dataclasses.py
@@ -24,6 +24,17 @@ class MyDataclass:
     assert d.b == 10
 
 
+def test_model_name():
+    @pydantic.dataclasses.dataclass
+    class MyDataClass:
+        model_name: str
+
+    d = MyDataClass('foo')
+    assert d.model_name == 'foo'
+    d = MyDataClass(model_name='foo')
+    assert d.model_name == 'foo'
+
+
 def test_value_error():
     @pydantic.dataclasses.dataclass
     class MyDataclass:

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Renaming `model_name` argument of `main.create_model()` to `__model_name` to allow using `model_name` as a field name.