Merge branch 'refs/heads/master' into 1.0

This commit is contained in:
Syrus Akbary 2015-10-25 20:02:24 -07:00
commit 842103d8f7
3 changed files with 10 additions and 5 deletions

View File

@ -7,3 +7,6 @@ from graphene.contrib.django.fields import (
DjangoConnectionField,
DjangoModelField
)
__all__ = ['DjangoObjectType', 'DjangoInterface', 'DjangoNode',
'DjangoConnectionField', 'DjangoModelField']

View File

@ -2,7 +2,6 @@ import inspect
from django.db import models
from graphene.core.options import Options
from graphene.core.types import BaseObjectType
from graphene.relay.utils import is_node
from graphene.relay.types import Node

View File

@ -5,10 +5,13 @@ from graphene.relay.fields import (
)
from graphene.relay.types import (
Node,
PageInfo,
Edge,
Connection
Node,
PageInfo,
Edge,
Connection
)
from graphene.relay.utils import is_node
__all__ = ['ConnectionField', 'NodeField', 'GlobalIDField', 'Node',
'PageInfo', 'Edge', 'Connection', 'is_node']