mirror of
https://github.com/encode/django-rest-framework.git
synced 2025-02-09 16:10:50 +03:00
Fix get_model import
This commit is contained in:
parent
f691006f2c
commit
4f27697467
|
@ -82,6 +82,14 @@ except ImportError:
|
||||||
postgres_fields = None
|
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
|
# django-filter is optional
|
||||||
try:
|
try:
|
||||||
import django_filters
|
import django_filters
|
||||||
|
|
|
@ -12,7 +12,7 @@ from django.core.exceptions import ImproperlyConfigured
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.utils import six
|
from django.utils import six
|
||||||
|
|
||||||
from rest_framework.compat import OrderedDict
|
from rest_framework.compat import OrderedDict, get_model
|
||||||
|
|
||||||
FieldInfo = namedtuple('FieldResult', [
|
FieldInfo = namedtuple('FieldResult', [
|
||||||
'pk', # Model field instance
|
'pk', # Model field instance
|
||||||
|
@ -45,7 +45,7 @@ def _resolve_model(obj):
|
||||||
"""
|
"""
|
||||||
if isinstance(obj, six.string_types) and len(obj.split('.')) == 2:
|
if isinstance(obj, six.string_types) and len(obj.split('.')) == 2:
|
||||||
app_name, model_name = obj.split('.')
|
app_name, model_name = obj.split('.')
|
||||||
resolved_model = models.get_model(app_name, model_name)
|
resolved_model = get_model(app_name, model_name)
|
||||||
if resolved_model is None:
|
if resolved_model is None:
|
||||||
msg = "Django did not return a model for {0}.{1}"
|
msg = "Django did not return a model for {0}.{1}"
|
||||||
raise ImproperlyConfigured(msg.format(app_name, model_name))
|
raise ImproperlyConfigured(msg.format(app_name, model_name))
|
||||||
|
|
|
@ -150,12 +150,12 @@ class ResolveModelWithPatchedDjangoTests(TestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
"""Monkeypatch get_model."""
|
"""Monkeypatch get_model."""
|
||||||
self.get_model = rest_framework.utils.model_meta.models.get_model
|
self.get_model = rest_framework.utils.model_meta.get_model
|
||||||
|
|
||||||
def get_model(app_label, model_name):
|
def get_model(app_label, model_name):
|
||||||
return None
|
return None
|
||||||
|
|
||||||
rest_framework.utils.model_meta.models.get_model = get_model
|
rest_framework.utils.model_meta.get_model = get_model
|
||||||
|
|
||||||
def tearDown(self):
|
def tearDown(self):
|
||||||
"""Revert monkeypatching."""
|
"""Revert monkeypatching."""
|
||||||
|
|
Loading…
Reference in New Issue
Block a user