Skip to content

Remove usages of deprecated field.rel #245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 1, 2017
Merged

Remove usages of deprecated field.rel #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0df510
Remove usages of deprecated field.rel
edmorley Aug 14, 2017
a4cc360
Merge branch 'master' into fix-deprecation-warnings
syrusakbary Aug 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions graphene_django/converter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

from .compat import ArrayField, HStoreField, JSONField, RangeField
from .fields import DjangoListField, DjangoConnectionField
from .utils import get_related_model, import_single_dispatch
from .utils import import_single_dispatch

singledispatch = import_single_dispatch()

Expand Down Expand Up @@ -125,7 +125,7 @@ def convert_time_to_string(field, registry=None):

@convert_django_field.register(models.OneToOneRel)
def convert_onetoone_field_to_djangomodel(field, registry=None):
model = get_related_model(field)
model = field.related_model

def dynamic_type():
_type = registry.get_type_for_model(model)
Expand All @@ -144,7 +144,7 @@ def dynamic_type():
@convert_django_field.register(models.ManyToManyRel)
@convert_django_field.register(models.ManyToOneRel)
def convert_field_to_list_or_connection(field, registry=None):
model = get_related_model(field)
model = field.related_model

def dynamic_type():
_type = registry.get_type_for_model(model)
Expand All @@ -170,7 +170,7 @@ def dynamic_type():
@convert_django_field.register(models.OneToOneField)
@convert_django_field.register(models.ForeignKey)
def convert_field_to_djangomodel(field, registry=None):
model = get_related_model(field)
model = field.related_model

def dynamic_type():
_type = registry.get_type_for_model(model)
Expand Down
7 changes: 0 additions & 7 deletions graphene_django/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,6 @@ def get_model_fields(model):
return all_fields


def get_related_model(field):
if hasattr(field, 'rel'):
# Django 1.6, 1.7
return field.rel.to
return field.related_model


def is_valid_django_model(model):
return inspect.isclass(model) and issubclass(model, models.Model)

Expand Down