diff --git a/graphene/relay/connection.py b/graphene/relay/connection.py index 4b8408e5..464c68af 100644 --- a/graphene/relay/connection.py +++ b/graphene/relay/connection.py @@ -1,5 +1,5 @@ import re -from collections import Iterable +from collections.abc import Iterable from functools import partial from graphql_relay import connection_from_array diff --git a/graphene/tests/issues/test_313.py b/graphene/tests/issues/test_313.py index 34dfef1a..8082677a 100644 --- a/graphene/tests/issues/test_313.py +++ b/graphene/tests/issues/test_313.py @@ -21,7 +21,7 @@ class CreatePostResult(graphene.Union): class CreatePost(graphene.Mutation): - class Input: + class Arguments: text = graphene.String(required=True) result = graphene.Field(CreatePostResult) diff --git a/graphene/types/field.py b/graphene/types/field.py index a1428632..213a0f65 100644 --- a/graphene/types/field.py +++ b/graphene/types/field.py @@ -1,5 +1,5 @@ import inspect -from collections import Mapping, OrderedDict +from collections.abc import Mapping from functools import partial from .argument import Argument, to_arguments @@ -59,7 +59,7 @@ class Field(MountedType): self.name = name self._type = type - self.args = to_arguments(args or OrderedDict(), extra_args) + self.args = to_arguments(args or {}, extra_args) if source: resolver = partial(source_resolver, source) self.resolver = resolver diff --git a/graphene/types/mutation.py b/graphene/types/mutation.py index fb139d78..2017c4d5 100644 --- a/graphene/types/mutation.py +++ b/graphene/types/mutation.py @@ -47,7 +47,7 @@ class Mutation(ObjectType): warn_deprecation( ( "Please use {name}.Arguments instead of {name}.Input." - "Input is now only used in ClientMutationID.\n" + " Input is now only used in ClientMutationID.\n" "Read more:" " https://github.com/graphql-python/graphene/blob/v2.0.0/UPGRADE-v2.0.md#mutation-input" ).format(name=cls.__name__) diff --git a/graphene/types/tests/test_abstracttype.py b/graphene/types/tests/test_abstracttype.py index eb11cb79..a50c8757 100644 --- a/graphene/types/tests/test_abstracttype.py +++ b/graphene/types/tests/test_abstracttype.py @@ -1,4 +1,5 @@ -from .. import abstracttype +from pytest import deprecated_call + from ..abstracttype import AbstractType from ..field import Field from ..objecttype import ObjectType @@ -14,21 +15,22 @@ class MyScalar(UnmountedType): return MyType -def test_abstract_objecttype_warn_deprecation(mocker): - mocker.patch.object(abstracttype, "warn_deprecation") +def test_abstract_objecttype_warn_deprecation(): + with deprecated_call(): - class MyAbstractType(AbstractType): - field1 = MyScalar() - - assert abstracttype.warn_deprecation.called + # noinspection PyUnusedLocal + class MyAbstractType(AbstractType): + field1 = MyScalar() def test_generate_objecttype_inherit_abstracttype(): - class MyAbstractType(AbstractType): - field1 = MyScalar() + with deprecated_call(): - class MyObjectType(ObjectType, MyAbstractType): - field2 = MyScalar() + class MyAbstractType(AbstractType): + field1 = MyScalar() + + class MyObjectType(ObjectType, MyAbstractType): + field2 = MyScalar() assert MyObjectType._meta.description is None assert MyObjectType._meta.interfaces == () diff --git a/graphene/types/tests/test_datetime.py b/graphene/types/tests/test_datetime.py index 35754807..4caa79cf 100644 --- a/graphene/types/tests/test_datetime.py +++ b/graphene/types/tests/test_datetime.py @@ -182,9 +182,10 @@ def test_bad_variables(sample_date, sample_datetime, sample_time): ), variables={"input": input_}, ) - assert result.errors and len(result.errors) == 1 # when `input` is not JSON serializable formatting the error message in # `graphql.utils.is_valid_value` line 79 fails with a TypeError + assert isinstance(result.errors, list) + assert len(result.errors) == 1 assert isinstance(result.errors[0], GraphQLError) assert result.data is None diff --git a/graphene/utils/crunch.py b/graphene/utils/crunch.py index 57fcb77f..b27d3718 100644 --- a/graphene/utils/crunch.py +++ b/graphene/utils/crunch.py @@ -1,5 +1,5 @@ import json -from collections import Mapping +from collections.abc import Mapping def to_key(value): diff --git a/graphene/utils/deduplicator.py b/graphene/utils/deduplicator.py index 32f6dcbe..3fbf139d 100644 --- a/graphene/utils/deduplicator.py +++ b/graphene/utils/deduplicator.py @@ -1,4 +1,4 @@ -from collections import Mapping +from collections.abc import Mapping def deflate(node, index=None, path=None):