timestamps instead of datetime

This commit is contained in:
Laura Klünder 2017-12-19 20:32:18 +01:00
parent c55a087522
commit a527317c27

View file

@ -1,10 +1,8 @@
import mimetypes import mimetypes
import os import os
from collections import namedtuple from collections import namedtuple
from datetime import datetime
from functools import wraps from functools import wraps
import pytz
from django.core.cache import cache from django.core.cache import cache
from django.db.models import Prefetch from django.db.models import Prefetch
from django.http import HttpResponse from django.http import HttpResponse
@ -380,7 +378,7 @@ class SourceViewSet(MapdataViewSet):
def _image(self, request, pk=None): def _image(self, request, pk=None):
source = self.get_object() source = self.get_object()
last_modified = datetime.utcfromtimestamp(os.path.getmtime(source.filepath)).replace(tzinfo=pytz.utc) last_modified = os.path.getmtime(source.filepath)
response = get_conditional_response(request, last_modified=last_modified) response = get_conditional_response(request, last_modified=last_modified)
if response is None: if response is None:
response = HttpResponse(open(source.filepath, 'rb'), content_type=mimetypes.guess_type(source.name)[0]) response = HttpResponse(open(source.filepath, 'rb'), content_type=mimetypes.guess_type(source.name)[0])