From 2c67bc2ca63b5927629627c7ee471aa21a1e3dd1 Mon Sep 17 00:00:00 2001 From: Ville Rantanen Date: Tue, 21 Aug 2018 13:21:15 +0300 Subject: [PATCH] allow no magic --- code/utils/utils.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/code/utils/utils.py b/code/utils/utils.py index 17a85ed..25a1a1e 100644 --- a/code/utils/utils.py +++ b/code/utils/utils.py @@ -3,7 +3,10 @@ from datetime import datetime from flask import current_app as app import requests import re -import magic +try: + import magic +except ImportError: + pass try: from urllib.request import pathname2url from urllib.request import urlparse @@ -60,7 +63,11 @@ def version_date(full_path): def file_mime(filename): - return magic.from_file(filename, mime = True) + try: + return magic.from_file(filename, mime = True) + except NameError: + # magic not imported + return "NA" def file_stat(path, filename): full_path = os.path.join(path, filename)