Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions apps/events/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import datetime
import re

import pytz
from django.utils.timezone import is_aware, make_aware


Expand All @@ -20,7 +19,7 @@ def minutes_resolution(dt):
def date_to_datetime(date, tzinfo=None):
"""Convert a date to a timezone-aware datetime at midnight."""
if tzinfo is None:
tzinfo = pytz.UTC
tzinfo = datetime.UTC
return datetime.datetime(*date.timetuple()[:6], tzinfo=tzinfo)


Expand All @@ -39,7 +38,7 @@ def convert_dt_to_aware(dt):
# we don't want to use get_current_timezone() because
# settings.TIME_ZONE may be set something different than
# UTC in the future
return make_aware(dt, timezone=pytz.UTC)
return make_aware(dt, timezone=datetime.UTC)
return dt


Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ dependencies = [
"django-haystack==3.3.0",
"elasticsearch>=7,<8",
"django-tastypie==0.15.1",
"pytz==2021.1",
"python-dateutil==2.8.2",
"python-dateutil==2.9.0.post0",
"requests>=2.26.0",
"django-honeypot==1.3.0",
"django-markupfield==2.0.1",
Expand Down
Loading