Projet

Général

Profil

0004-misc-remove-support-for-old-magic-module-63645.patch

Frédéric Péters, 12 avril 2022 09:31

Télécharger (1,35 ko)

Voir les différences: 

Subject: [PATCH 4/7] misc: remove support for old magic module (#63645)


 wcs/qommon/form.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
wcs/qommon/form.py
835 835 
        # sites setting a wrong MIME type (like application/force-download) for
836 836 
        # various reasons.
837 837 
        if magic and self.value.fp:
838 
            if hasattr(magic, 'MagicException'):
839 
                mime = magic.Magic(mime=True)
840 
                filetype = mime.from_file(self.value.fp.name)
841 
            else:  # bindings from libmagic package, obsolete after jessie
842 
                magic_object = magic.open(magic.MIME)
843 
                magic_object.load()
844 
                filetype = magic_object.file(self.value.fp.name).split(';')[0]
845 
                magic_object.close()
838 
            mime = magic.Magic(mime=True)
839 
            filetype = mime.from_file(self.value.fp.name)
846 840 
        else:
847 841 
            filetype = getattr(self.value, 'storage_attrs', {}).get('content_type')
848 842 
            if not filetype:
849 
-