fix: flake8 issues

Author: ahennr

connection/shogunressource.py

@@ -188,31 +188,31 @@ def updateLayers(self):
         response = self.http.request(url)
         self.layers = json.loads(response[1])
 
-    def updateSingleApplication(self, id):
-        url = self.baseurl + "rest/applications/" + str(id)
+    def updateSingleApplication(self, _id):
+        url = self.baseurl + "rest/applications/" + str(_id)
         response = self.http.request(url)
         updatedApplication = json.loads(response[1])
         for app in enumerate(self.applications):
-            if app[1]["id"] == id:
+            if app[1]["id"] == _id:
                 self.layers[app[0]] = updatedApplication
         return updatedApplication
 
-    def updateSingleLayer(self, id):
-        url = self.baseurl + "rest/layers/" + str(id)
+    def updateSingleLayer(self, _id):
+        url = self.baseurl + "rest/layers/" + str(_id)
         response = self.http.request(url)
         updatedLayer = json.loads(response[1])
         for layer in enumerate(self.layers):
-            if layer[1]["id"] == id:
+            if layer[1]["id"] == _id:
                 self.layers[layer[0]] = updatedLayer
         return updatedLayer
 
     # one method for retrieving user and groups permissions (permissionType)
     # for layers or applications (objectType)
-    def getObjectPermissions(self, id, objectType, permissionType):
+    def getObjectPermissions(self, _id, objectType, permissionType):
         url = self.baseurl + "rest/entitypermission/Project" + objectType
         # objectType = 'Application' or 'Layer'
         # permissionType = 'User' or 'UserGroup'
-        url += "/" + str(id) + "/Project" + permissionType + "?"
+        url += "/" + str(_id) + "/Project" + permissionType + "?"
         response = self.http.request(url)
         return json.loads(response[1])
 
@@ -224,13 +224,13 @@ def updateExtentsAndMapConfigs(self):
         response = self.http.request(url)
         self.mapconfigs = json.loads(response[1])
 
-    def getHomeviewByIds(self, mapconfigid, extentid):
+    def getHomeviewByIds(self, mapconfigid, extent_id):
         homeview = {}
         for mapcf in self.mapconfigs:
             if mapcf["id"] == mapconfigid:
                 homeview["mapconfig"] = mapcf
         for ext in self.extents:
-            if ext["id"] == extentid:
+            if ext["id"] == extent_id:
                 homeview["extent"] = ext
         return homeview
 
@@ -244,14 +244,14 @@ def getLayerIdsAndNames(self, reload=False):
             self.updateLayers()
         return [(x["id"], x["name"], x["dataType"], x["source"]) for x in self.layers]
 
-    def getApplicationAttrsById(self, id):
+    def getApplicationAttrsById(self, _id):
         for x in self.applications:
-            if x["id"] == id:
+            if x["id"] == _id:
                 return x
 
-    def getLayerAttrsById(self, id):
+    def getLayerAttrsById(self, _id):
         for x in self.layers:
-            if x["id"] == id:
+            if x["id"] == _id:
                 return x
 
     def getGroupNames(self):
@@ -343,9 +343,9 @@ def uploadStyle(self, qgisLayerItem):
     def prepareIconForUpload(self, svgIconName):
         svgPaths = QgsApplication.svgPaths()
         svgIconPath = None
-        for dir in svgPaths:
-            if os.path.isfile(os.path.join(dir, svgIconName)):
-                svgIconPath = os.path.join(dir, svgIconName)
+        for _dir in svgPaths:
+            if os.path.isfile(os.path.join(_dir, svgIconName)):
+                svgIconPath = os.path.join(_dir, svgIconName)
         if svgIconPath is None or not svgIconPath.endswith("svg"):
             return False
         name = os.path.splitext(svgIconName)[0]
@@ -361,8 +361,8 @@ def prepareIconForUpload(self, svgIconName):
         return False
 
     # # NOTE: the following method is still not used:
-    # def downloadIconThumbnail(self, id):
-    #     iconPath = os.path.join(self.icondir, str(icon['id']) + '.png')
+    # def downloadIconThumbnail(self, _id):
+    #     iconPath = os.path.join(self.icondir, str(icon['_id']) + '.png')
     #     if os.path.isfile(iconPath):
     #         return iconPath
     #     else:
@@ -388,8 +388,7 @@ def uploadImage(self, pathToImage):
         if response[0]["status"] > 199 and response[0]["status"] < 210:
             # if icon upload was successfull, server returns id of the new icon
             # in it's database
-            id = json.loads(response[1])["data"]["id"]
-            return id
+            return json.loads(response[1])["data"]["id"]
         else:
             return False
 
@@ -448,7 +447,7 @@ def requestCrsUpdateOnLayer(self, importJobId):
             "&taskId=0&fileProjection=EPSG%3A3857&layerName=&dataType=Vector"
         )
         h = {"Content-type": "application/x-www-form-urlencoded; charset=UTF-8"}
-        response = self.http.request(url, method="POST", body=data, headers=h)
+        self.http.request(url, method="POST", body=data, headers=h)
 
     def getFieldNamesFromWfs(self, layerRessourceName):
         url = (
@@ -467,25 +466,25 @@ def getFieldNamesFromWfs(self, layerRessourceName):
                 return fieldNames
         return False
 
-    def deleteLayer(self, id):
-        url = self.baseurl + "rest/projectlayers/" + str(id)
+    def deleteLayer(self, _id):
+        url = self.baseurl + "rest/projectlayers/" + str(_id)
         response = self.http.request(url, method="DELETE")
         self.userInfo(response[0]["status"], "Layer", "deleted")
 
-    def deleteApplication(self, id):
-        url = self.baseurl + "rest/projectapps/" + str(id)
+    def deleteApplication(self, _id):
+        url = self.baseurl + "rest/projectapps/" + str(_id)
         response = self.http.request(url, method="DELETE")
         self.userInfo(response[0]["status"], "Application", "deleted")
 
-    def copyApplication(self, id, applicationName):
+    def copyApplication(self, _id, applicationName):
         url = self.baseurl + "projectapps/copy.action"
-        data = "appId=" + str(id) + "&appName=" + applicationName + "-Copy"
+        data = "appId=" + str(_id) + "&appName=" + applicationName + "-Copy"
         h = {"Content-type": "application/x-www-form-urlencoded; charset=UTF-8"}
         response = self.http.request(url, method="POST", body=data, headers=h)
         self.userInfo(response[0]["status"], "Application", "copied")
 
-    def viewApplicationOnline(self, id):
-        url = self.baseurl + "client/?id=" + str(id)
+    def viewApplicationOnline(self, _id):
+        url = self.baseurl + "client/?id=" + str(_id)
         webbrowser.open(url)
 
     def createLayerTreeItem(self, data):
@@ -502,9 +501,9 @@ def updateLayerTreeItem(self, layerTreeItemId, data):
         response = self.http.request(url, method="PUT", body=body, headers=h)
         return response[0]["status"]
 
-    def deleteLayerTreeItem(self, layerTreeItemIdd):
-        url = self.baseurl + "rest/layertree/" + str(layerTreeItemIdd)
+    def deleteLayerTreeItem(self, layerTreeItemId):
+        url = self.baseurl + "rest/layertree/" + str(layerTreeItemId)
         h = {"Content-type": "application/json"}
-        body = json.dumps({"id": layerTreeItemIdd})
+        body = json.dumps({"id": layerTreeItemId})
         response = self.http.request(url, method="DELETE", body=body, headers=h)
         return response[0]["status"]

gui/dialog_bases/applicationSettings.py

@@ -4,17 +4,12 @@
  This code is licensed under the GPL 2.0 license.
 """
 
-import sys
-
-from qgis.gui import QgsExtentGroupBox
-
 # we are faking the old way of QtGui, not the best style, but makes it easier
 # for switching betweeng version 2 and 3
 from qgis.PyQt import QtWidgets as QtGui
 from qgis.PyQt.QtCore import QRect, Qt
 from qgis.PyQt.QtGui import QFont
 
-
 __author__ = "ntreff"
 __date__ = "July 2025"
 
@@ -146,12 +141,12 @@ def populateTree(self, layerTree):
             self.invisibleRootItem(), layerTree["children"]
         )
 
-        iter = QtGui.QTreeWidgetItemIterator(self)
-        val = iter.value()
+        iterator = QtGui.QTreeWidgetItemIterator(self)
+        val = iterator.value()
         while val:
             val.setExpanded(True)
-            iter += 1
-            val = iter.value()
+            iterator += 1
+            val = iterator.value()
 
     def constructTreeChildrenRecursive(self, parent, children):
         for child in children:
@@ -170,8 +165,8 @@ def getLayerTreeChanges(self):
         allChanges = {"newItems": [], "changeItems": [], "deleteItems": []}
         # iterate through all items in the layertree and find new or
         # changed items
-        iter = QtGui.QTreeWidgetItemIterator(self)
-        treeitem = iter.value()
+        iterator = QtGui.QTreeWidgetItemIterator(self)
+        treeitem = iterator.value()
         while treeitem:
             treeitem.updateNewAttributes()
             change = treeitem.getItemChange()
@@ -181,11 +176,11 @@ def getLayerTreeChanges(self):
                 else:
                     allChanges["changeItems"].append(change)
 
-            iter += 1
-            treeitem = iter.value()
+            iterator += 1
+            treeitem = iterator.value()
 
         if len(self.deletedItemIds) > 0:
-            allChanges["deleteItems"] = [x for x in self.deletedItemIds]
+            allChanges["deleteItems"] = list(self.deletedItemIds)
             self.deletedItemIds = []
 
         for x in allChanges:
@@ -225,12 +220,12 @@ def dropEvent(self, e):
                 newItem.setCheckState(0, Qt.Checked)
             else:
                 self.changePositionInTree(dropItem)
-        iter = QtGui.QTreeWidgetItemIterator(self)
-        val = iter.value()
+        iterator = QtGui.QTreeWidgetItemIterator(self)
+        val = iterator.value()
         while val:
             val.setSelected(False)
-            iter += 1
-            val = iter.value()
+            iterator += 1
+            val = iterator.value()
 
     def changePositionInTree(self, newParentItem):
         selectedItem = self.selectedItems()[0]
@@ -563,18 +558,18 @@ def setEditState(self, b):  # b = true or false
                 editable.setEnabled(b)
 
     def getAllEditables(self):
-        list = []
+        editable_list = []
         for edit in self.tabedits:
-            list.append(edit)
+            editable_list.append(edit)
         for box in self.tabboxes:
-            list.append(box)
-        for object in self.moreObjects:
-            list.append(object)
+            editable_list.append(box)
+        for obj in self.moreObjects:
+            editable_list.append(obj)
         for box in self.tools.values():
-            list.append(box)
-        list.append(self.layerlistwidget)
-        list.append(self.layertreewidget)
-        return list
+            editable_list.append(box)
+        editable_list.append(self.layerlistwidget)
+        editable_list.append(self.layertreewidget)
+        return editable_list
 
     def populateTable(self, table, usersList):
         if table == "users":

gui/dialog_bases/layerSettings.py

@@ -5,6 +5,7 @@
 """
 
 import sys
+
 from qgis.gui import QgsMapLayerComboBox
 
 if sys.version_info[0] >= 3:
@@ -14,8 +15,8 @@
     from qgis.PyQt.QtCore import QRect, Qt
     from qgis.PyQt.QtGui import QDoubleValidator
 else:
-    from PyQt4.QtCore import QRect, Qt
     from PyQt4 import QtGui
+    from PyQt4.QtCore import QRect, Qt
 
 __author__ = "ntreff"
 __date__ = "July 2025"
@@ -170,14 +171,14 @@ def setEditState(self, b):  # b = true or false
                 editable.setEnabled(b)
 
     def getAllEditables(self):
-        list = []
+        editable_list = []
         for edit in self.tabedits:
-            list.append(edit)
+            editable_list.append(edit)
         for box in self.tabboxes:
-            list.append(box)
-        for object in self.moreObjects:
-            list.append(object)
-        return list
+            editable_list.append(box)
+        for obj in self.moreObjects:
+            editable_list.append(obj)
+        return editable_list
 
     def deactivateHoverEditing(self):
         self.hoverBox.setHidden(True)