From 818b9109917453ccddf8977f4f3908c2017742a8 Mon Sep 17 00:00:00 2001 From: Adam Charnock Date: Fri, 4 Dec 2015 15:46:48 +0000 Subject: [PATCH] Now supports django 1.9 --- graphene/contrib/django/tests/test_converter.py | 5 ++++- graphene/contrib/django/utils.py | 4 +++- setup.py | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/graphene/contrib/django/tests/test_converter.py b/graphene/contrib/django/tests/test_converter.py index d868ec97..d9f2ea26 100644 --- a/graphene/contrib/django/tests/test_converter.py +++ b/graphene/contrib/django/tests/test_converter.py @@ -94,7 +94,10 @@ def test_should_manytomany_convert_connectionorlist(): def test_should_manytoone_convert_connectionorlist(): - graphene_type = convert_django_field(Reporter.articles.related) + # Django 1.9 uses 'rel', <1.9 uses 'related + related = getattr(Reporter.articles, 'rel', None) or \ + getattr(Reporter.articles, 'related') + graphene_type = convert_django_field(related) assert isinstance(graphene_type, ConnectionOrListField) assert isinstance(graphene_type.type, DjangoModelField) assert graphene_type.type.model == Article diff --git a/graphene/contrib/django/utils.py b/graphene/contrib/django/utils.py index 2b4519fc..2b1ec6aa 100644 --- a/graphene/contrib/django/utils.py +++ b/graphene/contrib/django/utils.py @@ -18,7 +18,9 @@ def get_type_for_model(schema, model): def get_reverse_fields(model): for name, attr in model.__dict__.items(): - related = getattr(attr, 'related', None) + # Django =>1.9 uses 'rel', django <1.9 uses 'related' + related = getattr(attr, 'rel', None) or \ + getattr(attr, 'related', None) if isinstance(related, models.ManyToOneRel): yield related diff --git a/setup.py b/setup.py index 8b2c324c..c40a4c35 100644 --- a/setup.py +++ b/setup.py @@ -66,7 +66,7 @@ setup( ], extras_require={ 'django': [ - 'Django>=1.6.0,<1.9', + 'Django>=1.6.0', 'singledispatch>=3.4.0.3', 'graphql-django-view>=1.0.0', ],