Avoid various deprecation warnings

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

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)

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

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__)

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):
+def test_abstract_objecttype_warn_deprecation():
-    mocker.patch.object(abstracttype, "warn_deprecation")
+    with deprecated_call():
 
-    class MyAbstractType(AbstractType):
+        # noinspection PyUnusedLocal
-        field1 = MyScalar()
+        class MyAbstractType(AbstractType):
-
+            field1 = MyScalar()
-    assert abstracttype.warn_deprecation.called
 
 
 def test_generate_objecttype_inherit_abstracttype():
-    class MyAbstractType(AbstractType):
+    with deprecated_call():
-        field1 = MyScalar()
 
-    class MyObjectType(ObjectType, MyAbstractType):
+        class MyAbstractType(AbstractType):
-        field2 = MyScalar()
+            field1 = MyScalar()
+
+        class MyObjectType(ObjectType, MyAbstractType):
+            field2 = MyScalar()
 
     assert MyObjectType._meta.description is None
     assert MyObjectType._meta.interfaces == ()

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
 

graphene/utils/crunch.py

@@ -1,5 +1,5 @@
 import json
-from collections import Mapping
+from collections.abc import Mapping
 
 
 def to_key(value):

graphene/utils/deduplicator.py

@@ -1,4 +1,4 @@
-from collections import Mapping
+from collections.abc import Mapping
 
 
 def deflate(node, index=None, path=None):