Simplified instance field getter

Author: syrusakbary

graphene/core/fields.py

@@ -55,12 +55,7 @@ def resolve(self, instance, args, info):
         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):

graphene/core/types.py

@@ -120,7 +120,7 @@ def __new__(cls, instance=None, **kwargs):
             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 @@ def __getattr__(self, name):
         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