I-sort clean up

Author: timsavage

docs/conf.py

@@ -10,8 +10,8 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys
 import os
+import sys
 
 HERE = os.path.dirname(__file__)
 

src/odin/__init__.py

@@ -4,16 +4,16 @@
 logging.getLogger("odin.registration").addHandler(logging.NullHandler())
 
 from odin import exceptions  # noqa
+from odin.adapters import ResourceAdapter  # noqa
+from odin.annotated_resource import *  # noqa
+from odin.annotated_resource import type_aliases as types  # noqa
 from odin.fields import *  # noqa
 from odin.fields.composite import *  # noqa
 from odin.fields.virtual import *  # noqa
+from odin.helpers import *  # noqa
 from odin.mapping import *  # noqa
-from odin.resources import Resource  # noqa
-from odin.adapters import ResourceAdapter  # noqa
 from odin.proxy import ResourceProxy  # noqa
-from odin.annotated_resource import *  # noqa
-from odin.annotated_resource import type_aliases as types  # noqa
-from odin.helpers import *  # noqa
+from odin.resources import Resource  # noqa
 
 __authors__ = "Tim Savage <tim@savage.company>"
 __copyright__ = "Copyright (C) 2021 Tim Savage"

src/odin/adapters.py

@@ -1,4 +1,5 @@
 from functools import cached_property
+
 from odin.utils import field_iter_items, getmeta
 
 __all__ = ("ResourceAdapter",)

src/odin/annotated_resource/__init__.py

@@ -12,18 +12,19 @@
 
 """
 import copy
-from typing import Any, Dict, Tuple, Type, Optional, TypeVar, Iterable
+from typing import Any, Dict, Iterable, Optional, Tuple, Type, TypeVar
 
 from odin import registration
 from odin.fields import BaseField
 from odin.resources import (
-    ResourceBase,
-    ResourceOptions,
     DEFAULT_TYPE_FIELD,
     NotProvided,
+    ResourceBase,
+    ResourceOptions,
 )
-from .type_resolution import process_attribute, Options
+
 from ..exceptions import ResourceDefError
+from .type_resolution import Options, process_attribute
 
 __all__ = (
     "Options",

src/odin/annotated_resource/type_aliases.py

@@ -1,5 +1,5 @@
 """Type aliases for string formatted types."""
-from typing import Callable, Union, Any, Sequence, Tuple
+from typing import Any, Callable, Sequence, Tuple, Union
 
 __all__ = (
     "Email",

src/odin/annotated_resource/type_resolution.py

@@ -4,32 +4,48 @@
 import pathlib
 import re
 import uuid
-from typing import Any, Sequence, Dict, Type, Union, get_origin, List, Final
+from typing import Any, Dict, Final, List, Sequence, Type, Union, get_origin
 
 try:
     # Handle the change in typing between 3.8 and later releases
-    from typing import T, KT, VT
+    from typing import KT, VT, T
 except ImportError:
     T = None
     KT = None
     VT = None
 
 import odin
-from .special_fields import AnyField
-from .type_aliases import Validator, Choices, Email, IPv4, IPv6, IPv46, Url
-from .. import ListOf, DictOf
+
 from ..exceptions import ResourceDefError
 from ..fields import (
     BaseField,
+    DictField,
     Field,
+    ListField,
     NotProvided,
-    TypedListField,
     TypedDictField,
-    ListField,
-    DictField,
+    TypedListField,
+    BooleanField,
+    DateField,
+    IPv6Field,
+    EmailField,
+    DateTimeField,
+    FloatField,
+    IntegerField,
+    IPv4Field,
+    IPv46Field,
+    PathField,
+    RegexField,
+    StringField,
+    TimeField,
+    UrlField,
+    UUIDField,
 )
+from ..fields.composite import DictOf, ListOf
 from ..fields.virtual import ConstantField
 from ..resources import ResourceBase
+from .special_fields import AnyField
+from .type_aliases import Choices, Email, IPv4, IPv6, IPv46, Url, Validator
 
 
 class Options:
@@ -44,8 +60,8 @@ class Options:
 
     def __init__(
         self,
-        default: Any = odin.NotProvided,
-        field_type: Type[odin.BaseField] = None,
+        default: Any = NotProvided,
+        field_type: Type[BaseField] = None,
         *,
         verbose_name: str = None,
         verbose_name_plural: str = None,
@@ -112,23 +128,23 @@ def init_field(self):
 
 
 SIMPLE_TYPE_MAP = {
-    bool: odin.BooleanField,
-    datetime.date: odin.DateField,
-    datetime.datetime: odin.DateTimeField,
-    dict: odin.DictField,
-    Email: odin.EmailField,
-    float: odin.FloatField,
-    int: odin.IntegerField,
-    IPv4: odin.IPv4Field,
-    IPv6: odin.IPv6Field,
-    IPv46: odin.IPv46Field,
-    list: odin.ListField,
-    pathlib.Path: odin.PathField,
-    re.Pattern: odin.RegexField,
-    str: odin.StringField,
-    datetime.time: odin.TimeField,
-    Url: odin.UrlField,
-    uuid.UUID: odin.UUIDField,
+    bool: BooleanField,
+    datetime.date: DateField,
+    datetime.datetime: DateTimeField,
+    dict: DictField,
+    Email: EmailField,
+    float: FloatField,
+    int: IntegerField,
+    IPv4: IPv4Field,
+    IPv6: IPv6Field,
+    IPv46: IPv46Field,
+    list: ListField,
+    pathlib.Path: PathField,
+    re.Pattern: RegexField,
+    str: StringField,
+    datetime.time: TimeField,
+    Url: UrlField,
+    uuid.UUID: UUIDField,
     Any: AnyField,  # For Python 3.11
 }
 

src/odin/codecs/csv_codec.py

@@ -19,10 +19,10 @@
 
 from odin import bases
 from odin.datastructures import CaseLessStringList
+from odin.exceptions import CodecDecodeError, ValidationError
 from odin.fields import NotProvided
 from odin.resources import create_resource_from_iter
 from odin.utils import getmeta, lazy_property
-from odin.exceptions import CodecDecodeError, ValidationError
 
 CONTENT_TYPE = "text/csv"
 

src/odin/codecs/dict_codec.py

@@ -1,8 +1,6 @@
-from odin import bases
-from odin import resources, ResourceAdapter
+from odin import ResourceAdapter, bases, resources
 from odin.utils import getmeta
 
-
 TYPE_SERIALIZERS = {}
 
 

src/odin/codecs/json_codec.py

@@ -2,8 +2,7 @@
 import typing
 import uuid
 
-from odin import bases
-from odin import serializers, resources, ResourceAdapter
+from odin import ResourceAdapter, bases, resources, serializers
 from odin.exceptions import CodecDecodeError, CodecEncodeError
 from odin.utils import getmeta
 

src/odin/codecs/msgpack_codec.py

@@ -10,11 +10,9 @@
         "odin.codecs.msgpack_codec requires the 'msgpack-python' package."
     )  # noqa
 
-from odin import bases
-from odin import serializers, resources, ResourceAdapter
+from odin import ResourceAdapter, bases, resources, serializers
 from odin.utils import getmeta
 
-
 TYPE_SERIALIZERS = {
     datetime.date: serializers.date_iso_format,
     datetime.time: serializers.time_iso_format,