Skip to content

Commit d54a03c

Browse files
committed
also drop old django
1 parent 2c9feb3 commit d54a03c

File tree

5 files changed

+16
-55
lines changed

5 files changed

+16
-55
lines changed

sentry_sdk/integrations/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ def iter_default_integrations(with_auto_enabling_integrations):
132132
"celery": (4, 4, 7),
133133
"chalice": (1, 16, 0),
134134
"clickhouse_driver": (0, 2, 0),
135-
"django": (1, 8),
135+
"django": (2, 0),
136136
"dramatiq": (1, 9),
137137
"falcon": (3, 0),
138138
"fastapi": (0, 79, 0),

sentry_sdk/integrations/django/__init__.py

Lines changed: 6 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
except ImportError:
5757
raise DidNotEnable("Django not installed")
5858

59+
from sentry_sdk.integrations.django.caching import patch_caching
5960
from sentry_sdk.integrations.django.transactions import LEGACY_RESOLVER
6061
from sentry_sdk.integrations.django.templates import (
6162
get_template_frame_from_exception,
@@ -65,11 +66,6 @@
6566
from sentry_sdk.integrations.django.signals_handlers import patch_signals
6667
from sentry_sdk.integrations.django.views import patch_views
6768

68-
if DJANGO_VERSION[:2] > (1, 8):
69-
from sentry_sdk.integrations.django.caching import patch_caching
70-
else:
71-
patch_caching = None # type: ignore
72-
7369
from typing import TYPE_CHECKING
7470

7571
if TYPE_CHECKING:
@@ -90,19 +86,6 @@
9086
from sentry_sdk._types import Event, Hint, EventProcessor, NotImplementedType
9187

9288

93-
if DJANGO_VERSION < (1, 10):
94-
95-
def is_authenticated(request_user):
96-
# type: (Any) -> bool
97-
return request_user.is_authenticated()
98-
99-
else:
100-
101-
def is_authenticated(request_user):
102-
# type: (Any) -> bool
103-
return request_user.is_authenticated
104-
105-
10689
TRANSACTION_STYLE_VALUES = ("function_name", "url")
10790

10891

@@ -597,7 +580,7 @@ def _set_user_info(request, event):
597580

598581
user = getattr(request, "user", None)
599582

600-
if user is None or not is_authenticated(user):
583+
if user is None or not user.is_authenticated:
601584
return
602585

603586
try:
@@ -624,20 +607,11 @@ def install_sql_hook():
624607
except ImportError:
625608
from django.db.backends.util import CursorWrapper
626609

627-
try:
628-
# django 1.6 and 1.7 compatability
629-
from django.db.backends import BaseDatabaseWrapper
630-
except ImportError:
631-
# django 1.8 or later
632-
from django.db.backends.base.base import BaseDatabaseWrapper
610+
from django.db.backends.base.base import BaseDatabaseWrapper
633611

634-
try:
635-
real_execute = CursorWrapper.execute
636-
real_executemany = CursorWrapper.executemany
637-
real_connect = BaseDatabaseWrapper.connect
638-
except AttributeError:
639-
# This won't work on Django versions < 1.6
640-
return
612+
real_execute = CursorWrapper.execute
613+
real_executemany = CursorWrapper.executemany
614+
real_connect = BaseDatabaseWrapper.connect
641615

642616
@ensure_integration_enabled(DjangoIntegration, real_execute)
643617
def execute(self, sql, params=None):

sentry_sdk/integrations/django/templates.py

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import functools
22

33
from django.template import TemplateSyntaxError
4+
from django.template.loader import LoaderOrigin as Origin
45
from django.utils.safestring import mark_safe
5-
from django import VERSION as DJANGO_VERSION
66

77
import sentry_sdk
88
from sentry_sdk.consts import OP
@@ -17,13 +17,6 @@
1717
from typing import Iterator
1818
from typing import Tuple
1919

20-
try:
21-
# support Django 1.9
22-
from django.template.base import Origin
23-
except ImportError:
24-
# backward compatibility
25-
from django.template.loader import LoaderOrigin as Origin
26-
2720

2821
def get_template_frame_from_exception(exc_value):
2922
# type: (Optional[BaseException]) -> Optional[Dict[str, Any]]
@@ -81,8 +74,6 @@ def rendered_content(self):
8174

8275
SimpleTemplateResponse.rendered_content = rendered_content
8376

84-
if DJANGO_VERSION < (1, 7):
85-
return
8677
import django.shortcuts
8778

8879
real_render = django.shortcuts.render

sentry_sdk/integrations/django/transactions.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,7 @@
1919
from typing import Union
2020
from re import Pattern
2121

22-
from django import VERSION as DJANGO_VERSION
23-
24-
if DJANGO_VERSION >= (2, 0):
25-
from django.urls.resolvers import RoutePattern
26-
else:
27-
RoutePattern = None
22+
from django.urls.resolvers import RoutePattern
2823

2924
try:
3025
from django.urls import get_resolver

tox.ini

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# The file (and all resulting CI YAMLs) then need to be regenerated via
1111
# "scripts/generate-test-files.sh".
1212
#
13-
# Last generated: 2025-04-04T12:47:48.523578+00:00
13+
# Last generated: 2025-04-04T12:59:32.523881+00:00
1414

1515
[tox]
1616
requires =
@@ -227,7 +227,7 @@ envlist =
227227

228228

229229
# ~~~ Web 1 ~~~
230-
{py3.7}-django-v1.11.29
230+
{py3.7}-django-v2.0.9
231231
{py3.7,py3.8,py3.9}-django-v2.2.28
232232
{py3.7,py3.9,py3.10}-django-v3.2.25
233233
{py3.8,py3.11,py3.12}-django-v4.2.20
@@ -601,7 +601,7 @@ deps =
601601

602602

603603
# ~~~ Web 1 ~~~
604-
django-v1.11.29: django==1.11.29
604+
django-v2.0.9: django==2.0.9
605605
django-v2.2.28: django==2.2.28
606606
django-v3.2.25: django==3.2.25
607607
django-v4.2.20: django==4.2.20
@@ -616,14 +616,15 @@ deps =
616616
django-v5.0.9: pytest-asyncio
617617
django-v5.2: pytest-asyncio
618618
django-v2.2.28: six
619-
django-v1.11.29: djangorestframework>=3.0,<4.0
620-
django-v1.11.29: Werkzeug<2.1.0
619+
django-v2.0.9: djangorestframework>=3.0,<4.0
620+
django-v2.0.9: Werkzeug<2.1.0
621621
django-v2.2.28: djangorestframework>=3.0,<4.0
622622
django-v2.2.28: Werkzeug<2.1.0
623623
django-v3.2.25: djangorestframework>=3.0,<4.0
624624
django-v3.2.25: Werkzeug<2.1.0
625-
django-v1.11.29: pytest-django<4.0
625+
django-v2.0.9: pytest-django<4.0
626626
django-v2.2.28: pytest-django<4.0
627+
django-v2.0.9: channels[daphne]
627628
django-v2.2.28: channels[daphne]
628629
django-v3.2.25: channels[daphne]
629630
django-v4.2.20: channels[daphne]

0 commit comments

Comments
 (0)