0001-misc-return-correct-mimetype-for-thumbnailed-files-1.patch

Frédéric Péters, 11 juin 2016 13:54

Voir les différences: en ligne côte à côte

Subject: [PATCH] misc: return correct mimetype for thumbnailed files (#11307)

 tests/test_form_pages.py | 29 +++++++++++++++++++++++++++++
 wcs/forms/root.py        |  1 +
 2 files changed, 30 insertions(+)

     from webtest import Upload
     import mock
     try:
         from PIL import Image
     except ImportError:
         Image = None
     from quixote.http_request import Upload as QuixoteUpload
     from wcs.qommon.form import UploadedFile
     from wcs.qommon.ident.password_accounts import PasswordAccount
-...
         assert resp.content_type == 'text/plain'
         assert resp.body == 'foobar'
     def test_form_file_field_image_submit(pub):
         formdef = create_formdef()
         formdef.fields = [fields.FileField(id='0', label='file')]
         formdef.store()
         formdef.data_class().wipe()
         image_content = open(os.path.join(os.path.dirname(__file__), 'image-with-gps-data.jpeg')).read()
         upload = Upload('test.jpg', image_content, 'image/jpeg')
         app = get_app(pub)
         resp = app.get('/test/')
         resp.forms[0]['f0$file'] = upload
         resp = resp.forms[0].submit('submit')
         assert 'Check values then click submit.' in resp.body
         assert '<img alt="" src="tempfile?' in resp.body
         tempfile_id = resp.body[resp.body.index('tempfile?'):].split('&', 1)[0].split('=')[1]
         resp = app.get('/test/tempfile?t=%s' % tempfile_id)
         assert resp.body == image_content
         if Image: # check thumbnailing
             resp = app.get('/test/tempfile?t=%s&thumbnail=1' % tempfile_id)
             assert resp.content_type == 'image/png'
     def test_form_file_field_submit_wrong_mimetype(pub):
         formdef = create_formdef()
         formdef.fields = [fields.FileField(id='0', label='file')]

                 except IOError:
                     # too bad we couldn't load the image, return the whole file :/
                     return file_pointer.read()
                 response.set_content_type('image/png')
                 return image_thumb_fp.getvalue()
             else:
                 return file_pointer.read()
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-misc-return-correct-mimetype-for-thumbnailed-files-1.patch