Skip to content
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

use non-deprecated UTC timezone #606

Merged
merged 4 commits into from
Sep 16, 2022
Merged

use non-deprecated UTC timezone #606

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c02a92a
use non-deprecated etc timezone
BSVogler Aug 23, 2022
7fc8150
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 23, 2022
ff3d704
fix imports
BSVogler Aug 23, 2022
67c7b46
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 23, 2022
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
6 changes: 3 additions & 3 deletions rest_framework_simplejwt/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
from calendar import timegm
from datetime import datetime
from datetime import datetime, timezone

from django.conf import settings
from django.utils.functional import lazy
from django.utils.timezone import is_naive, make_aware, utc
from django.utils.timezone import is_naive, make_aware


def make_utc(dt):
if settings.USE_TZ and is_naive(dt):
return make_aware(dt, timezone=utc)
return make_aware(dt, timezone=timezone.utc)

return dt

Expand Down