From 6473878d2e81e8d948cd9dab3aa370e0eafb3a78 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Wed, 21 Mar 2018 14:47:25 +0100 Subject: [PATCH] fix typo "attachement" -> "attachment" (fixes #22676) --- fargo/oauth2/utils.py | 4 ++-- fargo/oauth2/views.py | 2 +- tests/test_oauth2.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fargo/oauth2/utils.py b/fargo/oauth2/utils.py index 19da3f7..c85c951 100644 --- a/fargo/oauth2/utils.py +++ b/fargo/oauth2/utils.py @@ -25,8 +25,8 @@ def get_content_disposition_value(request): return None, 'missing content-disposition header' content_header = request.META['HTTP_CONTENT_DISPOSITION'] disposition_type, filename = cgi.parse_header(content_header) - if disposition_type != 'attachement': - return None, 'wrong disposition type: attachement excpected' + if disposition_type != 'attachment': + return None, 'wrong disposition type: attachment excpected' if 'filename*' in filename: encode, country, name = filename['filename*'].split("'") diff --git a/fargo/oauth2/views.py b/fargo/oauth2/views.py index 4ba9e2e..f45e1fb 100644 --- a/fargo/oauth2/views.py +++ b/fargo/oauth2/views.py @@ -143,7 +143,7 @@ def get_document(request): ascii_filename = doc.filename.encode('ascii', 'replace') percent_encoded_filename = quote(doc.filename.encode('utf8'), safe='') - response['Content-Disposition'] = 'attachement; filename="%s"; filename*=UTF-8\'\'%s' % (ascii_filename, + response['Content-Disposition'] = 'attachment; filename="%s"; filename*=UTF-8\'\'%s' % (ascii_filename, percent_encoded_filename) return response diff --git a/tests/test_oauth2.py b/tests/test_oauth2.py index 511d6cf..80df525 100644 --- a/tests/test_oauth2.py +++ b/tests/test_oauth2.py @@ -107,7 +107,7 @@ def test_get_document_oauth2(app, john_doe, oauth2_client, user_doc): assert resp.content_type == 'application/octet-stream' assert 'Content-disposition' in resp.headers content_disposition = resp.content_disposition.replace(' ', '').split(';') - assert content_disposition[0] == 'attachement' + assert content_disposition[0] == 'attachment' assert content_disposition[1] == 'filename="Baudelaire.txt"' assert content_disposition[2] == 'filename*=UTF-8\'\'Baudelaire.txt' @@ -127,7 +127,7 @@ def test_put_document(app, john_doe, oauth2_client): filename = 'Baudelaire.txt'.encode('ascii', 'replace') percent_encode_filename = quote(filename.encode('utf8'), safe='') headers = { - 'Content-disposition': 'attachement; filename="%s"; filename*=UTF-8\'\'%s' % (filename, percent_encode_filename) + 'Content-disposition': 'attachment; filename="%s"; filename*=UTF-8\'\'%s' % (filename, percent_encode_filename) } assert len(OAuth2TempFile.objects.all()) == 0 -- 2.14.2