Skip to content

Fix naive offset-naive/aware error in asset compilation [CRI-191] #23922

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

Merged
nedbat merged 1 commit into from
May 6, 2020
Merged

Fix naive offset-naive/aware error in asset compilation [CRI-191] #23922

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions openedx/core/lib/xblock_pipeline/finder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
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 pkg_resources import resource_exists, resource_filename, resource_isdir, resource_listdir
from xblock.core import XBlock

Expand Down Expand Up @@ -80,19 +81,19 @@ def get_accessed_time(self, name):
"""
Returns a URL to the package resource.
"""
return datetime.fromtimestamp(os.path.getatime(self.path(name)))
return datetime.fromtimestamp(os.path.getatime(self.path(name)), timezone.utc)

def get_created_time(self, name):
"""
Returns the created time of the package resource.
"""
return datetime.fromtimestamp(os.path.getctime(self.path(name)))
return datetime.fromtimestamp(os.path.getctime(self.path(name)), timezone.utc)

def get_modified_time(self, name):
"""
Returns the modified time of the resource.
"""
return datetime.fromtimestamp(os.path.getmtime(self.path(name)))
return datetime.fromtimestamp(os.path.getmtime(self.path(name)), timezone.utc)

def url(self, name):
"""
Expand Down