Skip to content

Avoid a too broad try...except NameError clause #1443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 23, 2021
Merged

Avoid a too broad try...except NameError clause #1443

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions debug_toolbar/panels/cache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
try:
from django.utils.connection import ConnectionProxy
except ImportError:
# Django 3.1 and below doesn't have a ConnectionProxy
pass
ConnectionProxy = None

from django.conf import settings
from django.core import cache
Expand Down Expand Up @@ -257,10 +256,9 @@ def enable_instrumentation(self):
else:
cache.caches = CacheHandlerPatch()

try:
# Wrap the patched cache inside Django's ConnectionProxy
if ConnectionProxy:
cache.cache = ConnectionProxy(cache.caches, DEFAULT_CACHE_ALIAS)
except NameError:
pass

def disable_instrumentation(self):
cache.caches = original_caches
Expand Down