From 7e9e044274ac13ec282d4c40ba385add9c3814b5 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Mon, 19 Jan 2015 02:05:06 +0100 Subject: [PATCH] mimetype > content_type --- telemeta/views/collection.py | 6 +++--- telemeta/views/item.py | 10 +++++----- telemeta/views/resource.py | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/telemeta/views/collection.py b/telemeta/views/collection.py index b059585f..9bcfb845 100644 --- a/telemeta/views/collection.py +++ b/telemeta/views/collection.py @@ -129,7 +129,7 @@ class CollectionView(object): template = loader.get_template(template) context = RequestContext(request, {'collection': collection, 'host': request.META['HTTP_HOST']}) - return HttpResponse(template.render(context), mimetype=mimetype) + return HttpResponse(template.render(context), content_type=mimetype) @method_decorator(permission_required('telemeta.delete_mediacollection')) def collection_delete(self, request, public_id): @@ -144,7 +144,7 @@ class CollectionView(object): def related_media_collection_stream(self, request, public_id, media_id): collection = MediaCollection.objects.get(public_id=public_id) media = MediaCollectionRelated.objects.get(collection=collection, id=media_id) - response = StreamingHttpResponse(stream_from_file(media.file.path), mimetype=media.mime_type) + response = StreamingHttpResponse(stream_from_file(media.file.path), content_type=media.mime_type) # response['Content-Disposition'] = 'attachment' return response @@ -152,7 +152,7 @@ class CollectionView(object): collection = MediaCollection.objects.get(public_id=public_id) media = MediaCollectionRelated.objects.get(collection=collection, id=media_id) filename = media.file.path.split(os.sep)[-1] - response = StreamingHttpResponse(stream_from_file(media.file.path), mimetype=media.mime_type) + response = StreamingHttpResponse(stream_from_file(media.file.path), content_type=media.mime_type) response['Content-Disposition'] = 'attachment; ' + 'filename=' + filename return response diff --git a/telemeta/views/item.py b/telemeta/views/item.py index ff196a81..432fce6a 100644 --- a/telemeta/views/item.py +++ b/telemeta/views/item.py @@ -222,14 +222,14 @@ class ItemView(ItemBaseMixin): item = MediaItem.objects.get(public_id=item_public_id) media = MediaItemRelated.objects.get(item=item, id=media_id) filename = media.file.path.split(os.sep)[-1] - response = StreamingHttpResponse(stream_from_file(media.file.path), mimetype=media.mime_type) + response = StreamingHttpResponse(stream_from_file(media.file.path), content_type=media.mime_type) return response def related_media_item_download(self, request, item_public_id, media_id): item = MediaItem.objects.get(public_id=item_public_id) media = MediaItemRelated.objects.get(item=item, id=media_id) filename = media.file.path.split(os.sep)[-1] - response = StreamingHttpResponse(stream_from_file(media.file.path), mimetype=media.mime_type) + response = StreamingHttpResponse(stream_from_file(media.file.path), content_type=media.mime_type) response['Content-Disposition'] = 'attachment; ' + 'filename=' + filename return response @@ -457,7 +457,7 @@ class ItemView(ItemBaseMixin): for analysis in analyses: analyzers.append(analysis.to_dict()) mime_type = 'text/xml' - response = HttpResponse(self.cache_data.get_analyzer_xml(analyzers), mimetype=mime_type) + response = HttpResponse(self.cache_data.get_analyzer_xml(analyzers), content_type=mime_type) response['Content-Disposition'] = 'attachment; filename='+public_id+'.xml' return response @@ -500,7 +500,7 @@ class ItemView(ItemBaseMixin): graph.render(output=path) f.close() - response = StreamingHttpResponse(self.cache_data.read_stream_bin(image_file), mimetype=mime_type) + response = StreamingHttpResponse(self.cache_data.read_stream_bin(image_file), content_type=mime_type) return response def list_export_extensions(self): @@ -602,7 +602,7 @@ class ItemView(ItemBaseMixin): template = loader.get_template(template) context = RequestContext(request, {'item': item, 'host': request.META['HTTP_HOST']}) - return HttpResponse(template.render(context), mimetype=mimetype) + return HttpResponse(template.render(context), content_type=mimetype) @method_decorator(permission_required('telemeta.change_mediaitem')) def item_performances_edit(self, request, public_id, template): diff --git a/telemeta/views/resource.py b/telemeta/views/resource.py index 4ae576cb..dc84ccb0 100644 --- a/telemeta/views/resource.py +++ b/telemeta/views/resource.py @@ -142,7 +142,7 @@ class ResourceView(object): template = loader.get_template(template) context = RequestContext(request, {'resource': resource, 'host': request.META['HTTP_HOST']}) - return HttpResponse(template.render(context), mimetype=mimetype) + return HttpResponse(template.render(context), content_type=mimetype) def delete(self, request, type, public_id): self.setup(type) @@ -157,7 +157,7 @@ class ResourceView(object): self.setup(type) resource = self.model.objects.get(code=public_id) media = self.related.objects.get(resource=resource, id=media_id) - response = StreamingHttpResponse(stream_from_file(media.file.path), mimetype=media.mime_type) + response = StreamingHttpResponse(stream_from_file(media.file.path), content_type=media.mime_type) return response def related_download(self, request, type, public_id, media_id): @@ -165,7 +165,7 @@ class ResourceView(object): resource = self.model.objects.get(code=public_id) media = self.related.objects.get(resource=resource, id=media_id) filename = media.file.path.split(os.sep)[-1] - response = StreamingHttpResponse(stream_from_file(media.file.path), mimetype=media.mime_type) + response = StreamingHttpResponse(stream_from_file(media.file.path), content_type=media.mime_type) response['Content-Disposition'] = 'attachment; ' + 'filename=' + filename return response -- 2.39.5