From 842d11515efe24901869431c5795a705214793ea Mon Sep 17 00:00:00 2001 From: Syrus Akbary Date: Thu, 5 Nov 2015 00:14:03 -0800 Subject: [PATCH] Changed from field_name to attname for field attribute name --- graphene/contrib/django/fields.py | 4 ++-- graphene/contrib/django/types.py | 2 +- graphene/core/fields.py | 12 ++++++------ graphene/core/options.py | 2 +- graphene/core/types.py | 14 +++++++------- tests/core/test_options.py | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/graphene/contrib/django/fields.py b/graphene/contrib/django/fields.py index 6ee0da4a..3abbfa94 100644 --- a/graphene/contrib/django/fields.py +++ b/graphene/contrib/django/fields.py @@ -44,7 +44,7 @@ class DjangoModelField(Field): _type = self.get_object_type(schema) assert _type, ("Field %s cannot be retrieved as the " "ObjectType is not registered by the schema" % ( - self.field_name + self.attname )) return _type(resolved) @@ -57,7 +57,7 @@ class DjangoModelField(Field): "using @schema.register. " "Or disable the field %s in %s" % ( self.model, - self.field_name, + self.attname, self.object_type ) ) diff --git a/graphene/contrib/django/types.py b/graphene/contrib/django/types.py index b787f69b..f9282f14 100644 --- a/graphene/contrib/django/types.py +++ b/graphene/contrib/django/types.py @@ -22,7 +22,7 @@ class DjangoObjectTypeMeta(ObjectTypeMeta): all_fields = sorted(list(cls._meta.model._meta.fields) + list(cls._meta.model._meta.local_many_to_many)) all_fields += list(reverse_fields) - already_created_fields = {f.field_name for f in cls._meta.local_fields} + already_created_fields = {f.attname for f in cls._meta.local_fields} for field in all_fields: is_not_in_only = only_fields and field.name not in only_fields diff --git a/graphene/core/fields.py b/graphene/core/fields.py index 8d51cda7..b1984db4 100644 --- a/graphene/core/fields.py +++ b/graphene/core/fields.py @@ -48,7 +48,7 @@ class Field(object): def contribute_to_class(self, cls, name, add=True): if not self.name: self.name = to_camel_case(name) - self.field_name = name + self.attname = name self.object_type = cls if isinstance(self.field_type, Field) and not self.field_type.object_type: self.field_type.contribute_to_class(cls, name, False) @@ -61,7 +61,7 @@ class Field(object): if resolve_fn: return resolve_fn(instance, ProxySnakeDict(args), info) else: - return getattr(instance, self.field_name, self.get_default()) + return getattr(instance, self.attname, self.get_default()) def get_resolve_fn(self, schema): object_type = self.get_object_type(schema) @@ -70,7 +70,7 @@ class Field(object): elif self.resolve_fn: return self.resolve_fn else: - custom_resolve_fn_name = 'resolve_%s' % self.field_name + custom_resolve_fn_name = 'resolve_%s' % self.attname if hasattr(self.object_type, custom_resolve_fn_name): resolve_fn = getattr(self.object_type, custom_resolve_fn_name) @@ -128,7 +128,7 @@ class Field(object): if extra_args != {}: raise TypeError("Field %s.%s initiated with invalid args: %s" % ( self.object_type, - self.field_name, + self.attname, ','.join(extra_args.keys()) )) @@ -169,14 +169,14 @@ class Field(object): def __str__(self): """ Return "object_type.name". """ - return '%s.%s' % (self.object_type.__name__, self.field_name) + return '%s.%s' % (self.object_type.__name__, self.attname) def __repr__(self): """ Displays the module, class and name of the field. """ path = '%s.%s' % (self.__class__.__module__, self.__class__.__name__) - name = getattr(self, 'field_name', None) + name = getattr(self, 'attname', None) if name is not None: return '<%s: %s>' % (path, name) return '<%s>' % path diff --git a/graphene/core/options.py b/graphene/core/options.py index 132d61ce..8e12abb4 100644 --- a/graphene/core/options.py +++ b/graphene/core/options.py @@ -67,4 +67,4 @@ class Options(object): @cached_property def fields_map(self): - return OrderedDict([(f.field_name, f) for f in self.fields]) + return OrderedDict([(f.attname, f) for f in self.fields]) diff --git a/graphene/core/types.py b/graphene/core/types.py index d0befcc4..2341c0fc 100644 --- a/graphene/core/types.py +++ b/graphene/core/types.py @@ -99,7 +99,7 @@ class ObjectTypeMeta(type): field_names[field.name].__class__) ) new_field = copy.copy(field) - new_class.add_to_class(field.field_name, new_field) + new_class.add_to_class(field.attname, new_field) new_class._meta.parents.append(base) if base._meta.is_interface: @@ -143,16 +143,16 @@ class BaseObjectType(object): if not kwargs: for val, field in zip(args, fields_iter): - setattr(self, field.field_name, val) + setattr(self, field.attname, val) else: for val, field in zip(args, fields_iter): - setattr(self, field.field_name, val) - kwargs.pop(field.field_name, None) + setattr(self, field.attname, val) + kwargs.pop(field.attname, None) for field in fields_iter: try: - val = kwargs.pop(field.field_name) - setattr(self, field.field_name, val) + val = kwargs.pop(field.attname) + setattr(self, field.attname, val) except KeyError: pass @@ -171,7 +171,7 @@ class BaseObjectType(object): @classmethod def fields_as_arguments(cls, schema): - return OrderedDict([(f.field_name, GraphQLArgument(f.internal_type(schema))) + return OrderedDict([(f.attname, GraphQLArgument(f.internal_type(schema))) for f in cls._meta.fields]) @classmethod diff --git a/tests/core/test_options.py b/tests/core/test_options.py index 04586afe..0673c289 100644 --- a/tests/core/test_options.py +++ b/tests/core/test_options.py @@ -23,7 +23,7 @@ def test_field_added_in_meta(): opt.contribute_to_class(ObjectType, '_meta') f = StringField() - f.field_name = 'string_field' + f.attname = 'string_field' opt.add_field(f) assert f in opt.fields