Merge pull request #143 from altendky/ib_gives_any

Author: altendky

src/desert/__init__.py

@@ -93,19 +93,19 @@ def field(
     *,
     metadata: t.Mapping[object, object] = {},
     **kw: object,
-) -> object:
+) -> t.Any:
     ...
 
 
-# The return type hint of object is certainly a lie but fits a lot better with
+# The return type hint of Any is certainly a lie but fits a lot better with
 # the normal use of `x: int = desert.field()`.  Both dataclasses and attrs
 # prioritize hinting for this usage as well.  Perhaps someday we'll have a
 # plugin that indicates the actual type.
 def field(
     marshmallow_field: marshmallow.fields.Field,
     metadata: t.Mapping[object, object] = {},
     **kw: object,
-) -> object:
+) -> t.Any:
     """Specify a marshmallow field in the metadata for a ``dataclasses.dataclass``.
 
     .. code-block:: python
@@ -153,19 +153,19 @@ def ib(
     *,
     metadata: t.Mapping[object, object] = {},
     **kw: object,
-) -> object:
+) -> t.Any:
     ...
 
 
-# The return type hint of object is certainly a lie but fits a lot better with
+# The return type hint of Any is certainly a lie but fits a lot better with
 # the normal use of `x: int = desert.ib()`.  Both dataclasses and attrs
 # prioritize hinting for this usage as well.  Perhaps someday we'll have a
 # plugin that indicates the actual type.
 def ib(
     marshmallow_field: marshmallow.fields.Field,
     metadata: t.Mapping[object, object] = {},
     **kw: object,
-) -> object:
+) -> t.Any:
     """Specify a marshmallow field in the metadata for an ``attr.dataclass``.
 
     .. code-block:: python

tests/test_make.py

@@ -245,7 +245,7 @@ def test_concise_dataclasses_field() -> None:
 
     @dataclasses.dataclass
     class A:
-        x: datetime.datetime = desert.field(marshmallow.fields.NaiveDateTime())  # type: ignore[assignment]
+        x: datetime.datetime = desert.field(marshmallow.fields.NaiveDateTime())
 
     timestring = "2019-10-21T10:25:00"
     dt = datetime.datetime(year=2019, month=10, day=21, hour=10, minute=25, second=00)
@@ -259,7 +259,7 @@ def test_concise_attrib() -> None:
 
     @attr.dataclass
     class A:
-        x: datetime.datetime = desert.ib(marshmallow.fields.NaiveDateTime())  # type: ignore[assignment]
+        x: datetime.datetime = desert.ib(marshmallow.fields.NaiveDateTime())
 
     timestring = "2019-10-21T10:25:00"
     dt = datetime.datetime(year=2019, month=10, day=21, hour=10, minute=25, second=00)
@@ -273,7 +273,10 @@ def test_concise_field_metadata() -> None:
 
     @dataclasses.dataclass
     class A:
-        x: datetime.datetime = desert.field(marshmallow.fields.NaiveDateTime(), metadata={"foo": 1})  # type: ignore[assignment]
+        x: datetime.datetime = desert.field(
+            marshmallow.fields.NaiveDateTime(),
+            metadata={"foo": 1},
+        )
 
     timestring = "2019-10-21T10:25:00"
     dt = datetime.datetime(year=2019, month=10, day=21, hour=10, minute=25, second=00)
@@ -288,7 +291,9 @@ def test_concise_attrib_metadata() -> None:
 
     @attr.dataclass
     class A:
-        x: datetime.datetime = desert.ib(marshmallow.fields.NaiveDateTime(), metadata={"foo": 1})  # type: ignore[assignment]
+        x: datetime.datetime = desert.ib(
+            marshmallow.fields.NaiveDateTime(), metadata={"foo": 1}
+        )
 
     timestring = "2019-10-21T10:25:00"
     dt = datetime.datetime(year=2019, month=10, day=21, hour=10, minute=25, second=00)