v2.3.1 quick fix

commit 7244a53
Author: Ben Samuel <[email protected]>
Date:   Thu Feb 13 11:43:31 2020 -0500

    Remove unnecessary comparison of attr.ib's when default not set.

    - Test that values with nonstandard __eq__ encode if they are required.
    - Other minor cleanup.

Author: bsamuel-ui

json_syntax/action_v1.py

@@ -1,4 +1,4 @@
-from .helpers import ErrorContext, err_ctx
+from .errors import ErrorContext, err_ctx
 
 from datetime import date, datetime, time, timedelta
 from decimal import InvalidOperation
@@ -184,7 +184,7 @@ def convert_dict_to_attrs(value, pre_hook, inner_map, con):
                 arg = value[attr.name]
             except KeyError:
                 if attr.is_required:
-                    raise KeyError("Missing key") from None
+                    raise KeyError("Missing key {!r}".format(attr.name)) from None
             else:
                 args[attr.init_name] = attr.inner(arg)
     return con(**args)
@@ -198,7 +198,7 @@ def convert_dict_to_dict(value, inner_map, con):
                 arg = value[attr.name]
             except KeyError:
                 if attr.is_required:
-                    raise KeyError("Missing key") from None
+                    raise KeyError("Missing key {!r}".format(attr.name)) from None
             else:
                 args[attr.name] = attr.inner(arg)
     return con(args)
@@ -226,7 +226,7 @@ def convert_attrs_to_dict(value, post_hook, inner_map):
     for attr in inner_map:
         with ErrorContext("." + attr.name):
             field = getattr(value, attr.name)
-            if field == attr.default:
+            if not attr.is_required and field == attr.default:
                 continue
             out[attr.name] = attr.inner(field)
     if post_hook is not None:

json_syntax/product.py

@@ -67,6 +67,11 @@ def __repr__(self):
             self.name, "required" if self.is_required else "optional"
         )
 
+    def long_repr(self):
+        return "<Attribute {!r} typ={!r} inner={!r} default={!r} is_required={!r}>".format(
+            self.name, self.typ, self.inner, self.default, self.is_required
+        )
+
 
 class AttrsAttribute(Attribute):
     @property

json_syntax/std.py

@@ -1,8 +1,4 @@
 from .helpers import (
-    has_origin,
-    get_origin,
-    issub_safe,
-    NoneType,
     JSON2PY,
     PY2JSON,
     INSP_JSON,
@@ -12,6 +8,12 @@
     PY2STR,
     INSP_STR,
 )
+from .types import (
+    has_origin,
+    get_origin,
+    issub_safe,
+    NoneType,
+)
 from .action_v1 import (
     check_collection,
     check_float,
@@ -54,7 +56,7 @@
 
 
 def atoms(verb, typ, ctx):
-    "Rule to handle atoms on both sides."
+    "Rule to handle atoms that translate trivially."
     if issub_safe(typ, (str, int, NoneType)):
         if verb in (JSON2PY, PY2JSON):
             if typ is NoneType:

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "json-syntax"
-version = "2.3.0"
+version = "2.3.1"
 description = "Generates functions to convert Python classes to JSON dumpable objects."
 authors = ["Ben Samuel <[email protected]>"]
 license = "MIT"

pyproject.toml

@@ -396,3 +396,33 @@ def test_typed_dict_encoding(dict_type):
     assert not inspect("foo")
     assert not inspect({})
     assert inspect({"a": 3, "b": "foo", "c": True})
+
+
+@attr.s(eq=False)
+class Incomparable:
+    def __eq__(self, other):
+        raise RuntimeError("Can't compare this class")
+
+    def __ne__(self, other):
+        raise RuntimeError("Can't compare this class")
+
+
+@attr.s
+class IncomparableContainer:
+    field1 = attr.ib(type=Incomparable)
+    field2 = attr.ib(type=int, default=3)
+
+
+def test_encode_incomparable():
+    "Test that encoding doesn't fail if a field's __eq__ method throws."
+
+    rules = Rules(at.attrs_classes, std.atoms, std.lists)
+
+    encoder = at.attrs_classes(verb=PY2JSON, typ=IncomparableContainer, ctx=rules)
+    assert encoder(IncomparableContainer(Incomparable())) == {"field1": {}}
+    assert encoder(IncomparableContainer(Incomparable(), 4)) == {"field1": {}, "field2": 4}
+
+    decoder = at.attrs_classes(verb=JSON2PY, typ=IncomparableContainer, ctx=rules)
+    actual = decoder({"field1": {}})
+    assert isinstance(actual.field1, Incomparable)
+    assert actual.field2 == 3