summaryrefslogtreecommitdiff
path: root/django/contrib/contenttypes/models.py
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/contenttypes/models.py
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/contenttypes/models.py')
-rw-r--r--django/contrib/contenttypes/models.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/django/contrib/contenttypes/models.py b/django/contrib/contenttypes/models.py
index 066474e49f..ad2e0bc904 100644
--- a/django/contrib/contenttypes/models.py
+++ b/django/contrib/contenttypes/models.py
@@ -1,5 +1,4 @@
from collections import defaultdict
-from contextlib import suppress
from django.apps import apps
from django.db import models
@@ -39,8 +38,10 @@ class ContentTypeManager(models.Manager):
for the same model don't hit the database.
"""
opts = self._get_opts(model, for_concrete_model)
- with suppress(KeyError):
+ try:
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.