encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-04 20:40:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge e72eee6f31 into e85ef3b479

Browse Source
This commit is contained in:
Capi Etheriel 2014-08-18 15:46:45 +00:00
commit 5f81a1c014
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rest_framework/serializers.py
View File

@ -51,7 +51,11 @@ 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('.')
return models.get_model(app_name, model_name) model = models.get_model(app_name, model_name)
if model is None:
raise ValueError("{0} is not a Django model".format(obj))
else:
return model
elif inspect.isclass(obj) and issubclass(obj, models.Model): elif inspect.isclass(obj) and issubclass(obj, models.Model):
return obj return obj
else: else: