diff --git a/openedx/core/lib/xblock_pipeline/finder.py b/openedx/core/lib/xblock_pipeline/finder.py index c4a0c4d4789d..a87b564afce1 100644 --- a/openedx/core/lib/xblock_pipeline/finder.py +++ b/openedx/core/lib/xblock_pipeline/finder.py @@ -3,14 +3,13 @@ """ 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 1d9fd1f84e59..b196eb2ea417 100644 --- a/xmodule/modulestore/mixed.py +++ b/xmodule/modulestore/mixed.py @@ -7,6 +7,7 @@ import functools import itertools import logging +from datetime import datetime, timezone from contextlib import contextmanager from opaque_keys import InvalidKeyError @@ -21,7 +22,6 @@ XBLOCK_UPDATED ) -from django.utils.timezone import datetime, timezone from xmodule.assetstore import AssetMetadata from . import XMODULE_FIELDS_WITH_USAGE_KEYS, ModuleStoreWriteBase