wxGUI: Fixed E722 in frame.py (#4440)

OSGeo · Oct 10, 2024 · cbe2b9e · cbe2b9e
1 parent 498676c
commit cbe2b9e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/.flake8 b/.flake8
@@ -27,9 +27,6 @@ per-file-ignores =
     gui/scripts/d.wms.py: E501
     gui/wxpython/image2target/*: F841, E722
     gui/wxpython/image2target/g.gui.image2target.py: E501, F841
-    gui/wxpython/lmgr/frame.py: E722
-    # layertree still includes some formatting issues (it is ignored by Black)
-    gui/wxpython/lmgr/layertree.py: E722
     gui/wxpython/modules/*: F841, E722
     gui/wxpython/nviz/*: F841, E266, E722, F403, F405
     gui/wxpython/photo2image/*: F841, E722, E265

diff --git a/gui/wxpython/lmgr/frame.py b/gui/wxpython/lmgr/frame.py
@@ -271,7 +271,7 @@ def show_menu_errors(messages):
                     y = client_disp[1]
                 self.SetPosition((x, y))
                 self.SetSize((w, h))
-            except:
+            except (ValueError, IndexError):
                 pass
         else:
             # does center (of screen) make sense for lmgr?
@@ -884,7 +884,7 @@ def OnCBPageChanged(self, event):
         try:
             self.GetMapDisplay().SetFocus()
             self.GetMapDisplay().Raise()
-        except:
+        except AttributeError:
             pass
 
         event.Skip()
@@ -1123,7 +1123,7 @@ def GetMenuCmd(self, event):
 
         try:
             cmdlist = cmd.split(" ")
-        except:  # already list?
+        except AttributeError:  # already list?
             cmdlist = cmd
 
         # check list of dummy commands for GUI modules that do not have GRASS
@@ -1135,7 +1135,7 @@ def GetMenuCmd(self, event):
             layer = self.GetLayerTree().layer_selected
             name = self.GetLayerTree().GetLayerInfo(layer, key="maplayer").name
             type = self.GetLayerTree().GetLayerInfo(layer, key="type")
-        except:
+        except AttributeError:
             layer = None
 
         if layer and len(cmdlist) == 1:  # only if no parameters given
@@ -1183,7 +1183,7 @@ def OnVDigit(self, event):
         # available only for vector map layers
         try:
             mapLayer = tree.GetLayerInfo(layer, key="maplayer")
-        except:
+        except AttributeError:
             mapLayer = None
 
         if not mapLayer or mapLayer.GetType() != "vector":
@@ -1860,7 +1860,7 @@ def OnShowAttributeTable(self, event, selection=None):
         # available only for vector map layers
         try:
             maptype = tree.GetLayerInfo(layer, key="maplayer").type
-        except:
+        except AttributeError:
             maptype = None
 
         if not maptype or maptype != "vector":

diff --git a/gui/wxpython/lmgr/layertree.py b/gui/wxpython/lmgr/layertree.py
@@ -1742,7 +1742,7 @@ def OnDeleteLayer(self, event):
 
         try:
             item.properties.Close(True)
-        except:
+        except AttributeError:
             pass
 
         if item != self.root:
@@ -1758,7 +1758,7 @@ def OnDeleteLayer(self, event):
         try:
             if self.GetLayerInfo(item, key="type") != "group":
                 self.Map.DeleteLayer(self.GetLayerInfo(item, key="maplayer"))
-        except:
+        except AttributeError:
             pass
 
         # redraw map if auto-rendering is enabled
@@ -1997,10 +1997,7 @@ def OnEndDrag(self, event):
 
     def OnDrop(self, dropTarget, dragItem):
         # save everything associated with item to drag
-        try:
-            old = dragItem  # make sure this member exists
-        except:
-            return
+        old = dragItem  # make sure this member exists
 
         Debug.msg(4, "LayerTree.OnDrop(): layer=%s" % (self.GetItemText(dragItem)))
 
@@ -2046,7 +2043,7 @@ def RecreateItem(self, dragItem, dropTarget, parent=None):
                 newctrl.SetValue(
                     self.GetLayerInfo(dragItem, key="maplayer").GetCmd(string=True)
                 )
-            except:
+            except Exception:
                 pass
             newctrl.Bind(wx.EVT_TEXT_ENTER, self.OnCmdChanged)
             data = self.GetPyData(dragItem)