mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 22:26:08 +00:00
Code Issues 32 Releases Wiki Activity

Changed get_model to raise an exception on errors.

Browse Source 
Returning None on errors required unpythonic error checking and was
inconsistent with get_app_config.

get_model was a private API until the previous commit, but given that it
was certainly used in third party software, the change is explained in
the release notes.

Applied the same change to get_registered_model, which is a new private
API introduced during the recent refactoring.
This commit is contained in:
Aymeric Augustin
2013-12-28 14:55:54 +01:00
parent 54790e669d
commit ba7206cd81
20 changed files with 80 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
django/contrib/admindocs/views.py
View File

@@ -188,8 +188,9 @@ class ModelDetailView(BaseAdminDocsView):
apps.get_app_config(self.kwargs['app_label'])
except LookupError:
raise Http404(_("App %(app_label)r not found") % self.kwargs)
model = apps.get_model(self.kwargs['app_label'], self.kwargs['model_name'])
if model is None:
try:
model = apps.get_model(self.kwargs['app_label'], self.kwargs['model_name'])
except LookupError:
raise Http404(_("Model %(model_name)r not found in app %(app_label)r") % self.kwargs)
opts = model._meta