From 99eec49a068cc49d6deb2f3eac2d98a3c5f9f0ae Mon Sep 17 00:00:00 2001 From: Syrus Akbary Date: Sat, 13 Aug 2016 23:15:20 -0700 Subject: [PATCH] Removed unused code. Small refactor --- graphene/relay/connection.py | 16 +------------- graphene/relay/node.py | 8 +------ graphene/types/argument.py | 2 +- graphene/types/inputobjecttype.py | 3 +-- graphene/types/objecttype.py | 2 +- graphene/types/schema.py | 35 ++++++++++--------------------- graphene/types/unmountedtype.py | 6 +++--- graphene/types/utils.py | 4 ++-- 8 files changed, 21 insertions(+), 55 deletions(-) diff --git a/graphene/relay/connection.py b/graphene/relay/connection.py index 2feb04f8..71563aed 100644 --- a/graphene/relay/connection.py +++ b/graphene/relay/connection.py @@ -102,25 +102,11 @@ class ConnectionMeta(ObjectTypeMeta): class Connection(six.with_metaclass(ConnectionMeta, ObjectType)): - resolve_node = None - resolve_cursor = None - - # def __init__(self, *args, **kwargs): - # super(Connection, self).__init__(*args, **kwargs) - # print args, kwargs - # print dir(self.page_info) - + pass class IterableConnectionField(Field): def __init__(self, type, *args, **kwargs): - # arguments = kwargs.pop('args', {}) - # if not arguments: - # arguments = connection_args - # else: - # arguments = copy.copy(arguments) - # arguments.update(connection_args) - super(IterableConnectionField, self).__init__( type, *args, diff --git a/graphene/relay/node.py b/graphene/relay/node.py index c6664c44..80459f2f 100644 --- a/graphene/relay/node.py +++ b/graphene/relay/node.py @@ -27,8 +27,7 @@ class GlobalID(Field): @staticmethod def id_resolver(parent_resolver, node, root, args, context, info): id = parent_resolver(root, args, context, info) - # type_name = root._meta.name # info.parent_type.name - return node.to_global_id(info.parent_type.name, id) + return node.to_global_id(info.parent_type.name, id) # root._meta.name def get_resolver(self, parent_resolver): return partial(self.id_resolver, parent_resolver, self.node) @@ -39,11 +38,6 @@ class NodeMeta(InterfaceMeta): def __new__(cls, name, bases, attrs): cls = InterfaceMeta.__new__(cls, name, bases, attrs) cls._meta.fields['id'] = GlobalID(cls, required=True, description='The ID of the object.') - # new_fields = OrderedDict([ - # ('id', GlobalID(cls, required=True, description='The ID of the object.')) - # ]) - # new_fields.update(cls._meta.fields) - # cls._meta.fields = new_fields return cls diff --git a/graphene/types/argument.py b/graphene/types/argument.py index 964d42d6..9720eb75 100644 --- a/graphene/types/argument.py +++ b/graphene/types/argument.py @@ -26,7 +26,7 @@ def to_arguments(args, extra_args): arguments = OrderedDict() for default_name, arg in iter_arguments: if isinstance(arg, UnmountedType): - arg = arg.as_argument() + arg = arg.Argument() if not isinstance(arg, Argument): raise ValueError('Unknown argument "{}".'.format(default_name)) diff --git a/graphene/types/inputobjecttype.py b/graphene/types/inputobjecttype.py index 4c5c70df..ef79baec 100644 --- a/graphene/types/inputobjecttype.py +++ b/graphene/types/inputobjecttype.py @@ -35,8 +35,7 @@ class InputObjectTypeMeta(AbstractTypeMeta): class InputObjectType(six.with_metaclass(InputObjectTypeMeta, UnmountedType)): + @classmethod def get_type(cls): return cls - # def __init__(self, *args, **kwargs): - # raise Exception("An InputObjectType cannot be intitialized") diff --git a/graphene/types/objecttype.py b/graphene/types/objecttype.py index 89510e2e..763935e5 100644 --- a/graphene/types/objecttype.py +++ b/graphene/types/objecttype.py @@ -53,7 +53,7 @@ class ObjectType(six.with_metaclass(ObjectTypeMeta)): is_type_of = None def __init__(self, *args, **kwargs): - # GraphQL ObjectType acting as container + # ObjectType acting as container args_len = len(args) fields = self._meta.fields.items() if args_len > len(fields): diff --git a/graphene/types/schema.py b/graphene/types/schema.py index 6145d4e5..2df58039 100644 --- a/graphene/types/schema.py +++ b/graphene/types/schema.py @@ -42,15 +42,7 @@ class Schema(GraphQLSchema): ) self._directives = directives - initial_types = [ - query, - mutation, - subscription, - IntrospectionSchema - ] - if types: - initial_types += types - self._type_map = TypeMap(initial_types) + self.build_typemap() def get_query_type(self): return self.get_graphql_type(self._query) @@ -97,18 +89,13 @@ class Schema(GraphQLSchema): def lazy(self, _type): return lambda: self.get_type(_type) - # def rebuild(self): - # self._possible_type_map = defaultdict(set) - # self._type_map = self._build_type_map(self.types) - # # Keep track of all implementations by interface name. - # self._implementations = defaultdict(list) - # for type in self._type_map.values(): - # if isinstance(type, GraphQLObjectType): - # for interface in type.get_interfaces(): - # self._implementations[interface.name].append(type) - - # # Enforce correct interface implementations. - # for type in self._type_map.values(): - # if isinstance(type, GraphQLObjectType): - # for interface in type.get_interfaces(): - # assert_object_implements_interface(self, type, interface) + def build_typemap(self): + initial_types = [ + self._query, + self._mutation, + self._subscription, + IntrospectionSchema + ] + if self.types: + initial_types += self.types + self._type_map = TypeMap(initial_types) diff --git a/graphene/types/unmountedtype.py b/graphene/types/unmountedtype.py index ac813e8e..2835e543 100644 --- a/graphene/types/unmountedtype.py +++ b/graphene/types/unmountedtype.py @@ -23,7 +23,7 @@ class UnmountedType(OrderedType): def get_type(self): raise NotImplementedError("get_type not implemented in {}".format(self)) - def as_field(self): + def Field(self): ''' Mount the UnmountedType as Field ''' @@ -35,7 +35,7 @@ class UnmountedType(OrderedType): **self.kwargs ) - def as_inputfield(self): + def InputField(self): ''' Mount the UnmountedType as InputField ''' @@ -47,7 +47,7 @@ class UnmountedType(OrderedType): **self.kwargs ) - def as_argument(self): + def Argument(self): ''' Mount the UnmountedType as Argument ''' diff --git a/graphene/types/utils.py b/graphene/types/utils.py index 63a4dfc8..1d9069bb 100644 --- a/graphene/types/utils.py +++ b/graphene/types/utils.py @@ -33,12 +33,12 @@ def unmounted_field_in_type(attname, unmounted_field, type): from ..types.inputobjecttype import InputObjectType if issubclass(type, (ObjectType, Interface)): - return unmounted_field.as_field() + return unmounted_field.Field() elif issubclass(type, (AbstractType)): return unmounted_field elif issubclass(type, (InputObjectType)): - return unmounted_field.as_inputfield() + return unmounted_field.InputField() raise Exception( 'Unmounted field "{}" cannot be mounted in {}.{}.'.format(