From ad607eb122bf731b26cb9458855448b7fc27ae27 Mon Sep 17 00:00:00 2001 From: Syrus Akbary Date: Sat, 4 Jun 2016 19:19:08 -0700 Subject: [PATCH] Changed name from GrapheneType to GrapheneGraphQLType --- graphene/types/definitions.py | 6 +++--- graphene/types/enum.py | 4 ++-- graphene/types/scalars.py | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/graphene/types/definitions.py b/graphene/types/definitions.py index 448d2067..60971ad8 100644 --- a/graphene/types/definitions.py +++ b/graphene/types/definitions.py @@ -58,12 +58,12 @@ class ClassTypeMeta(type): return cls -class GrapheneType(object): +class GrapheneGraphQLType(object): def __init__(self, *args, **kwargs): self.graphene_type = kwargs.pop('graphene_type') self._name = None self._description = None - super(GrapheneType, self).__init__(*args, **kwargs) + super(GrapheneGraphQLType, self).__init__(*args, **kwargs) @property def name(self): @@ -82,7 +82,7 @@ class GrapheneType(object): self._description = description -class GrapheneFieldsType(GrapheneType): +class GrapheneFieldsType(GrapheneGraphQLType): def __init__(self, *args, **kwargs): self._fields = None self._field_map = None diff --git a/graphene/types/enum.py b/graphene/types/enum.py index 4c7799ba..4f49be63 100644 --- a/graphene/types/enum.py +++ b/graphene/types/enum.py @@ -1,7 +1,7 @@ import six from graphql.type import GraphQLEnumType, GraphQLEnumValue -from .definitions import ClassTypeMeta, GrapheneType +from .definitions import ClassTypeMeta, GrapheneGraphQLType try: from enum import Enum as PyEnum except ImportError: @@ -10,7 +10,7 @@ except ImportError: from .proxy import TypeProxy -class GrapheneEnumType(GrapheneType, GraphQLEnumType): +class GrapheneEnumType(GrapheneGraphQLType, GraphQLEnumType): def __init__(self, *args, **kwargs): graphene_type = kwargs.pop('graphene_type') diff --git a/graphene/types/scalars.py b/graphene/types/scalars.py index 5287eb05..b76df6b8 100644 --- a/graphene/types/scalars.py +++ b/graphene/types/scalars.py @@ -1,14 +1,14 @@ import six from graphql import GraphQLScalarType, GraphQLString, GraphQLInt, GraphQLFloat, GraphQLBoolean, GraphQLID -from .definitions import ClassTypeMeta, GrapheneType +from .definitions import ClassTypeMeta, GrapheneGraphQLType from .proxy import TypeProxy -class GrapheneScalarType(GrapheneType, GraphQLScalarType): +class GrapheneScalarType(GrapheneGraphQLType, GraphQLScalarType): def __init__(self, *args, **kwargs): - GrapheneType.__init__(self, *args, **kwargs) + GrapheneGraphQLType.__init__(self, *args, **kwargs) @staticmethod def default_parse(value):