Revert/fix merge conflict errors

pydantic · May 18, 2019 · 82c3400 · 82c3400
1 parent e9bb065
commit 82c3400
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/pydantic/main.py b/pydantic/main.py
@@ -232,9 +232,9 @@ def __init__(self, *args: Any, **data: Any) -> None:
             self.__values__: Dict[str, Any] = {}
             self.__fields_set__: 'SetStr' = set()
         if not data and args:
-            values, fields_set = self._process_values(args[0])
+            values, fields_set, _ = validate_model(self, args[0])
         else:
-            values, fields_set = self._process_values(data)
+            values, fields_set, _ = validate_model(self, data)
         object.__setattr__(self, '__values__', values)
         object.__setattr__(self, '__fields_set__', fields_set)
 
@@ -592,7 +592,6 @@ def validate_model(  # noqa: C901 (ignore complexity)
     fields_set = set()
     config = model.__config__
     check_extra = config.extra is not Extra.ignore
-    fields_set = set()
 
     for name, field in model.__fields__.items():
         if type(field.type_) == ForwardRef:

diff --git a/tests/test_edge_cases.py b/tests/test_edge_cases.py
@@ -605,7 +605,7 @@ class Model(BaseModel):
         bar: List[int]
 
     assert validate_model(Model, {'foo': '123', 'bar': (1, 2, 3)})[0] == {'foo': 123, 'bar': [1, 2, 3]}
-    d, _, e = validate_model(Model, {'foo': '123', 'bar': (1, 2, 3)}, False)
+    d, f, e = validate_model(Model, {'foo': '123', 'bar': (1, 2, 3)}, False)
     assert d == {'foo': 123, 'bar': [1, 2, 3]}
     assert f == {'foo', 'bar'}
     assert e is None