From cdb4a60e3cd68feaaacdda656ab45161949bc7e8 Mon Sep 17 00:00:00 2001 From: Kumi Date: Tue, 19 Dec 2023 20:01:14 +0100 Subject: [PATCH] Django 5.0 compatibility: UTC timezone import Added a try-except block to handle ImportError for Django's timezone.utc in migrations. This ensures compatibility with versions of Django where utc is not available directly under django.utils.timezone and uses datetime.timezone.utc as a fallback. This change maintains forward compatibility and avoids migration errors in different Django environments. --- oidc_provider/migrations/0007_auto_20160111_1844.py | 5 ++++- .../migrations/0016_userconsent_and_verbosenames.py | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/oidc_provider/migrations/0007_auto_20160111_1844.py b/oidc_provider/migrations/0007_auto_20160111_1844.py index 263c4c5..8f37bda 100644 --- a/oidc_provider/migrations/0007_auto_20160111_1844.py +++ b/oidc_provider/migrations/0007_auto_20160111_1844.py @@ -4,8 +4,11 @@ from __future__ import unicode_literals import datetime from django.db import migrations, models -from django.utils.timezone import utc +try: + from django.utils.timezone import utc +except ImportError: + utc = datetime.timezone.utc class Migration(migrations.Migration): diff --git a/oidc_provider/migrations/0016_userconsent_and_verbosenames.py b/oidc_provider/migrations/0016_userconsent_and_verbosenames.py index a698362..778c623 100644 --- a/oidc_provider/migrations/0016_userconsent_and_verbosenames.py +++ b/oidc_provider/migrations/0016_userconsent_and_verbosenames.py @@ -6,8 +6,11 @@ import datetime from django.conf import settings from django.db import migrations, models import django.db.models.deletion -from django.utils.timezone import utc +try: + from django.utils.timezone import utc +except ImportError: + utc = datetime.timezone.utc class Migration(migrations.Migration):