Browse Source

ref: automatically move some django.utils.timezone.utc -> datetime.timezone.utc (#53598)

via `git grep -l "timezone\.utc" | xargs grep -L "timezone\.[^u]" |
xargs sed -i "s/from django.utils import timezone/from datetime import
timezone/g"`

django 4.2 deprecates this alias and is quite noisy about it.

there's a bunch more usages of this but I wanted to split out the
automatically fixable ones first

<!-- Describe your PR here. -->
anthony sottile 1 year ago
parent
commit
d3fb2e06c5

+ 1 - 2
src/sentry/api/paginator.py

@@ -1,13 +1,12 @@
 import bisect
 import functools
 import math
-from datetime import datetime
+from datetime import datetime, timezone
 from urllib.parse import quote
 
 from django.core.exceptions import EmptyResultSet, ObjectDoesNotExist
 from django.db import connections
 from django.db.models.functions import Lower
-from django.utils import timezone
 
 from sentry.utils.cursors import Cursor, CursorResult, build_cursor
 

+ 1 - 2
src/sentry/api/serializers/models/event.py

@@ -2,12 +2,11 @@ from __future__ import annotations
 
 import re
 from collections import defaultdict
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Any, Dict, Sequence
 
 import sentry_sdk
 import sqlparse
-from django.utils import timezone
 from sentry_relay import meta_with_chunks
 
 from sentry.api.serializers import Serializer, register, serialize

+ 1 - 2
src/sentry/buffer/redis.py

@@ -1,11 +1,10 @@
 import logging
 import pickle
 import threading
-from datetime import date, datetime
+from datetime import date, datetime, timezone
 from time import time
 
 from django.db import models
-from django.utils import timezone
 from django.utils.encoding import force_bytes, force_str
 
 from sentry.buffer.base import Buffer

+ 1 - 1
src/sentry/integrations/bitbucket/webhook.py

@@ -1,10 +1,10 @@
 import ipaddress
 import logging
+from datetime import timezone
 
 from dateutil.parser import parse as parse_date
 from django.db import IntegrityError, router, transaction
 from django.http import Http404, HttpResponse
-from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
 from rest_framework.request import Request

+ 1 - 2
src/sentry/integrations/bitbucket_server/repository.py

@@ -1,8 +1,7 @@
-from datetime import datetime
+from datetime import datetime, timezone
 
 from django.core.cache import cache
 from django.urls import reverse
-from django.utils import timezone
 
 from sentry.plugins.providers.integration_repository import IntegrationRepositoryProvider
 from sentry.shared_integrations.exceptions import ApiError

+ 1 - 2
src/sentry/integrations/bitbucket_server/webhook.py

@@ -1,9 +1,8 @@
 import logging
-from datetime import datetime
+from datetime import datetime, timezone
 
 from django.db import IntegrityError, router, transaction
 from django.http import Http404, HttpResponse
-from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic.base import View

+ 1 - 1
src/sentry/integrations/github/webhook.py

@@ -3,12 +3,12 @@ from __future__ import annotations
 import hashlib
 import hmac
 import logging
+from datetime import timezone
 from typing import Any, Callable, Dict, List, Mapping, MutableMapping
 
 from dateutil.parser import parse as parse_date
 from django.db import IntegrityError, router, transaction
 from django.http import HttpResponse
-from django.utils import timezone
 from django.utils.crypto import constant_time_compare
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt

+ 1 - 1
src/sentry/integrations/gitlab/webhooks.py

@@ -1,12 +1,12 @@
 from __future__ import annotations
 
 import logging
+from datetime import timezone
 from typing import Any, Mapping, Tuple
 
 from dateutil.parser import parse as parse_date
 from django.db import IntegrityError, router, transaction
 from django.http import Http404, HttpResponse
-from django.utils import timezone
 from django.utils.crypto import constant_time_compare
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt

+ 1 - 2
src/sentry/lang/javascript/processor.py

@@ -8,7 +8,7 @@ import re
 import sys
 import time
 import zlib
-from datetime import datetime
+from datetime import datetime, timezone
 from enum import Enum
 from io import BytesIO
 from itertools import groupby
@@ -18,7 +18,6 @@ from urllib.parse import urlsplit
 
 import sentry_sdk
 from django.conf import settings
-from django.utils import timezone
 from django.utils.encoding import force_bytes, force_str
 from requests.utils import get_encoding_from_headers
 from symbolic.sourcemap import SourceView

+ 1 - 1
src/sentry/nodestore/filesystem/backend.py

@@ -1,8 +1,8 @@
 import datetime
 import os
+from datetime import timezone
 
 from django.conf import settings
-from django.utils import timezone
 
 from sentry.nodestore.base import NodeStorage
 

Some files were not shown because too many files changed in this diff