summaryrefslogtreecommitdiff
path: root/django/contrib/contenttypes/models.py
diff options
context:
space:
mode:
authorMads Jensen <mje@inducks.org>2017-03-09 16:17:41 +0100
committerTim Graham <timograham@gmail.com>2017-06-28 14:07:55 -0400
commit550cb3a365dee4edfdd1563224d5304de2a57fda (patch)
treefb532f38774ff7619edd2a4532c3daae1ee0ac5a /django/contrib/contenttypes/models.py
parent43a4835edf32c57eb74c0eb207c276734a34abcf (diff)
Fixed #27818 -- Replaced try/except/pass with contextlib.suppress().
Diffstat (limited to 'django/contrib/contenttypes/models.py')
-rw-r--r--django/contrib/contenttypes/models.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/django/contrib/contenttypes/models.py b/django/contrib/contenttypes/models.py
index ad2e0bc904..066474e49f 100644
--- a/django/contrib/contenttypes/models.py
+++ b/django/contrib/contenttypes/models.py
@@ -1,4 +1,5 @@
from collections import defaultdict
+from contextlib import suppress
from django.apps import apps
from django.db import models
@@ -38,10 +39,8 @@ class ContentTypeManager(models.Manager):
for the same model don't hit the database.
"""
opts = self._get_opts(model, for_concrete_model)
- try:
+ with suppress(KeyError):
return self._get_from_cache(opts)
- except KeyError:
- pass
# The ContentType entry was not found in the cache, therefore we
# proceed to load or create it.