graphql-python/graphene
1
1
Fork 0
mirror of https://github.com/graphql-python/graphene.git synced 2024-11-29 13:03:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/master' into 1.0

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
graphene/contrib/django/__init__.py
View File

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

1
graphene/contrib/django/options.py
View File

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

11
graphene/relay/__init__.py
View File

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