From 4a27f9cbb56f9348b26a6d3b1e6d3ea6e5efa0ed Mon Sep 17 00:00:00 2001
From: Mubbshar Anwar <78487564+mubbsharanwar@users.noreply.github.com>
Date: Thu, 28 Aug 2025 11:16:51 +0500
Subject: [PATCH] fix: fix timezone for Django 5.2 (#37293)

---
 openedx/core/lib/xblock_pipeline/finder.py | 3 +--
 xmodule/modulestore/mixed.py               | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/openedx/core/lib/xblock_pipeline/finder.py b/openedx/core/lib/xblock_pipeline/finder.py
index c4a0c4d478..a87b564afc 100644
--- a/openedx/core/lib/xblock_pipeline/finder.py
+++ b/openedx/core/lib/xblock_pipeline/finder.py
@@ -3,14 +3,13 @@ Django pipeline finder for handling static assets required by XBlocks.
 """
 
 import os
-from datetime import datetime
+from datetime import datetime, timezone
 import importlib.resources as resources
 
 from django.contrib.staticfiles import utils
 from django.contrib.staticfiles.finders import BaseFinder
 from django.contrib.staticfiles.storage import FileSystemStorage
 from django.core.files.storage import Storage
-from django.utils import timezone
 from xblock.core import XBlock
 
 from openedx.core.lib.xblock_utils import xblock_resource_pkg
diff --git a/xmodule/modulestore/mixed.py b/xmodule/modulestore/mixed.py
index 1d9fd1f84e..b196eb2ea4 100644
--- a/xmodule/modulestore/mixed.py
+++ b/xmodule/modulestore/mixed.py
@@ -7,6 +7,7 @@ In this way, courses can be served up via either SplitMongoModuleStore or MongoM
 import functools
 import itertools
 import logging
+from datetime import datetime, timezone
 from contextlib import contextmanager
 
 from opaque_keys import InvalidKeyError
@@ -21,7 +22,6 @@ from openedx_events.content_authoring.signals import (
     XBLOCK_UPDATED
 )
 
-from django.utils.timezone import datetime, timezone
 from xmodule.assetstore import AssetMetadata
 
 from . import XMODULE_FIELDS_WITH_USAGE_KEYS, ModuleStoreWriteBase