Skip to content

Commit b0df510

Browse files
committed
Remove usages of deprecated field.rel
Since they were only required for Django <1.8 and cause the following deprecation warnings: ``` utils.py:61: RemovedInDjango20Warning: Usage of field.rel has been deprecated. Use field.remote_field instead. if hasattr(field, 'rel'): utils.py:63: RemovedInDjango20Warning: Usage of ForeignObjectRel.to attribute has been deprecated. Use the model attribute instead. return field.rel.to ``` Fixes #242.
1 parent 2929d08 commit b0df510

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

graphene_django/converter.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
from .compat import ArrayField, HStoreField, JSONField, RangeField
1313
from .fields import get_connection_field, DjangoListField
14-
from .utils import get_related_model, import_single_dispatch
14+
from .utils import import_single_dispatch
1515

1616
singledispatch = import_single_dispatch()
1717

@@ -122,7 +122,7 @@ def convert_time_to_string(field, registry=None):
122122

123123
@convert_django_field.register(models.OneToOneRel)
124124
def convert_onetoone_field_to_djangomodel(field, registry=None):
125-
model = get_related_model(field)
125+
model = field.related_model
126126

127127
def dynamic_type():
128128
_type = registry.get_type_for_model(model)
@@ -141,7 +141,7 @@ def dynamic_type():
141141
@convert_django_field.register(models.ManyToManyRel)
142142
@convert_django_field.register(models.ManyToOneRel)
143143
def convert_field_to_list_or_connection(field, registry=None):
144-
model = get_related_model(field)
144+
model = field.related_model
145145

146146
def dynamic_type():
147147
_type = registry.get_type_for_model(model)
@@ -159,7 +159,7 @@ def dynamic_type():
159159
@convert_django_field.register(models.OneToOneField)
160160
@convert_django_field.register(models.ForeignKey)
161161
def convert_field_to_djangomodel(field, registry=None):
162-
model = get_related_model(field)
162+
model = field.related_model
163163

164164
def dynamic_type():
165165
_type = registry.get_type_for_model(model)

graphene_django/utils.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,6 @@ def get_model_fields(model):
5656
return all_fields
5757

5858

59-
def get_related_model(field):
60-
if hasattr(field, 'rel'):
61-
# Django 1.6, 1.7
62-
return field.rel.to
63-
return field.related_model
64-
65-
6659
def is_valid_django_model(model):
6760
return inspect.isclass(model) and issubclass(model, models.Model)
6861

0 commit comments

Comments
 (0)