Clean up to make it ruff enough

Author: timsavage

src/odin/annotated_resource/type_resolution.py

@@ -239,7 +239,7 @@ def _resolve_field_from_sub_scripted_type(origin: Type, options: Options, type_)
         options.field_type = ConstantField
         value = options.field_args["default"]
         if value is NotProvided:
-            raise ResourceDefError(f"Final fields require a value")
+            raise ResourceDefError("Final fields require a value")
         options.base_args["value"] = value
         return
 

src/odin/codecs/json_codec.py

@@ -40,10 +40,13 @@ def default(self, o):
             if self.include_type_field:
                 obj[meta.type_field] = meta.resource_name
             return obj
+
         elif isinstance(o, LIST_TYPES):
             return list(o)
+
         elif o.__class__ in JSON_TYPES:
             return JSON_TYPES[o.__class__](o)
+
         return super().default(o)
 
 
@@ -88,7 +91,7 @@ def loads(s, resource=None, full_clean=True, default_to_not_supplied=False):
             json.loads(s), resource, full_clean, False, default_to_not_supplied
         )
     except (ValueError, TypeError) as ex:
-        raise CodecDecodeError(str(ex))
+        raise CodecDecodeError(str(ex)) from ex
 
 
 def dump(resource, fp, cls=OdinEncoder, **kwargs):
@@ -103,7 +106,7 @@ def dump(resource, fp, cls=OdinEncoder, **kwargs):
     try:
         json.dump(resource, fp, cls=cls, **kwargs)
     except ValueError as ex:
-        raise CodecEncodeError(str(ex))
+        raise CodecEncodeError(str(ex)) from ex
 
 
 def dumps(resource, cls=OdinEncoder, **kwargs):
@@ -118,4 +121,4 @@ def dumps(resource, cls=OdinEncoder, **kwargs):
     try:
         return json.dumps(resource, cls=cls, **kwargs)
     except ValueError as ex:
-        raise CodecEncodeError(str(ex))
+        raise CodecEncodeError(str(ex)) from ex

src/odin/codecs/msgpack_codec.py

@@ -8,7 +8,7 @@
 except ImportError:
     raise ImportError(
         "odin.codecs.msgpack_codec requires the 'msgpack-python' package."
-    )  # noqa
+    ) from None  # noqa
 
 from odin import ResourceAdapter, bases, resources, serializers
 from odin.utils import getmeta
@@ -36,8 +36,10 @@ def default(self, o):
             obj = o.to_dict(self.include_virtual_fields)
             obj[meta.type_field] = meta.resource_name
             return obj
+
         elif isinstance(o, bases.ResourceIterable):
             return list(o)
+
         elif o.__class__ in TYPE_SERIALIZERS:
             return TYPE_SERIALIZERS[o.__class__](o)
 

src/odin/codecs/toml_codec.py

@@ -10,7 +10,7 @@
 except ImportError:  # pragma: no cover
     raise ImportError(  # pragma: no cover
         "odin.codecs.toml_codec requires the 'toml' package."
-    )
+    ) from None
 
 
 TOML_TYPES = {}
@@ -39,7 +39,8 @@ def load(fp, resource=None, full_clean=True, default_to_not_supplied=False):
     try:
         data = toml.load(fp)
     except toml.TomlDecodeError as ex:
-        raise CodecDecodeError(str(ex))
+        raise CodecDecodeError(str(ex)) from ex
+
     return resources.build_object_graph(
         data,
         resource,
@@ -70,7 +71,8 @@ def loads(s, resource=None, full_clean=True, default_to_not_supplied=False):
     try:
         data = toml.loads(s)
     except toml.TomlDecodeError as ex:
-        raise CodecDecodeError(str(ex))
+        raise CodecDecodeError(str(ex)) from ex
+
     return resources.build_object_graph(
         data,
         resource,
@@ -105,6 +107,7 @@ def dump_value(self, v):
         if isinstance(v, (ResourceBase, ResourceAdapter)):
             resource_dict = self.resource_to_dict(v)
             return self.dump_inline_table(resource_dict)
+
         if type(v) in TOML_TYPES:
             v = TOML_TYPES[type(v)](v)
         return super().dump_value(v)

src/odin/codecs/xml_codec.py

@@ -19,7 +19,7 @@
 from typing import TextIO
 from xml.sax import saxutils
 
-from odin import Resource, fields, serializers
+from odin import fields, serializers
 from odin.fields import StringField, composite
 from odin.utils import attribute_field_iter_items, element_field_iter_items, getmeta
 
@@ -48,7 +48,7 @@ def _serialize_to_string(value):
 def dump(
     fp: TextIO,
     resource,  # type: Resource
-    line_ending="",  # type: str
+    line_ending: str = "",
 ):
     """
     Dump a resource to a file like object.
@@ -60,9 +60,7 @@ def dump(
 
     # Write container and any attributes
     attributes = "".join(
-        " {}={}".format(
-            f.name, saxutils.quoteattr(_serialize_to_string(v))
-        )  # Encode attributes
+        f" {f.name}={saxutils.quoteattr(_serialize_to_string(v))}"  # Encode attributes
         for f, v in attribute_field_iter_items(resource)
     )
     fp.write(f"<{meta.name}{attributes}>{line_ending}")
@@ -84,27 +82,16 @@ def dump(
         elif isinstance(field, fields.ArrayField):
             for v in value:
                 fp.write(
-                    "<{}>{}</{}>{}".format(
-                        field.name, _serialize_to_string(v), field.name, line_ending
-                    )
+                    f"<{field.name}>{_serialize_to_string(v)}</{field.name}>{line_ending}"
                 )
 
         elif isinstance(field, TextField):
             if value is not None:
-                fp.write(
-                    "{}{}".format(
-                        saxutils.escape(_serialize_to_string(value)), line_ending
-                    )
-                )
+                fp.write(f"{saxutils.escape(_serialize_to_string(value))}{line_ending}")
 
         else:
             fp.write(
-                "<{}>{}</{}>{}".format(
-                    field.name,
-                    saxutils.escape(_serialize_to_string(value)),
-                    field.name,
-                    line_ending,
-                )
+                f"<{field.name}>{saxutils.escape(_serialize_to_string(value))}</{field.name}>{line_ending}"
             )
 
     fp.write(f"</{meta.name}>{line_ending}")

src/odin/codecs/yaml_codec.py

@@ -11,7 +11,7 @@
 except ImportError:
     raise ImportError(  # pragma: no cover
         "odin.codecs.yaml_codec requires the 'pyyaml' package."
-    )
+    ) from None
 
 try:
     from yaml import CSafeDumper as SafeDumper
@@ -96,7 +96,7 @@ def dump(resource: resources.ResourceBase, fp: TextIO, dumper=OdinDumper, **kwar
     try:
         yaml.dump(resource, fp, Dumper=dumper, **kwargs)
     except ValueError as ex:
-        raise CodecEncodeError(str(ex))
+        raise CodecEncodeError(str(ex)) from ex
 
 
 def dumps(resource: resources.ResourceBase, dumper=OdinDumper, **kwargs) -> str:

src/odin/compatibility.py

@@ -21,6 +21,7 @@ def wrapped_init(*args, **kwargs):
                 warnings.warn(
                     f"{obj.__name__} is deprecated and scheduled for removal. {message}",
                     category=category,
+                    stacklevel=2,
                 )
                 return old_init(*args, **kwargs)
 
@@ -33,6 +34,7 @@ def wrapped_func(*args, **kwargs):
                 warnings.warn(
                     f"{obj.__name__} is deprecated and scheduled for removal. {message}",
                     category=category,
+                    stacklevel=2,
                 )
                 return obj(*args, **kwargs)
 

src/odin/contrib/arrow/__init__.py

@@ -1,7 +1,7 @@
 try:
     import arrow
 except ImportError:
-    raise ImportError("The arrow package is not installed.")
+    raise ImportError("The arrow package is not installed.") from None
 
 try:
     from odin.codecs.json_codec import JSON_TYPES

src/odin/contrib/geo/datatypes.py

@@ -1,12 +1,10 @@
 import math
+from typing import Tuple
 
 __all__ = ("latitude", "longitude", "latlng", "point")
 
-from typing import Tuple
-
 
-def to_dms(value, absolute=False):
-    # type: (float, bool) -> Tuple[float, float, float]
+def to_dms(value: float, absolute: bool = False) -> Tuple[float, float, float]:
     """
     Split a float value into DMS (degree, minute, second) parts
 
@@ -24,8 +22,7 @@ def to_dms(value, absolute=False):
     return (-degree if invert else degree), minute, second
 
 
-def to_dm(value, absolute=False):
-    # type: (float, bool) -> Tuple[float, float]
+def to_dm(value: float, absolute: bool = False) -> Tuple[float, float]:
     """
     Split a float value into DM (degree, minute) parts
 
@@ -85,7 +82,7 @@ def __new__(cls, *args):
         try:
             lat, lng = args
         except ValueError:
-            raise TypeError(f"latlng() takes 2 arguments ({len(args)} given)")
+            raise TypeError(f"latlng() takes 2 arguments ({len(args)} given)") from None
         return tuple.__new__(cls, (latitude(lat), longitude(lng)))
 
     @property
@@ -129,7 +126,7 @@ def z(self):
         try:
             return self[2]
         except IndexError:
-            raise AttributeError("2D points do not include a z axis.")
+            raise AttributeError("2D points do not include a z axis.") from None
 
     @property
     def is_3d(self):

src/odin/contrib/geo/fields.py

@@ -22,9 +22,10 @@ def to_python(self, value):
             return
         try:
             return latitude(value)
+
         except (ValueError, TypeError):
             msg = self.error_messages["invalid"] % value
-            raise exceptions.ValidationError(msg)
+            raise exceptions.ValidationError(msg) from None
 
 
 class LongitudeField(ScalarField):
@@ -42,9 +43,10 @@ def to_python(self, value):
             return
         try:
             return longitude(value)
+
         except (ValueError, TypeError):
             msg = self.error_messages["invalid"] % value
-            raise exceptions.ValidationError(msg)
+            raise exceptions.ValidationError(msg) from None
 
 
 class LatLngField(Field):
@@ -62,9 +64,10 @@ def to_python(self, value):
             return
         try:
             return latlng(value)
+
         except (ValueError, TypeError):
             msg = self.error_messages["invalid"] % value
-            raise exceptions.ValidationError(msg)
+            raise exceptions.ValidationError(msg) from None
 
 
 class PointField(Field):
@@ -82,6 +85,7 @@ def to_python(self, value):
             return
         try:
             return point(value)
+
         except (ValueError, TypeError):
             msg = self.error_messages["invalid"] % value
-            raise exceptions.ValidationError(msg)
+            raise exceptions.ValidationError(msg) from None