diff options
| author | Maciek Lenc <mattack108@users.noreply.github.com> | 2014-07-03 14:23:05 +0100 |
|---|---|---|
| committer | Maciek Lenc <mattack108@users.noreply.github.com> | 2014-07-03 14:23:05 +0100 |
| commit | ba38b304718d55fcd16db45d905273fbb4897d28 (patch) | |
| tree | 815979efb7b3cd1ad5044588c30447a2ae5d1b65 | |
| parent | a56c03c09be3452c370251fdf8387c83fa6c9d5a (diff) | |
| parent | eb11c5fca0ae826c5306808bfba683e6cc9e918a (diff) | |
| download | django-wkhtmltopdf-ba38b304718d55fcd16db45d905273fbb4897d28.tar.gz django-wkhtmltopdf-ba38b304718d55fcd16db45d905273fbb4897d28.tar.bz2 django-wkhtmltopdf-ba38b304718d55fcd16db45d905273fbb4897d28.zip | |
Merge pull request #54 from Madec/master
Removed mimetype from response for Django 1.7 compatibility.
| -rw-r--r-- | wkhtmltopdf/tests/tests.py | 5 | ||||
| -rw-r--r-- | wkhtmltopdf/views.py | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/wkhtmltopdf/tests/tests.py b/wkhtmltopdf/tests/tests.py index 7365d05..f296c8e 100644 --- a/wkhtmltopdf/tests/tests.py +++ b/wkhtmltopdf/tests/tests.py @@ -78,7 +78,7 @@ class TestViews(TestCase): inline_fileheader = 'inline; filename="{0}"' def test_pdf_response(self): - """Should generate the correct HttpResponse object and mimetype""" + """Should generate the correct HttpResponse object and content type.""" # 404 response = PDFResponse(content='', status=404) self.assertEqual(response.status_code, 404) @@ -130,9 +130,6 @@ class TestViews(TestCase): response = PDFResponse(content=content, content_type='application/x-pdf') self.assertEqual(response['Content-Type'], 'application/x-pdf') - response = PDFResponse(content=content, - mimetype='application/x-pdf') - self.assertEqual(response['Content-Type'], 'application/x-pdf') def test_pdf_template_response(self, show_content=False): """Test PDFTemplateResponse.""" diff --git a/wkhtmltopdf/views.py b/wkhtmltopdf/views.py index 2f1945d..2d91224 100644 --- a/wkhtmltopdf/views.py +++ b/wkhtmltopdf/views.py @@ -15,14 +15,13 @@ from .utils import (content_disposition_filename, make_absolute_paths, class PDFResponse(HttpResponse): """HttpResponse that sets the headers for PDF output.""" - def __init__(self, content, mimetype=None, status=200, content_type=None, + def __init__(self, content, status=200, content_type=None, filename=None, show_content_in_browser=None, *args, **kwargs): if content_type is None: content_type = 'application/pdf' super(PDFResponse, self).__init__(content=content, - mimetype=mimetype, status=status, content_type=content_type) self.set_filename(filename, show_content_in_browser) @@ -44,7 +43,7 @@ class PDFResponse(HttpResponse): class PDFTemplateResponse(TemplateResponse, PDFResponse): """Renders a Template into a PDF using wkhtmltopdf""" - def __init__(self, request, template, context=None, mimetype=None, + def __init__(self, request, template, context=None, status=None, content_type=None, current_app=None, filename=None, show_content_in_browser=None, header_template=None, footer_template=None, @@ -53,7 +52,6 @@ class PDFTemplateResponse(TemplateResponse, PDFResponse): super(PDFTemplateResponse, self).__init__(request=request, template=template, context=context, - mimetype=mimetype, status=status, content_type=content_type, current_app=None, |