Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit06e2ad0

Browse files
jdufresnelovelydinosaur
authored andcommitted
Remove unused compat._resolve_model() (#5733)
Last use removed inc674687.
1 parent522d453 commit06e2ad0

File tree

2 files changed

+0
-91
lines changed

2 files changed

+0
-91
lines changed

‎rest_framework/compat.py‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,9 @@
55

66
from __future__importunicode_literals
77

8-
importinspect
9-
108
importdjango
11-
fromdjango.appsimportapps
129
fromdjango.confimportsettings
1310
fromdjango.coreimportvalidators
14-
fromdjango.core.exceptionsimportImproperlyConfigured
15-
fromdjango.dbimportmodels
1611
fromdjango.utilsimportsix
1712
fromdjango.views.genericimportView
1813

@@ -107,30 +102,6 @@ def distinct(queryset, base):
107102
returnqueryset.distinct()
108103

109104

110-
def_resolve_model(obj):
111-
"""
112-
Resolve supplied `obj` to a Django model class.
113-
114-
`obj` must be a Django model class itself, or a string
115-
representation of one. Useful in situations like GH #1225 where
116-
Django may not have resolved a string-based reference to a model in
117-
another model's foreign key definition.
118-
119-
String representations should have the format:
120-
'appname.ModelName'
121-
"""
122-
ifisinstance(obj,six.string_types)andlen(obj.split('.'))==2:
123-
app_name,model_name=obj.split('.')
124-
resolved_model=apps.get_model(app_name,model_name)
125-
ifresolved_modelisNone:
126-
msg="Django did not return a model for {0}.{1}"
127-
raiseImproperlyConfigured(msg.format(app_name,model_name))
128-
returnresolved_model
129-
elifinspect.isclass(obj)andissubclass(obj,models.Model):
130-
returnobj
131-
raiseValueError("{0} is not a Django model".format(obj))
132-
133-
134105
# django.contrib.postgres requires psycopg2
135106
try:
136107
fromdjango.contrib.postgresimportfieldsaspostgres_fields

‎tests/test_utils.py‎

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@
22
from __future__importunicode_literals
33

44
fromdjango.conf.urlsimporturl
5-
fromdjango.core.exceptionsimportImproperlyConfigured
65
fromdjango.testimportTestCase,override_settings
7-
fromdjango.utilsimportsix
86

9-
importrest_framework.utils.model_meta
10-
fromrest_framework.compatimport_resolve_model
117
fromrest_framework.routersimportSimpleRouter
128
fromrest_framework.serializersimportModelSerializer
139
fromrest_framework.utilsimportjson
@@ -124,64 +120,6 @@ def test_modelviewset_resource_instance_breadcrumbs(self):
124120
]
125121

126122

127-
classResolveModelTests(TestCase):
128-
"""
129-
`_resolve_model` should return a Django model class given the
130-
provided argument is a Django model class itself, or a properly
131-
formatted string representation of one.
132-
"""
133-
deftest_resolve_django_model(self):
134-
resolved_model=_resolve_model(BasicModel)
135-
assertresolved_model==BasicModel
136-
137-
deftest_resolve_string_representation(self):
138-
resolved_model=_resolve_model('tests.BasicModel')
139-
assertresolved_model==BasicModel
140-
141-
deftest_resolve_unicode_representation(self):
142-
resolved_model=_resolve_model(six.text_type('tests.BasicModel'))
143-
assertresolved_model==BasicModel
144-
145-
deftest_resolve_non_django_model(self):
146-
withself.assertRaises(ValueError):
147-
_resolve_model(TestCase)
148-
149-
deftest_resolve_improper_string_representation(self):
150-
withself.assertRaises(ValueError):
151-
_resolve_model('BasicModel')
152-
153-
154-
classResolveModelWithPatchedDjangoTests(TestCase):
155-
"""
156-
Test coverage for when Django's `get_model` returns `None`.
157-
158-
Under certain circumstances Django may return `None` with `get_model`:
159-
http://git.io/get-model-source
160-
161-
It usually happens with circular imports so it is important that DRF
162-
excepts early, otherwise fault happens downstream and is much more
163-
difficult to debug.
164-
165-
"""
166-
167-
defsetUp(self):
168-
"""Monkeypatch get_model."""
169-
self.get_model=rest_framework.compat.apps.get_model
170-
171-
defget_model(app_label,model_name):
172-
returnNone
173-
174-
rest_framework.compat.apps.get_model=get_model
175-
176-
deftearDown(self):
177-
"""Revert monkeypatching."""
178-
rest_framework.compat.apps.get_model=self.get_model
179-
180-
deftest_blows_up_if_model_does_not_resolve(self):
181-
withself.assertRaises(ImproperlyConfigured):
182-
_resolve_model('tests.BasicModel')
183-
184-
185123
classJsonFloatTests(TestCase):
186124
"""
187125
Internaly, wrapped json functions should adhere to strict float handling

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp