summaryrefslogtreecommitdiff
path: root/django/contrib/admin
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2017-09-07 08:16:21 -0400
committerGitHub <noreply@github.com>2017-09-07 08:16:21 -0400
commit6e4c6281dbb7ee12bcdc22620894edb4e9cf623f (patch)
tree1c21218d4b6f00c499f18943d5190ebe7b5248c9 /django/contrib/admin
parent8b2515a450ef376b9205029090af0a79c8341bd7 (diff)
Reverted "Fixed #27818 -- Replaced try/except/pass with contextlib.suppress()."
This reverts commit 550cb3a365dee4edfdd1563224d5304de2a57fda because try/except performs better.
Diffstat (limited to 'django/contrib/admin')
-rw-r--r--django/contrib/admin/models.py5
-rw-r--r--django/contrib/admin/sites.py9
2 files changed, 9 insertions, 5 deletions
diff --git a/django/contrib/admin/models.py b/django/contrib/admin/models.py
index 4443f13dac..82b3cc0585 100644
--- a/django/contrib/admin/models.py
+++ b/django/contrib/admin/models.py
@@ -1,5 +1,4 @@
import json
-from contextlib import suppress
from django.conf import settings
from django.contrib.admin.utils import quote
@@ -138,6 +137,8 @@ class LogEntry(models.Model):
"""
if self.content_type and self.object_id:
url_name = 'admin:%s_%s_change' % (self.content_type.app_label, self.content_type.model)
- with suppress(NoReverseMatch):
+ try:
return reverse(url_name, args=(quote(self.object_id),))
+ except NoReverseMatch:
+ pass
return None
diff --git a/django/contrib/admin/sites.py b/django/contrib/admin/sites.py
index e68dfa1e8b..c0767c15ee 100644
--- a/django/contrib/admin/sites.py
+++ b/django/contrib/admin/sites.py
@@ -1,4 +1,3 @@
-from contextlib import suppress
from functools import update_wrapper
from weakref import WeakSet
@@ -428,11 +427,15 @@ class AdminSite:
'perms': perms,
}
if perms.get('change'):
- with suppress(NoReverseMatch):
+ try:
model_dict['admin_url'] = reverse('admin:%s_%s_changelist' % info, current_app=self.name)
+ except NoReverseMatch:
+ pass
if perms.get('add'):
- with suppress(NoReverseMatch):
+ try:
model_dict['add_url'] = reverse('admin:%s_%s_add' % info, current_app=self.name)
+ except NoReverseMatch:
+ pass
if app_label in app_dict:
app_dict[app_label]['models'].append(model_dict)