From 689db2c70ebfe8a06abda3571378303e8ff04fac Mon Sep 17 00:00:00 2001 From: Syrus Akbary Date: Fri, 11 Dec 2015 11:03:49 -0800 Subject: [PATCH] Fixed incompatible syntax in Python 2.7 --- graphene/contrib/django/types.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/graphene/contrib/django/types.py b/graphene/contrib/django/types.py index e25130df..d8fc1b86 100644 --- a/graphene/contrib/django/types.py +++ b/graphene/contrib/django/types.py @@ -102,13 +102,13 @@ class DjangoConnection(Connection): return super(DjangoConnection, cls).from_list(iterable, *args, **kwargs) -django_node_meta_bases = (DjangoObjectTypeMeta, NodeMeta) +django_filter_metabase = type # Only include filter functionality if available if DJANGO_FILTER_INSTALLED: - django_node_meta_bases = (DjangoFilterObjectTypeMeta,) + django_node_meta_bases + django_filter_metabase = DjangoFilterObjectTypeMeta -class DjangoNodeMeta(*django_node_meta_bases): +class DjangoNodeMeta(django_filter_metabase, DjangoObjectTypeMeta, NodeMeta): pass