more tweaks

pydantic · Sep 18, 2019 · fb9d58c · fb9d58c
1 parent 18e9743
commit fb9d58c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/pydantic/errors.py b/pydantic/errors.py
@@ -4,6 +4,7 @@
 
 from .typing import AnyType, display_as_type
 
+# explicitly state exports to avoid "from .errors import *" also importing Decimal, Path etc.
 __all__ = (
     'PydanticTypeError',
     'PydanticValueError',

diff --git a/pydantic/main.py b/pydantic/main.py
@@ -712,7 +712,7 @@ def validate_model(  # noqa: C901 (ignore complexity)
             else:
                 value = deepcopy(field.default)
 
-            if not model.__config__.validate_all and not field.validate_always:
+            if not config.validate_all and not field.validate_always:
                 values[name] = value
                 continue
         else:

diff --git a/pydantic/validators.py b/pydantic/validators.py
@@ -43,7 +43,7 @@
 
 def str_validator(v: Any) -> Optional[str]:
     if isinstance(v, str):
-        if hasattr(v, 'value') and isinstance(v, Enum):
+        if isinstance(v, Enum):
             return v.value
         else:
             return v