From e685f9909d5c65eccc46fe856e5ccb663d725f82 Mon Sep 17 00:00:00 2001 From: Nikhil Benesch Date: Fri, 29 May 2015 16:16:05 -0400 Subject: [PATCH] properly compute modified since with StaticFile wrapper --- django_downloadview/views/base.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/django_downloadview/views/base.py b/django_downloadview/views/base.py index a8b9c82..df9c128 100644 --- a/django_downloadview/views/base.py +++ b/django_downloadview/views/base.py @@ -1,6 +1,8 @@ # -*- coding: utf-8 -*- """Base material for download views: :class:`DownloadMixin` and :class:`BaseDownloadView`""" +import datetime + from django.http import HttpResponseNotModified, Http404 from django.views.generic.base import View from django.views.static import was_modified_since @@ -116,7 +118,10 @@ class DownloadMixin(object): except (AttributeError, NotImplementedError): return True else: - return was_modified_since(since, modification_time, size) + epoch_delta = modification_time - datetime.datetime(1970, 1, 1) + return was_modified_since(since, + epoch_delta.total_seconds(), + size) def not_modified_response(self, *response_args, **response_kwargs): """Return :class:`django.http.HttpResponseNotModified` instance."""