Commits

Rich Leland  committed 8a50ff3 Merge

Merged in tobias.mcnulty/django-storages (pull request #24)

  • Participants
  • Parent commits e971e8f, 5b310d0

Comments (0)

Files changed (1)

File storages/backends/s3boto.py

         if last_modified_date.tzinfo == None:
             last_modified_date = last_modified_date.replace(tzinfo=tz.tzutc())
         # convert date to local time w/o timezone
-        return last_modified_date.astimezone(tz.tzlocal()).replace(tzinfo=None)
+        timezone = tz.gettz(settings.TIME_ZONE)
+        return last_modified_date.astimezone(timezone).replace(tzinfo=None)
 
     def url(self, name):
         name = self._normalize_name(self._clean_name(name))