Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-19 12:41:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed reference to django.db.get_models

Browse source 
in resolve_model_string
This commit is contained in:
Karl Hobley 2015-02-06 10:25:42 +00:00
parent cf0e17d94c
commit 354a5aaa80
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
wagtail/wagtailcore/utils.py
View file

@ -1,7 +1,9 @@
import re
from django.db.models import Model, get_model
from six import string_types
from django.db.models import Model
from django.apps import apps
def camelcase_to_underscore(str):
# http://djangosnippets.org/snippets/585/
@ -26,10 +28,7 @@ def resolve_model_string(model_string, default_app=None):
"should be in the form app_label.model_name".format(
model_string), model_string)
model = get_model(app_label, model_name)
if not model:
raise LookupError("Can not resolve {0!r} into a model".format(model_string), model_string)
return model
return apps.get_model(app_label, model_name)
elif isinstance(model_string, type) and issubclass(model_string, Model):
return model_string