Simplified instance field getter

This commit is contained in:
Syrus Akbary 2015-10-25 16:35:22 -07:00
parent b3dad1a120
commit 23ef63e60e
2 changed files with 2 additions and 10 deletions

View File

@ -55,12 +55,7 @@ class Field(object):
if resolve_fn:
return resolve_fn(instance, args, info)
else:
if isinstance(instance, BaseObjectType):
return instance.get_field(self.field_name)
if hasattr(instance, self.field_name):
return getattr(instance, self.field_name)
elif hasattr(instance, self.name):
return getattr(instance, self.name)
return getattr(instance, self.field_name, None)
@memoize
def get_resolve_fn(self):

View File

@ -120,7 +120,7 @@ class BaseObjectType(object):
if not kwargs:
return None
elif type(instance) is cls:
instance = instance.instance
return instance
return super(BaseObjectType, cls).__new__(cls)
@ -137,9 +137,6 @@ class BaseObjectType(object):
if self.instance:
return getattr(self.instance, name)
def get_field(self, field):
return getattr(self.instance, field, None)
@classmethod
def resolve_objecttype(cls, schema, instance, *_):
return instance