Improved classtypes core support

Author: syrusakbary

graphene/__init__.py

@@ -8,11 +8,15 @@
     Schema
 )
 
-from graphene.core.types import (
+from graphene.core.classtypes import (
     ObjectType,
     InputObjectType,
     Interface,
     Mutation,
+    Scalar
+)
+
+from graphene.core.types import (
     BaseType,
     LazyType,
     Argument,
@@ -59,6 +63,7 @@
     'InputObjectType',
     'Interface',
     'Mutation',
+    'Scalar',
     'Field',
     'InputField',
     'StringField',

graphene/core/classtypes/__init__.py

@@ -0,0 +1,16 @@
+from .inputobjecttype import InputObjectType
+from .interface import Interface
+from .mutation import Mutation
+from .objecttype import ObjectType
+from .options import Options
+from .scalar import Scalar
+from .uniontype import UnionType
+
+__all__ = [
+    'InputObjectType',
+    'Interface',
+    'Mutation',
+    'ObjectType',
+    'Options',
+    'Scalar',
+    'UnionType']

graphene/core/options.py

@@ -11,7 +11,6 @@
 from graphene import signals
 
 from .types.base import BaseType
-from .types.objecttype import BaseObjectType
 from .classtypes.base import ClassType
 
 
@@ -49,7 +48,7 @@ def T(self, object_type):
                 internal_type = object_type.internal_type(self)
                 self._types[object_type] = internal_type
                 is_objecttype = inspect.isclass(
-                    object_type) and issubclass(object_type, BaseObjectType)
+                    object_type) and issubclass(object_type, ClassType)
                 if is_objecttype:
                     self.register(object_type)
             return self._types[object_type]
@@ -91,7 +90,7 @@ def objecttype(self, type):
         if name:
             objecttype = self._types_names.get(name, None)
             if objecttype and inspect.isclass(
-                    objecttype) and issubclass(objecttype, BaseObjectType):
+                    objecttype) and issubclass(objecttype, ClassType):
                 return objecttype
 
     def __str__(self):

graphene/core/schema.py

@@ -1,7 +1,9 @@
 from .base import BaseType, LazyType, OrderedType
 from .argument import Argument, ArgumentsGroup, to_arguments
 from .definitions import List, NonNull
-from .objecttype import ObjectTypeMeta, BaseObjectType, Interface, ObjectType, Mutation, InputObjectType
+# Compatibility import
+from .objecttype import Interface, ObjectType, Mutation, InputObjectType
+
 from .scalars import String, ID, Boolean, Int, Float, Scalar
 from .field import Field, InputField
 
@@ -17,8 +19,6 @@
     'Field',
     'InputField',
     'Interface',
-    'BaseObjectType',
-    'ObjectTypeMeta',
     'ObjectType',
     'Mutation',
     'InputObjectType',

graphene/core/types/__init__.py

@@ -2,9 +2,6 @@
 
 import six
 
-from ..classtypes.base import FieldsClassType
-from ..classtypes.inputobjecttype import InputObjectType as NewInputObjectType
-
 
 class BaseType(object):
 
@@ -107,11 +104,12 @@ def as_argument(self):
 class FieldType(MirroredType):
 
     def contribute_to_class(self, cls, name):
-        from ..types import BaseObjectType, InputObjectType
-        if issubclass(cls, (InputObjectType, NewInputObjectType)):
+        from ..classtypes.base import FieldsClassType
+        from ..classtypes.inputobjecttype import InputObjectType
+        if issubclass(cls, (InputObjectType)):
             inputfield = self.as_inputfield()
             return inputfield.contribute_to_class(cls, name)
-        elif issubclass(cls, (BaseObjectType, FieldsClassType)):
+        elif issubclass(cls, (FieldsClassType)):
             field = self.as_field()
             return field.contribute_to_class(cls, name)
 

graphene/core/types/base.py

@@ -6,8 +6,8 @@
 
 from ...utils import to_camel_case
 from ..classtypes.base import FieldsClassType
-from ..classtypes.inputobjecttype import InputObjectType as NewInputObjectType
-from ..types import BaseObjectType, InputObjectType
+from ..classtypes.mutation import Mutation
+from ..classtypes.inputobjecttype import InputObjectType
 from .argument import ArgumentsGroup, snake_case_args
 from .base import LazyType, MountType, OrderedType
 from .definitions import NonNull
@@ -34,7 +34,7 @@ def __init__(
 
     def contribute_to_class(self, cls, attname):
         assert issubclass(
-            cls, (BaseObjectType, FieldsClassType)), 'Field {} cannot be mounted in {}'.format(
+            cls, (FieldsClassType)), 'Field {} cannot be mounted in {}'.format(
             self, cls)
         if not self.name:
             self.name = to_camel_case(attname)
@@ -71,7 +71,7 @@ def internal_type(self, schema):
             description = resolver.__doc__
         type = schema.T(self.get_type(schema))
         type_objecttype = schema.objecttype(type)
-        if type_objecttype and type_objecttype._meta.is_mutation:
+        if type_objecttype and issubclass(type_objecttype, Mutation):
             assert len(arguments) == 0
             arguments = type_objecttype.get_arguments()
             resolver = getattr(type_objecttype, 'mutate')
@@ -128,7 +128,7 @@ def __init__(self, type, description=None, default=None,
 
     def contribute_to_class(self, cls, attname):
         assert issubclass(
-            cls, (InputObjectType, NewInputObjectType)), 'InputField {} cannot be mounted in {}'.format(
+            cls, (InputObjectType)), 'InputField {} cannot be mounted in {}'.format(
             self, cls)
         if not self.name:
             self.name = to_camel_case(attname)