Merge branch '35-remove-dead-code-and-cleanup' of...

Merge branch '35-remove-dead-code-and-cleanup' of https://git.gvk.idi.ntnu.no/HermanDyrkorn/salamander-api into 35-remove-dead-code-and-cleanup

merge

api/endpoints/location.py

 from flask import request, jsonify
 from flask_restful import Resource
 from flask_jwt_extended import jwt_required, get_jwt_identity
-from api.models.dbmodels import User
 
 from api import db, limiter
-from api.models.dbmodels import Location, Salamander
+from api.models.dbmodels import Location, Salamander, User
 import re
 import os
 from api.endpoints.matchsalamander import sanitize_int_str
+
 LATITUDE_REGEX = "^(\\+|-)?(?:90(?:(?:\\.0{1,6})?)|(?:[0-9]|[1-8][0-9])(?:(?:\\.[0-9]{1,6})?))$"
 LONGITUDE_REGEX = "^(\\+|-)?(?:180(?:(?:\\.0{1,6})?)|(?:[0-9]|[1-9][0-9]|1[0-7][0-9])(?:(?:\\.[0-9]{1,6})?))$"
 

api/endpoints/manageuser.py

@@ -6,6 +6,7 @@ from flask_jwt_extended import get_jwt_identity, jwt_required
 from random import choice
 from string import ascii_lowercase, digits
 
+
 class AdminManageUser(Resource):
     decorators = [limiter.limit("60/minute")]
 

api/endpoints/matchsalamander.py

@@ -5,8 +5,7 @@ import os.path
 from shutil import move
 from re import sub
 from api import db, limiter
-from api.models.dbmodels import Location
-from api.models.dbmodels import Salamander, SalamanderGrowth
+from api.models.dbmodels import Salamander, SalamanderGrowth, Location
 from algorithm.brute_force_matching import match_file_structure
 
 APPROVED_SEX = ["male", "female", "juvenile"]

api/endpoints/salamanderclass.py

@@ -3,8 +3,7 @@ from flask_jwt_extended import jwt_required, get_jwt_identity
 from flask_restful import Resource
 from api import db, limiter
 import os
-from api.models.dbmodels import Location, SalamanderGrowth, Salamander
-from api.models.dbmodels import User
+from api.models.dbmodels import Location, SalamanderGrowth, Salamander, User
 from algorithm.brute_force_matching import match_file_structure
 from api.endpoints.matchsalamander import sanitize_number_str
 import glob