Skip to content

Commit 8e0aca6

Browse files
committed
Tackle PR comments
1 parent 646d41f commit 8e0aca6

File tree

1 file changed

+4
-4
lines changed
  • instrumentation/opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django

1 file changed

+4
-4
lines changed

instrumentation/opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/middleware.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
from django.urls import Resolver404, resolve
4646

4747
DJANGO_2_0 = django_version >= (2, 0)
48+
DJANGO_3_0 = django_version >= (3, 0)
4849

4950
if DJANGO_2_0:
5051
# Since Django 2.0, only `settings.MIDDLEWARE` is supported, so new-style
@@ -69,10 +70,9 @@ def __call__(self, request):
6970
except ImportError:
7071
MiddlewareMixin = object
7172

72-
73-
try:
73+
if DJANGO_3_0:
7474
from django.core.handlers.asgi import ASGIRequest
75-
except ImportError:
75+
else:
7676
ASGIRequest = None
7777

7878
try:
@@ -114,7 +114,7 @@ def __call__(self, request):
114114

115115

116116
def _is_asgi_request(request: HttpRequest) -> bool:
117-
return bool(ASGIRequest and isinstance(request, ASGIRequest))
117+
return ASGIRequest is not None and isinstance(request, ASGIRequest)
118118

119119

120120
class _DjangoMiddleware(MiddlewareMixin):

0 commit comments

Comments
 (0)