Projet

Général

Profil

0001-forms-use-python-magic-when-available-24497.patch

Christophe Siraut, 14 juin 2018 15:38

Télécharger (1,37 ko)

Voir les différences: 

Subject: [PATCH 1/4] forms: use python-magic when available (#24497)


 wcs/qommon/form.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
wcs/qommon/form.py
710 710 
        # sites setting a wrong MIME type (like application/force-download) for
711 711 
        # various reasons.
712 712 
        if magic:
713 
            magic_object = magic.open(magic.MIME)
714 
            magic_object.load()
715 
            filetype = magic_object.file(self.value.fp.name).split(';')[0]
716 
            magic_object.close()
713 
            if hasattr(magic, 'MagicException'):
714 
                mime = magic.Magic(mime=True)
715 
                filetype = mime.from_file(self.value.fp.name)
716 
            else:  # bindings from libmagic package, obsolete after jessie
717 
                magic_object = magic.open(magic.MIME)
718 
                magic_object.load()
719 
                filetype = magic_object.file(self.value.fp.name).split(';')[0]
720 
                magic_object.close()
717 721 
        else:
718 722 
            filetype, encoding = mimetypes.guess_type(self.value.base_filename)
719 723 

  		




  720
  
  
    
-