Merge pull request #39 from juyrjola/master

Fix compatibility with newer django-graphene

dev-env-requirements.txt

@@ -1,6 +1,6 @@
 -r requirements.txt
-graphene==2.1.3
-graphene-django==2.2.0
+graphene==2.1.8
+graphene-django==2.7.1
 pytest==4.6.3
 pytest-django==3.5.0
 pytest-cov==2.7.1

graphene_django_optimizer/query.py

@@ -271,7 +271,15 @@ def _get_name_from_resolver(self, resolver):
         elif isinstance(resolver, functools.partial):
             resolver_fn = resolver
             if resolver_fn.func != default_resolver:
-                resolver_fn = resolver_fn.args[0]
+                # Some resolvers have the partial function as the second
+                # argument.
+                for arg in resolver_fn.args:
+                    if isinstance(arg, (str, functools.partial)):
+                        break
+                else:
+                    # No suitable instances found, default to first arg
+                    arg = resolver_fn.args[0]
+                resolver_fn = arg
             if isinstance(resolver_fn, functools.partial) and resolver_fn.func == default_resolver:
                 return resolver_fn.args[0]
             return resolver_fn