Optimise imports and fix linter issues

app/logic/uploads.py

@@ -14,44 +14,47 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-
 import imghdr
 import os
 
 from flask_babel import lazy_gettext
 
+from app import app
 from app.logic.LogicError import LogicError
-from app.models import *
 from app.utils import randomString
 
 
 def get_extension(filename):
 	return filename.rsplit(".", 1)[1].lower() if "." in filename else None
 
+
 ALLOWED_IMAGES = {"jpeg", "png"}
-def isAllowedImage(data):
+
+
+def is_allowed_image(data):
 	return imghdr.what(None, data) in ALLOWED_IMAGES
 
-def upload_file(file, fileType, fileTypeDesc):
+
+def upload_file(file, file_type, file_type_desc):
 	if not file or file is None or file.filename == "":
 		raise LogicError(400, "Expected file")
 
 	assert os.path.isdir(app.config["UPLOAD_DIR"]), "UPLOAD_DIR must exist"
 
-	isImage = False
-	if fileType == "image":
-		allowedExtensions = ["jpg", "jpeg", "png"]
-		isImage = True
-	elif fileType == "zip":
-		allowedExtensions = ["zip"]
+	is_image = False
+	if file_type == "image":
+		allowed_extensions = ["jpg", "jpeg", "png"]
+		is_image = True
+	elif file_type == "zip":
+		allowed_extensions = ["zip"]
 	else:
 		raise Exception("Invalid fileType")
 
 	ext = get_extension(file.filename)
-	if ext is None or not ext in allowedExtensions:
-		raise LogicError(400, lazy_gettext("Please upload %(file_desc)s", file_desc=fileTypeDesc))
+	if ext is None or ext not in allowed_extensions:
+		raise LogicError(400, lazy_gettext("Please upload %(file_desc)s", file_desc=file_type_desc))
 
-	if isImage and not isAllowedImage(file.stream.read()):
+	if is_image and not is_allowed_image(file.stream.read()):
 		raise LogicError(400, lazy_gettext("Uploaded image isn't actually an image"))
 
 	file.stream.seek(0)