Unverified Commit bc7c5f63 authored by Diederik van der Boor's avatar Diederik van der Boor Committed by GitHub
Browse files

Merge pull request #17 from dr-mark/master

Add Python 2.x  support for DjangoStreamingServer serve() method
parents ce8b0b14 86632975
......@@ -2,6 +2,8 @@
Sending files efficiently for different kind of webservers.
"""
import os
import sys
import time
from django.conf import settings
from django.core.exceptions import ImproperlyConfigured
......@@ -41,7 +43,10 @@ class DjangoStreamingServer(object):
@staticmethod
def serve(private_file):
# Support If-Last-Modified
if sys.version_info >= (3,):
mtime = private_file.modified_time.timestamp()
else:
mtime = time.mktime(private_file.modified_time.timetuple())
size = private_file.size
if not was_modified_since(private_file.request.META.get('HTTP_IF_MODIFIED_SINCE'), mtime, size):
return HttpResponseNotModified()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment