Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Remove apps.get_model fallback
* Corrects presumed logic error in `ResolveModelWithPatchedDjangoTests`
  • Loading branch information
Carlton Gibson committed Sep 22, 2015
commit 6e86a53c922f09785869e022a7ccf51928a55382
8 changes: 0 additions & 8 deletions rest_framework/compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,6 @@ def distinct(queryset, base):
postgres_fields = None


# Apps only exists from 1.7 onwards.
try:
from django.apps import apps
get_model = apps.get_model
except ImportError:
from django.db.models import get_model


# django-filter is optional
try:
import django_filters
Expand Down
5 changes: 3 additions & 2 deletions rest_framework/utils/model_meta.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@
import inspect
from collections import namedtuple

from django.apps import apps
from django.core.exceptions import ImproperlyConfigured
from django.db import models
from django.utils import six

from rest_framework.compat import OrderedDict, get_model
from rest_framework.compat import OrderedDict

FieldInfo = namedtuple('FieldResult', [
'pk', # Model field instance
Expand Down Expand Up @@ -45,7 +46,7 @@ def _resolve_model(obj):
"""
if isinstance(obj, six.string_types) and len(obj.split('.')) == 2:
app_name, model_name = obj.split('.')
resolved_model = get_model(app_name, model_name)
resolved_model = apps.get_model(app_name, model_name)
if resolved_model is None:
msg = "Django did not return a model for {0}.{1}"
raise ImproperlyConfigured(msg.format(app_name, model_name))
Expand Down
6 changes: 3 additions & 3 deletions tests/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,16 +150,16 @@ class ResolveModelWithPatchedDjangoTests(TestCase):

def setUp(self):
"""Monkeypatch get_model."""
self.get_model = rest_framework.utils.model_meta.get_model
self.get_model = rest_framework.utils.model_meta.apps.get_model

def get_model(app_label, model_name):
return None

rest_framework.utils.model_meta.get_model = get_model
rest_framework.utils.model_meta.apps.get_model = get_model

def tearDown(self):
"""Revert monkeypatching."""
rest_framework.utils.model_meta.models.get_model = self.get_model
rest_framework.utils.model_meta.apps.get_model = self.get_model

def test_blows_up_if_model_does_not_resolve(self):
with self.assertRaises(ImproperlyConfigured):
Expand Down