From c25bcb334573504a7e42143bfbb4a175307c79ef Mon Sep 17 00:00:00 2001 From: Jonathan Kim Date: Sat, 17 Feb 2018 21:50:40 +0000 Subject: [PATCH] Move NonNull check --- graphene/relay/connection.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/graphene/relay/connection.py b/graphene/relay/connection.py index 1ea672fb..bcd238d3 100644 --- a/graphene/relay/connection.py +++ b/graphene/relay/connection.py @@ -115,9 +115,6 @@ class IterableConnectionField(Field): @classmethod def resolve_connection(cls, connection_type, args, resolved): - if isinstance(connection_type, NonNull): - connection_type = connection_type.of_type - if isinstance(resolved, connection_type): return resolved @@ -139,6 +136,9 @@ class IterableConnectionField(Field): def connection_resolver(cls, resolver, connection_type, root, info, **args): resolved = resolver(root, info, **args) + if isinstance(connection_type, NonNull): + connection_type = connection_type.of_type + on_resolve = partial(cls.resolve_connection, connection_type, args) if is_thenable(resolved): return Promise.resolve(resolved).then(on_resolve)