From 8541cdf8939cf63a5fa6a182b5ea34667b7201ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Mon, 3 Feb 2014 14:14:42 +0100 Subject: [PATCH] Switch to python-magic from PIL --- fdroidserver/common.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 40d7060a..17736029 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1186,9 +1186,6 @@ def scan_source(build_dir, root_dir, thisbuild): scanignore = getpaths('scanignore') scandelete = getpaths('scandelete') - ms = magic.open(magic.MIME_TYPE) - ms.load() - def toignore(fd): for i in scanignore: if fd.startswith(i): @@ -1237,7 +1234,7 @@ def scan_source(build_dir, root_dir, thisbuild): if suspect in curfile.lower(): handleproblem('usual supect', fd, fp) - mime = ms.file(fp) + mime = magic.from_file(fp, mime=True) if mime == 'application/x-sharedlib': handleproblem('shared library', fd, fp) elif mime == 'application/x-archive': @@ -1254,7 +1251,6 @@ def scan_source(build_dir, root_dir, thisbuild): if 'DexClassLoader' in line: handleproblem('DexClassLoader', fd, fp) break - ms.close() # Presence of a jni directory without buildjni=yes might # indicate a problem (if it's not a problem, explicitly use