From 629abd054225b60b8cfd441dfcf4421c5c68ff56 Mon Sep 17 00:00:00 2001 From: Jacob Foster Date: Wed, 19 Jul 2017 23:25:59 -0500 Subject: [PATCH] Django 1.8 and 1.9 compatability --- graphene_django/optimization.py | 7 ++++++- graphene_django/types.py | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/graphene_django/optimization.py b/graphene_django/optimization.py index 7ae2c93..21c3bca 100644 --- a/graphene_django/optimization.py +++ b/graphene_django/optimization.py @@ -1,7 +1,12 @@ from collections import namedtuple +try: + from django.db.models.fields.reverse_related import ForeignObjectRel +except ImportError: + # Django 1.7 doesn't have the reverse_related distinction + from django.db.models.fields.related import ForeignObjectRel + from django.db.models import ForeignKey -from django.db.models.fields.reverse_related import ForeignObjectRel from graphene.utils.str_converters import to_snake_case from .registry import get_global_registry diff --git a/graphene_django/types.py b/graphene_django/types.py index d45b9f4..970e6fa 100644 --- a/graphene_django/types.py +++ b/graphene_django/types.py @@ -120,7 +120,7 @@ class DjangoObjectType(six.with_metaclass(DjangoObjectTypeMeta, ObjectType)): @classmethod def get_node(cls, id, context, info): - query = cls._meta.model._meta.default_manager + query = cls._meta.model._default_manager query = optimize_queryset(query, info) try: return query.get(pk=id)