Refactor and move stuff around.

Author: jhgg

epoxy/bases/class_type_creator.py

@@ -1,4 +1,4 @@
-from ..thunk import ResolveThunk, ThunkList
+from ..utils.thunk import ResolveThunk, ThunkList
 
 
 class ClassTypeCreator(object):

epoxy/contrib/relay/connections/__init__.py

@@ -1,6 +1,6 @@
 from graphql.core.type import GraphQLInt, GraphQLString
 
-from ....argument import Argument
+from ....types.argument import Argument
 
 __author__ = 'jake'
 

epoxy/metaclasses/input_type.py

@@ -1,7 +1,9 @@
 from collections import OrderedDict
 from functools import partial
+
 from graphql.core.type.definition import GraphQLInputObjectType
-from ..field import InputField
+
+from ..types.field import InputField
 from ..utils.get_declared_fields import get_declared_fields
 from ..utils.weak_ref_holder import WeakRefHolder
 from ..utils.yank_potential_fields import yank_potential_fields

epoxy/registry.py

@@ -23,17 +23,18 @@
 from .bases.mutation import MutationBase
 from .bases.object_type import ObjectTypeBase
 from .bases.scalar import ScalarBase
-from .field import Field, InputField
 from .metaclasses.input_type import InputTypeMeta
 from .metaclasses.interface import InterfaceMeta
 from .metaclasses.mutation import MutationMeta
 from .metaclasses.object_type import ObjectTypeMeta
 from .metaclasses.scalar import ScalarMeta
 from .metaclasses.union import UnionMeta
-from .thunk import AttributeTypeThunk, RootTypeThunk, ThunkList, TransformThunkList
+from .types.argument import Argument
+from .types.field import Field, InputField
 from .utils.enum_to_graphql_enum import enum_to_graphql_enum
 from .utils.maybe_t import maybe_t
 from .utils.method_dispatch import method_dispatch
+from .utils.thunk import AttributeTypeThunk, RootTypeThunk, ThunkList, TransformThunkList
 
 builtin_scalars = [
     GraphQLBoolean,
@@ -49,15 +50,16 @@ class TypeRegistry(object):
         # Types
         'ObjectType', 'InputType', 'Union' 'Interface', 'Implements', 'Scalar'
         # Functions
-        'Schema', 'Register', 'Mixin',
+                                                                      'Schema', 'Register', 'Mixin',
         # Mutations
         'Mutation', 'Mutations',
         # Fields
-        'Field', 'InputField',
+        'Field', 'InputField', 'Argument'
     ])
 
     Field = Field
     InputField = InputField
+    Argument = Argument
 
     def __init__(self):
         self._registered_types = OrderedDict()

epoxy/types/__init__.py

@@ -0,0 +1,8 @@
+from .argument import Argument
+from .field import Field, InputField
+
+__all__ = [
+    'Argument',
+    'Field',
+    'InputField'
+]

epoxy/argument.py renamed to epoxy/types/argument.py

@@ -1,5 +1,5 @@
 from graphql.core.type import GraphQLArgument
-from .utils.gen_id import gen_id
+from ..utils.gen_id import gen_id
 
 
 class Argument(object):

epoxy/field.py renamed to epoxy/types/field.py

@@ -2,10 +2,10 @@
 
 from graphql.core.type import GraphQLField, GraphQLInputObjectField
 
-from .argument import Argument
-from .thunk import TypeThunk
-from .utils.gen_id import gen_id
-from .utils.to_camel_case import to_camel_case
+from ..types.argument import Argument
+from ..utils.gen_id import gen_id
+from ..utils.thunk import TypeThunk
+from ..utils.to_camel_case import to_camel_case
 
 
 class Field(object):

epoxy/utils/get_declared_fields.py

@@ -1,10 +1,11 @@
 import copy
-from ..field import Field
-from ..thunk import TypeThunk
-from ..utils.first_of import first_of
-from ..utils.maybe_callable import maybe_callable
-from ..utils.maybe_t import maybe_t
-from ..utils.to_camel_case import to_camel_case
+
+from ..types import Field
+from .first_of import first_of
+from .maybe_callable import maybe_callable
+from .maybe_t import maybe_t
+from .thunk import TypeThunk
+from .to_camel_case import to_camel_case
 
 
 def get_declared_fields(type_name, attrs, field_class=Field):

epoxy/thunk.py renamed to epoxy/utils/thunk.py

@@ -1,7 +1,7 @@
 import copy
 from graphql.core.type.definition import GraphQLList, GraphQLNonNull
-from .utils.gen_id import gen_id
-from .utils.maybe_callable import maybe_callable
+from .gen_id import gen_id
+from .maybe_callable import maybe_callable
 
 
 def clone_with_kwargs(thunk, kwargs):

epoxy/utils/yank_potential_fields.py

@@ -1,5 +1,5 @@
-from ..field import Field
-from ..thunk import TypeThunk
+from ..types.field import Field
+from .thunk import TypeThunk
 
 
 def yank_potential_fields(attrs, field_class=Field):

tests/test_arguments.py

@@ -1,7 +1,9 @@
 from collections import OrderedDict
+
 from graphql.core.type import GraphQLString, GraphQLInt, GraphQLID, GraphQLNonNull
-from epoxy.argument import Argument
+
 from epoxy.registry import TypeRegistry
+from epoxy.types.argument import Argument
 
 make_args = lambda R: {
     'a': R.Int,