From 029dde32a26c2b1ab7852f8031639553737d03e6 Mon Sep 17 00:00:00 2001 From: Christoph Zwerschke Date: Mon, 1 Jul 2019 00:36:46 +0200 Subject: [PATCH] Remove object as base class (not needed in Py 3) --- graphene/relay/connection.py | 2 +- graphene/relay/tests/test_connection.py | 6 +++--- graphene/relay/tests/test_global_id.py | 2 +- graphene/relay/tests/test_mutation.py | 4 ++-- graphene/relay/tests/test_node.py | 2 +- graphene/test/__init__.py | 2 +- graphene/types/base.py | 2 +- graphene/types/context.py | 2 +- graphene/types/tests/test_definition.py | 4 ++-- graphene/types/tests/test_field.py | 2 +- graphene/types/tests/test_inputobjecttype.py | 6 +++--- graphene/types/tests/test_interface.py | 6 +++--- graphene/types/tests/test_objecttype.py | 4 ++-- graphene/types/tests/test_query.py | 10 +++++----- graphene/types/tests/test_resolver.py | 2 +- graphene/utils/orderedtype.py | 2 +- graphene/utils/props.py | 2 +- graphene/utils/tests/test_trim_docstring.py | 4 ++-- 18 files changed, 32 insertions(+), 32 deletions(-) diff --git a/graphene/relay/connection.py b/graphene/relay/connection.py index 24804dbd..87054e91 100644 --- a/graphene/relay/connection.py +++ b/graphene/relay/connection.py @@ -66,7 +66,7 @@ class Connection(ObjectType): edge_class = getattr(cls, "Edge", None) _node = node - class EdgeBase(object): + class EdgeBase: node = Field(_node, description="The item at the end of the edge") cursor = String(required=True, description="A cursor for use in pagination") diff --git a/graphene/relay/tests/test_connection.py b/graphene/relay/tests/test_connection.py index 6686f964..35bfde1f 100644 --- a/graphene/relay/tests/test_connection.py +++ b/graphene/relay/tests/test_connection.py @@ -39,7 +39,7 @@ def test_connection(): def test_connection_inherit_abstracttype(): - class BaseConnection(object): + class BaseConnection: extra = String() class MyObjectConnection(BaseConnection, Connection): @@ -54,7 +54,7 @@ def test_connection_inherit_abstracttype(): def test_connection_name(): custom_name = "MyObjectCustomNameConnection" - class BaseConnection(object): + class BaseConnection: extra = String() class MyObjectConnection(BaseConnection, Connection): @@ -86,7 +86,7 @@ def test_edge(): def test_edge_with_bases(): - class BaseEdge(object): + class BaseEdge: extra = String() class MyObjectConnection(Connection): diff --git a/graphene/relay/tests/test_global_id.py b/graphene/relay/tests/test_global_id.py index 6d328f23..2fe81300 100644 --- a/graphene/relay/tests/test_global_id.py +++ b/graphene/relay/tests/test_global_id.py @@ -17,7 +17,7 @@ class User(ObjectType): name = String() -class Info(object): +class Info: def __init__(self, parent_type): self.parent_type = GrapheneObjectType( graphene_type=parent_type, diff --git a/graphene/relay/tests/test_mutation.py b/graphene/relay/tests/test_mutation.py index dcafbd80..151a8d6e 100644 --- a/graphene/relay/tests/test_mutation.py +++ b/graphene/relay/tests/test_mutation.py @@ -14,7 +14,7 @@ from ...types.scalars import String from ..mutation import ClientIDMutation -class SharedFields(object): +class SharedFields: shared = String() @@ -36,7 +36,7 @@ class SaySomething(ClientIDMutation): return SaySomething(phrase=str(what)) -class FixedSaySomething(object): +class FixedSaySomething: __slots__ = ("phrase",) def __init__(self, phrase): diff --git a/graphene/relay/tests/test_node.py b/graphene/relay/tests/test_node.py index be6cdc85..66ad12b4 100644 --- a/graphene/relay/tests/test_node.py +++ b/graphene/relay/tests/test_node.py @@ -6,7 +6,7 @@ from ...types import ObjectType, Schema, String from ..node import Node, is_node -class SharedNodeFields(object): +class SharedNodeFields: shared = String() something_else = String() diff --git a/graphene/test/__init__.py b/graphene/test/__init__.py index fd6a2126..8591dc06 100644 --- a/graphene/test/__init__.py +++ b/graphene/test/__init__.py @@ -20,7 +20,7 @@ def format_execution_result(execution_result, format_error): return response -class Client(object): +class Client: def __init__(self, schema, format_error=None, **execute_options): assert isinstance(schema, Schema) self.schema = schema diff --git a/graphene/types/base.py b/graphene/types/base.py index bab78a49..79907b4d 100644 --- a/graphene/types/base.py +++ b/graphene/types/base.py @@ -4,7 +4,7 @@ from ..utils.subclass_with_meta import SubclassWithMeta from ..utils.trim_docstring import trim_docstring -class BaseOptions(object): +class BaseOptions: name = None # type: str description = None # type: str diff --git a/graphene/types/context.py b/graphene/types/context.py index bac2073c..3394e004 100644 --- a/graphene/types/context.py +++ b/graphene/types/context.py @@ -1,4 +1,4 @@ -class Context(object): +class Context: def __init__(self, **params): for key, value in params.items(): setattr(self, key, value) diff --git a/graphene/types/tests/test_definition.py b/graphene/types/tests/test_definition.py index 57656ccf..b3b480af 100644 --- a/graphene/types/tests/test_definition.py +++ b/graphene/types/tests/test_definition.py @@ -289,7 +289,7 @@ def test_stringifies_simple_types(): def test_does_not_mutate_passed_field_definitions(): - class CommonFields(object): + class CommonFields: field1 = String() field2 = String(id=String()) @@ -301,7 +301,7 @@ def test_does_not_mutate_passed_field_definitions(): assert TestObject1._meta.fields == TestObject2._meta.fields - class CommonFields(object): + class CommonFields: field1 = String() field2 = String() diff --git a/graphene/types/tests/test_field.py b/graphene/types/tests/test_field.py index 13c755fc..60bf3684 100644 --- a/graphene/types/tests/test_field.py +++ b/graphene/types/tests/test_field.py @@ -9,7 +9,7 @@ from ..structures import NonNull from .utils import MyLazyType -class MyInstance(object): +class MyInstance: value = "value" value_func = staticmethod(lambda: "value_func") diff --git a/graphene/types/tests/test_inputobjecttype.py b/graphene/types/tests/test_inputobjecttype.py index de42b66e..f2b6cf88 100644 --- a/graphene/types/tests/test_inputobjecttype.py +++ b/graphene/types/tests/test_inputobjecttype.py @@ -8,7 +8,7 @@ from ..schema import Schema from ..unmountedtype import UnmountedType -class MyType(object): +class MyType: pass @@ -78,7 +78,7 @@ def test_generate_inputobjecttype_as_argument(): def test_generate_inputobjecttype_inherit_abstracttype(): - class MyAbstractType(object): + class MyAbstractType: field1 = MyScalar(MyType) class MyInputObjectType(InputObjectType, MyAbstractType): @@ -92,7 +92,7 @@ def test_generate_inputobjecttype_inherit_abstracttype(): def test_generate_inputobjecttype_inherit_abstracttype_reversed(): - class MyAbstractType(object): + class MyAbstractType: field1 = MyScalar(MyType) class MyInputObjectType(MyAbstractType, InputObjectType): diff --git a/graphene/types/tests/test_interface.py b/graphene/types/tests/test_interface.py index b524296b..df85472f 100644 --- a/graphene/types/tests/test_interface.py +++ b/graphene/types/tests/test_interface.py @@ -3,7 +3,7 @@ from ..interface import Interface from ..unmountedtype import UnmountedType -class MyType(object): +class MyType: pass @@ -57,7 +57,7 @@ def test_generate_interface_unmountedtype(): def test_generate_interface_inherit_abstracttype(): - class MyAbstractType(object): + class MyAbstractType: field1 = MyScalar() class MyInterface(Interface, MyAbstractType): @@ -80,7 +80,7 @@ def test_generate_interface_inherit_interface(): def test_generate_interface_inherit_abstracttype_reversed(): - class MyAbstractType(object): + class MyAbstractType: field1 = MyScalar() class MyInterface(MyAbstractType, Interface): diff --git a/graphene/types/tests/test_objecttype.py b/graphene/types/tests/test_objecttype.py index 68b8dd8a..505dc9f7 100644 --- a/graphene/types/tests/test_objecttype.py +++ b/graphene/types/tests/test_objecttype.py @@ -106,7 +106,7 @@ def test_ordered_fields_in_objecttype(): def test_generate_objecttype_inherit_abstracttype(): - class MyAbstractType(object): + class MyAbstractType: field1 = MyScalar() class MyObjectType(ObjectType, MyAbstractType): @@ -120,7 +120,7 @@ def test_generate_objecttype_inherit_abstracttype(): def test_generate_objecttype_inherit_abstracttype_reversed(): - class MyAbstractType(object): + class MyAbstractType: field1 = MyScalar() class MyObjectType(MyAbstractType, ObjectType): diff --git a/graphene/types/tests/test_query.py b/graphene/types/tests/test_query.py index 211c2ec9..259e6b02 100644 --- a/graphene/types/tests/test_query.py +++ b/graphene/types/tests/test_query.py @@ -34,7 +34,7 @@ def test_query(): def test_query_source(): - class Root(object): + class Root: _hello = "World" def hello(self): @@ -51,10 +51,10 @@ def test_query_source(): def test_query_union(): - class one_object(object): + class one_object: pass - class two_object(object): + class two_object: pass class One(ObjectType): @@ -89,10 +89,10 @@ def test_query_union(): def test_query_interface(): - class one_object(object): + class one_object: pass - class two_object(object): + class two_object: pass class MyInterface(Interface): diff --git a/graphene/types/tests/test_resolver.py b/graphene/types/tests/test_resolver.py index a03cf187..dcadb6d8 100644 --- a/graphene/types/tests/test_resolver.py +++ b/graphene/types/tests/test_resolver.py @@ -13,7 +13,7 @@ info = None demo_dict = {"attr": "value"} -class demo_obj(object): +class demo_obj: attr = "value" diff --git a/graphene/utils/orderedtype.py b/graphene/utils/orderedtype.py index a58f4d08..fb8783d2 100644 --- a/graphene/utils/orderedtype.py +++ b/graphene/utils/orderedtype.py @@ -2,7 +2,7 @@ from functools import total_ordering @total_ordering -class OrderedType(object): +class OrderedType: creation_counter = 1 def __init__(self, _creation_counter=None): diff --git a/graphene/utils/props.py b/graphene/utils/props.py index 5ef3ba0a..26c697ec 100644 --- a/graphene/utils/props.py +++ b/graphene/utils/props.py @@ -2,7 +2,7 @@ class _OldClass: pass -class _NewClass(object): +class _NewClass: pass diff --git a/graphene/utils/tests/test_trim_docstring.py b/graphene/utils/tests/test_trim_docstring.py index 704d3997..232836d1 100644 --- a/graphene/utils/tests/test_trim_docstring.py +++ b/graphene/utils/tests/test_trim_docstring.py @@ -2,7 +2,7 @@ from ..trim_docstring import trim_docstring def test_trim_docstring(): - class WellDocumentedObject(object): + class WellDocumentedObject: """ This object is very well-documented. It has multiple lines in its description. @@ -16,7 +16,7 @@ def test_trim_docstring(): "description.\n\nMultiple paragraphs too" ) - class UndocumentedObject(object): + class UndocumentedObject: pass assert trim_docstring(UndocumentedObject.__doc__) is None