Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-04-09 17:40:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

in to -> into

Browse source
This commit is contained in:
Matt Westcott 2014-09-16 11:55:40 +01:00
parent c68dcff7bc
commit f28f7f92c2
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
wagtail/wagtailcore/utils.py
View file

@ -10,7 +10,7 @@ def camelcase_to_underscore(str):
def resolve_model_string(model_string, default_app=None):
"""
Resolve an 'app_label.model_name' string in to an actual model class.
Resolve an 'app_label.model_name' string into an actual model class.
If a model class is passed in, just return that.
"""
if isinstance(model_string, string_types):
@ -22,17 +22,17 @@ def resolve_model_string(model_string, default_app=None):
app_label = default_app
model_name = model_string
else:
raise ValueError("Can not resolve {0!r} in to a model. Model names "
raise ValueError("Can not resolve {0!r} into a model. Model names "
"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} in to a model".format(model_string), model_string)
raise LookupError("Can not resolve {0!r} into a model".format(model_string), model_string)
return model
elif model_string is not None and issubclass(model_string, Model):
return model
else:
raise LookupError("Can not resolve {0!r} in to a model".format(model_string), model_string)
raise LookupError("Can not resolve {0!r} into a model".format(model_string), model_string)