Fix linting issues

 * Fix all linting issues identified by tox / flake8

.github/workflows/codeql-analysis.yml

@@ -41,7 +41,7 @@ jobs:
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file. 
+        # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 

.pre-commit-config.yaml

@@ -17,13 +17,8 @@ repos:
       - id: flake8
         language_version: python3
         additional_dependencies: [flake8-bugbear, flake8-logging-format, flake8-variables-names, pep8-naming, flake8-eradicate]
-  - repo: https://github.com/asottile/seed-isort-config
-    rev: v2.1.0
-    hooks:
-      - id: seed-isort-config
-        language_version: python3
   - repo: https://github.com/pre-commit/mirrors-isort
-    rev: v4.3.21
+    rev: v5.6.4
     hooks:
       - id: isort
         language_version: python3

configs/config.ini.travis

@@ -2,4 +2,4 @@ dbip=localhost
 dbusername=mad
 dbpassword=mad
 dbname=mad
-dbport=3306
+dbport=3306

configs/geofences/example.txt

@@ -3,4 +3,4 @@
 47.7428662181981,10.2086651824607
 47.7441680045457,10.189267446865
 47.7419040066173,10.1612866424216
-47.7337527696297,10.1601708434714
+47.7337527696297,10.1601708434714

configs/mappings.travis.json

@@ -28,4 +28,4 @@
         "entries": {},
         "index": 0
     }
-}
+}

locale/HOWTO CONTRIBUTE.txt

@@ -14,7 +14,7 @@ Replace quest.pot with the new generated quest.po
 > rm quest.pot
 > mv quest.po quest.pot
 
-Next step, use POEdit (https://poedit.net/ ) to translate the files. Once you are done, make sure you save your po file. 
+Next step, use POEdit (https://poedit.net/ ) to translate the files. Once you are done, make sure you save your po file.
 Then, make sure you COMPILE your po file into a mo file (you can find this option in the file menu).
 
 NB! The updated quest.pot file + the quest.po + quest.mo files in LC_MESSGES all needs to be commited
@@ -25,4 +25,3 @@ There are a few static json-files that also needs to be translated, either compa
 - pokemonTypes - names the types of pokemon
 - types.json - names the quest types and provides base translation of a lot of quest
 - quest_templates - translates quests based on template names - will override any logic and translations done elsewhere.
-

locale/en/pokemonTypes.json

@@ -18,4 +18,4 @@
         "16": "DRAGON",
         "17": "DARK",
         "18": "FAIRY"
-}
+}

locale/en/quest_templates.json

@@ -2,4 +2,4 @@
   "CHALLENGE_BUDDY420_PLAY": "Play with your buddy",
   "CHALLENGE_BUDDY420_CANDY": "Earn a candy walking with your buddy",
   "CHALLENGE_BUDDY420_TREAT": "Give your buddy a treat"
-} 
+}

locale/fr/types.json

@@ -151,4 +151,4 @@
     "protoext": "GEOTARGETED_AR_SCAN",
     "text": "Scanner le Pok\u00e9Stop"
   }
-}
+}

mapadroid/data_manager/modules/__init__.py

@@ -1,17 +1,20 @@
 from typing import Optional
-from . import area_idle, area_iv_mitm, area_mon_mitm, area_pokestops, area_raids_mitm
-from .resource import Resource
+
+from ..dm_exceptions import (InvalidArea, ModeNotSpecified, ModeUnknown,
+                             UnknownIdentifier)
+from . import (area_idle, area_iv_mitm, area_mon_mitm, area_pokestops,
+               area_raids_mitm)
 from .area import Area
 from .auth import Auth
 from .device import Device
 from .devicepool import DevicePool
 from .geofence import GeoFence
 from .monivlist import MonIVList
+from .pogoauth import PogoAuth
+from .resource import Resource
 from .routecalc import RouteCalc
 from .walker import Walker
 from .walkerarea import WalkerArea
-from .pogoauth import PogoAuth
-from ..dm_exceptions import InvalidArea, ModeNotSpecified, ModeUnknown, UnknownIdentifier
 
 
 def area_factory(data_manager, identifier: Optional[int] = None, mode: Optional[str] = None) -> Resource:

mapadroid/data_manager/modules/area.py

@@ -1,7 +1,9 @@
-from typing import Optional, Dict, List, Tuple
-from .resource import Resource
+from typing import Dict, List, Optional, Tuple
+
 from mapadroid.db.DbWrapper import DbWrapper
 
+from .resource import Resource
+
 
 class Area(Resource):
     table = 'settings_area'
@@ -41,7 +43,9 @@ def _load(self) -> None:
         routecalc = self._data_manager.get_resource('routecalc', self._data['fields']['routecalc'])
         self.recalc_status = routecalc.recalc_status
 
-    def save(self, force_insert: Optional[bool] = False, ignore_issues: Optional[List[str]] = []) -> int:
+    def save(self, force_insert: Optional[bool] = False, ignore_issues: Optional[List[str]] = None) -> int:
+        if ignore_issues is None:
+            ignore_issues = []
         has_identifier = True if self.identifier else False
         self.presave_validation(ignore_issues=ignore_issues)
         core_data = {

mapadroid/data_manager/modules/auth.py

@@ -1,5 +1,6 @@
 import json
 from typing import List, Tuple
+
 from .resource import Resource
 
 

mapadroid/data_manager/modules/device.py

@@ -1,9 +1,10 @@
 import re
 from typing import List, Optional
-from .resource import Resource
+
 from mapadroid.data_manager.modules.pogoauth import PogoAuth
-from mapadroid.utils.logging import get_logger, LoggerEnums, get_origin_logger
+from mapadroid.utils.logging import LoggerEnums, get_logger, get_origin_logger
 
+from .resource import Resource
 
 logger = get_logger(LoggerEnums.data_manager)
 pogoauth_fields = {
@@ -397,7 +398,7 @@ def validate_custom(self) -> Optional[dict]:
                 field: data[field]
             }
             in_use = self._data_manager.search('device', params=search)
-            for dev_id, device in in_use.items():
+            for dev_id in in_use.keys():
                 if dev_id != self.identifier:
                     bad_macs.append((field, 'MAC in use'))
         if bad_macs:
@@ -439,7 +440,9 @@ def _load(self) -> None:
                 except StopIteration:
                     self[field] = None
 
-    def save(self, force_insert: Optional[bool] = False, ignore_issues: Optional[List[str]] = []) -> int:
+    def save(self, force_insert: Optional[bool] = False, ignore_issues: Optional[List[str]] = None) -> int:
+        if ignore_issues is None:
+            ignore_issues = []
         core_data = self.get_core()
         for field in pogoauth_fields:
             try:

mapadroid/data_manager/modules/devicepool.py

@@ -1,4 +1,5 @@
 from typing import List, Tuple
+
 from .resource import Resource
 
 

mapadroid/data_manager/modules/geofence.py

@@ -1,10 +1,11 @@
 import json
-from typing import Optional, Dict, List, Tuple
-from .resource import Resource
-from ..dm_exceptions import UnknownIdentifier
+from typing import Dict, List, Optional, Tuple
+
 from mapadroid.geofence.geofenceHelper import GeofenceHelper
-from mapadroid.utils.logging import get_logger, LoggerEnums
+from mapadroid.utils.logging import LoggerEnums, get_logger
 
+from ..dm_exceptions import UnknownIdentifier
+from .resource import Resource
 
 logger = get_logger(LoggerEnums.data_manager)
 
@@ -62,7 +63,7 @@ def get_dependencies(self) -> List[Tuple[str, int]]:
                 table_sql = sql % (table, column,)
                 try:
                     area_dependencies = self._dbc.autofetch_column(table_sql, args=(self.identifier))
-                    for ind, area_id in enumerate(area_dependencies[:]):
+                    for _, area_id in enumerate(area_dependencies[:]):
                         dependencies.append(('area', area_id))
                 except TypeError:
                     pass
@@ -78,7 +79,9 @@ def _load(self) -> None:
         self._data['fields']['fence_type'] = data['fence_type']
         self._data['fields']['fence_data'] = json.loads(data['fence_data'])
 
-    def save(self, force_insert: Optional[bool] = False, ignore_issues: Optional[List[str]] = []) -> int:
+    def save(self, force_insert: Optional[bool] = False, ignore_issues: Optional[List[str]] = None) -> int:
+        if ignore_issues is None:
+            ignore_issues = []
         self.presave_validation(ignore_issues=ignore_issues)
         core_data = self.get_resource()
         core_data['fence_data'] = json.dumps(self._data['fields']['fence_data'])

mapadroid/data_manager/modules/monivlist.py

@@ -1,8 +1,10 @@
+from typing import List, Optional, Tuple
+
 import mysql.connector
-from typing import Optional, List, Tuple
-from .resource import Resource
-from mapadroid.utils.logging import get_logger, LoggerEnums
 
+from mapadroid.utils.logging import LoggerEnums, get_logger
+
+from .resource import Resource
 
 logger = get_logger(LoggerEnums.data_manager)
 
@@ -43,7 +45,7 @@ def get_dependencies(self) -> List[Tuple[str, int]]:
         dependencies = []
         for table in tables:
             area_dependencies = self._dbc.autofetch_column(sql % (table,), args=(self.identifier,))
-            for ind, area_id in enumerate(area_dependencies[:]):
+            for _, area_id in enumerate(area_dependencies[:]):
                 dependencies.append(('area', area_id))
         return dependencies
 
@@ -53,7 +55,9 @@ def _load(self) -> None:
         mons = self._dbc.autofetch_column(mon_query, args=(self.identifier))
         self._data['fields']['mon_ids_iv'] = mons
 
-    def save(self, force_insert: Optional[bool] = False, ignore_issues: Optional[List[str]] = []) -> int:
+    def save(self, force_insert: Optional[bool] = False, ignore_issues: Optional[List[str]] = None) -> int:
+        if ignore_issues is None:
+            ignore_issues = []
         self.presave_validation(ignore_issues=ignore_issues)
         core_data = {
             'monlist': self._data['fields']['monlist']

mapadroid/data_manager/modules/pogoauth.py

@@ -1,7 +1,9 @@
 from typing import Dict, List, Tuple
-from .resource import Resource
+
 from mapadroid.data_manager.dm_exceptions import UnknownIdentifier
 
+from .resource import Resource
+
 
 class PogoAuth(Resource):
     table = 'settings_pogoauth'
@@ -85,7 +87,7 @@ def get_avail_devices(cls, data_manager, auth_id: int = None) -> Dict[int, Resou
             except KeyError:
                 # Auth isn't found. Either it doesnt exist or auth_type mismatch
                 return avail_devices
-        for pauth_id, pauth in pogoauths.items():
+        for pauth in pogoauths.values():
             if pauth['device_id'] is not None and device_id is not None and pauth['device_id'] != device_id:
                 invalid_devices.append(pauth['device_id'])
         invalid_devices = list(set(invalid_devices))
@@ -102,7 +104,9 @@ def get_dependencies(self) -> List[Tuple[str, int]]:
             dependencies[ind] = ('device', device_id)
         return dependencies
 
-    def save(self, core_data=None, force_insert=False, ignore_issues=[], **kwargs):
+    def save(self, core_data=None, force_insert=False, ignore_issues=None, **kwargs):
+        if ignore_issues is None:
+            ignore_issues = []
         self.presave_validation(ignore_issues=ignore_issues)
         if self["login_type"] == "google":
             self["username"] = self["username"].lower()

mapadroid/data_manager/modules/resource.py

@@ -23,6 +23,8 @@
 
 class ResourceTracker(UserDict):
     def __init__(self, config, data_manager, initialdata=None):
+        if initialdata is None:
+            initialdata = {}
         self.__config = config
         self._data_manager = data_manager
         self.issues = {
@@ -411,6 +413,8 @@ def _load_defaults(self):
                 continue
 
     def presave_validation(self, ignore_issues=None):
+        if ignore_issues is None:
+            ignore_issues = []
         # Validate required data has been set
         top_levels = ['fields', 'settings']
         issues = {}

mapadroid/data_manager/modules/routecalc.py

@@ -1,12 +1,14 @@
 import json
+from typing import Dict, List, Optional, Tuple
+
 import numpy as np
-from typing import Optional, Dict, List, Tuple
-from .resource import Resource
-from ..dm_exceptions import UnknownIdentifier
+
 from mapadroid.route.routecalc.ClusteringHelper import ClusteringHelper
 from mapadroid.utils.collections import Location
-from mapadroid.utils.logging import get_logger, LoggerEnums
+from mapadroid.utils.logging import LoggerEnums, get_logger
 
+from ..dm_exceptions import UnknownIdentifier
+from .resource import Resource
 
 logger = get_logger(LoggerEnums.data_manager)
 
@@ -44,7 +46,7 @@ def get_dependencies(self) -> None:
             table_sql = sql % (table,)
             try:
                 area_dependencies = self._dbc.autofetch_column(table_sql, args=(self.identifier))
-                for ind, area_id in enumerate(area_dependencies[:]):
+                for _, area_id in enumerate(area_dependencies[:]):
                     dependencies.append(('area', area_id))
             except TypeError:
                 pass
@@ -59,8 +61,10 @@ def _load(self) -> None:
         self._data['fields']['routefile'] = json.loads(data['routefile'])
         self.recalc_status = data['recalc_status']
 
-    def save(self, force_insert: Optional[bool] = False, ignore_issues: Optional[List[str]] = [],
+    def save(self, force_insert: Optional[bool] = False, ignore_issues: Optional[List[str]] = None,
              update_time: bool = False) -> int:
+        if ignore_issues is None:
+            ignore_issues = []
         self.presave_validation(ignore_issues=ignore_issues)
         literals = []
         core_data = self.get_resource()
@@ -161,7 +165,8 @@ def get_json_route(self, coords: List[Tuple[str, str]], max_radius: int, max_coo
             logger.info("Calculating a short route through all those coords. Might take a while")
             from timeit import default_timer as timer
             start = timer()
-            from mapadroid.route.routecalc.calculate_route_all import route_calc_all
+            from mapadroid.route.routecalc.calculate_route_all import \
+                route_calc_all
             sol_best = route_calc_all(less_coords, route_name, num_processes, algorithm)
 
             end = timer()

mapadroid/data_manager/modules/walker.py

@@ -1,4 +1,5 @@
-from typing import Optional, List, Tuple
+from typing import List, Optional, Tuple
+
 from ..dm_exceptions import DataManagerException
 from .resource import Resource
 from .walkerarea import WalkerArea
@@ -65,7 +66,9 @@ def _load(self) -> None:
         mons = self._dbc.autofetch_column(mon_query, args=(self.identifier))
         self._data['fields']['setup'] = mons
 
-    def save(self, force_insert: Optional[bool] = False, ignore_issues: Optional[List[str]] = []) -> int:
+    def save(self, force_insert: Optional[bool] = False, ignore_issues: Optional[List[str]] = None) -> int:
+        if ignore_issues is None:
+            ignore_issues = []
         self.presave_validation(ignore_issues=ignore_issues)
         core_data = {
             'walkername': self._data['fields']['walkername']

mapadroid/data_manager/modules/walkerarea.py

@@ -1,4 +1,5 @@
-from typing import Optional, List, Tuple
+from typing import List, Optional, Tuple
+
 from .resource import Resource
 
 
@@ -90,7 +91,9 @@ def _load(self) -> None:
         except KeyError:
             self._data['fields']['walkermax'] = ''
 
-    def save(self, force_insert: Optional[bool] = False, ignore_issues: Optional[List[str]] = []) -> int:
+    def save(self, force_insert: Optional[bool] = False, ignore_issues: Optional[List[str]] = None) -> int:
+        if ignore_issues is None:
+            ignore_issues = []
         self.presave_validation(ignore_issues=ignore_issues)
         try:
             if self._data['fields']['walkermax'] == '' and self._data['fields']['eventid'] == '':

mapadroid/db/DbFactory.py

@@ -1,9 +1,10 @@
 import sys
 from multiprocessing.managers import SyncManager
-from mapadroid.db.DbWrapper import DbWrapper
-from mapadroid.db.PooledQueryExecutor import PooledQueryExecutor, PooledQuerySyncManager
-from mapadroid.utils.logging import get_logger, LoggerEnums
 
+from mapadroid.db.DbWrapper import DbWrapper
+from mapadroid.db.PooledQueryExecutor import (PooledQueryExecutor,
+                                              PooledQuerySyncManager)
+from mapadroid.utils.logging import LoggerEnums, get_logger
 
 logger = get_logger(LoggerEnums.database)