From 1fa1e577fa1f196b68f9178f9a14bbf16a017604 Mon Sep 17 00:00:00 2001 From: Christophe Siraut Date: Tue, 12 Jun 2018 17:33:23 +0200 Subject: [PATCH 1/4] forms: use python-magic when available (#24497) --- wcs/qommon/form.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/wcs/qommon/form.py b/wcs/qommon/form.py index 7ee32d59..edb6af8f 100644 --- a/wcs/qommon/form.py +++ b/wcs/qommon/form.py @@ -710,10 +710,14 @@ class FileWithPreviewWidget(CompositeWidget): # sites setting a wrong MIME type (like application/force-download) for # various reasons. if magic: - magic_object = magic.open(magic.MIME) - magic_object.load() - filetype = magic_object.file(self.value.fp.name).split(';')[0] - magic_object.close() + if hasattr(magic, 'MagicException'): + mime = magic.Magic(mime=True) + filetype = mime.from_file(self.value.fp.name) + else: # bindings from libmagic package, obsolete after jessie + magic_object = magic.open(magic.MIME) + magic_object.load() + filetype = magic_object.file(self.value.fp.name).split(';')[0] + magic_object.close() else: filetype, encoding = mimetypes.guess_type(self.value.base_filename) -- 2.11.0