From 94045348c1fcd28cb3dfff09ff1eea6e26215a81 Mon Sep 17 00:00:00 2001 From: Arohan Ajit Date: Thu, 3 Oct 2024 16:29:39 -0400 Subject: [PATCH 1/6] fixed e722 --- gui/wxpython/lmgr/frame.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gui/wxpython/lmgr/frame.py b/gui/wxpython/lmgr/frame.py index 4eae371f68..a8f2babcaf 100644 --- 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? @@ -885,7 +885,7 @@ def OnCBPageChanged(self, event): try: self.GetMapDisplay().SetFocus() self.GetMapDisplay().Raise() - except: + except Exception: pass event.Skip() @@ -1125,7 +1125,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 @@ -1137,7 +1137,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, KeyError): layer = None if layer and len(cmdlist) == 1: # only if no parameters given @@ -1185,7 +1185,7 @@ def OnVDigit(self, event): # available only for vector map layers try: mapLayer = tree.GetLayerInfo(layer, key="maplayer") - except: + except (AttributeError, KeyError): mapLayer = None if not mapLayer or mapLayer.GetType() != "vector": @@ -1862,7 +1862,7 @@ def OnShowAttributeTable(self, event, selection=None): # available only for vector map layers try: maptype = tree.GetLayerInfo(layer, key="maplayer").type - except: + except (AttributeError, KeyError): maptype = None if not maptype or maptype != "vector": From 1f5d77744a775f1c3ddf0f27241db69f1e338205 Mon Sep 17 00:00:00 2001 From: Arohan Ajit Date: Tue, 8 Oct 2024 18:55:04 -0400 Subject: [PATCH 2/6] updated acc. to comments --- gui/wxpython/lmgr/frame.py | 6 +++--- gui/wxpython/lmgr/layertree.py | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gui/wxpython/lmgr/frame.py b/gui/wxpython/lmgr/frame.py index a8f2babcaf..7f19707d53 100644 --- a/gui/wxpython/lmgr/frame.py +++ b/gui/wxpython/lmgr/frame.py @@ -885,7 +885,7 @@ def OnCBPageChanged(self, event): try: self.GetMapDisplay().SetFocus() self.GetMapDisplay().Raise() - except Exception: + except AttributeError: pass event.Skip() @@ -1137,7 +1137,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 (AttributeError, KeyError): + except AttributeError: layer = None if layer and len(cmdlist) == 1: # only if no parameters given @@ -1185,7 +1185,7 @@ def OnVDigit(self, event): # available only for vector map layers try: mapLayer = tree.GetLayerInfo(layer, key="maplayer") - except (AttributeError, KeyError): + except AttributeError: mapLayer = None if not mapLayer or mapLayer.GetType() != "vector": diff --git a/gui/wxpython/lmgr/layertree.py b/gui/wxpython/lmgr/layertree.py index 4779a40db9..4bd2bb76cb 100644 --- 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 Exception: 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, KeyError): pass # redraw map if auto-rendering is enabled @@ -1999,7 +1999,7 @@ def OnDrop(self, dropTarget, dragItem): # save everything associated with item to drag try: old = dragItem # make sure this member exists - except: + except Exception: return Debug.msg(4, "LayerTree.OnDrop(): layer=%s" % (self.GetItemText(dragItem))) @@ -2046,7 +2046,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) From 0a8837e8c4be4b931940658eb84510377be70c35 Mon Sep 17 00:00:00 2001 From: Arohan Ajit Date: Tue, 8 Oct 2024 18:59:35 -0400 Subject: [PATCH 3/6] fixed e266 --- gui/wxpython/lmgr/layertree.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/wxpython/lmgr/layertree.py b/gui/wxpython/lmgr/layertree.py index 4bd2bb76cb..8c7da75990 100644 --- a/gui/wxpython/lmgr/layertree.py +++ b/gui/wxpython/lmgr/layertree.py @@ -756,7 +756,7 @@ def OnLayerContextMenu(self, event): # self.popupMenu.Enable(self.popupID['bgmap'], False) self.popupMenu.Enable(self.popupID["topo"], False) # else: - ### self.popupMenu.Enable(self.popupID['bgmap'], True) + # self.popupMenu.Enable(self.popupID['bgmap'], True) item = wx.MenuItem( self.popupMenu, id=self.popupID["meta"], text=_("Metadata") From 2ee5130ba0a998fecb77d27269f7d227b4c1359f Mon Sep 17 00:00:00 2001 From: Arohan Ajit Date: Wed, 9 Oct 2024 09:25:15 -0400 Subject: [PATCH 4/6] updated flake8 --- .flake8 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.flake8 b/.flake8 index 0a48712c80..765961a4ba 100644 --- a/.flake8 +++ b/.flake8 @@ -28,10 +28,6 @@ per-file-ignores = gui/wxpython/image2target/*: F841, E722 gui/wxpython/image2target/g.gui.image2target.py: E501, F841 gui/wxpython/iscatt/*: F841 - gui/wxpython/lmgr/frame.py: F841, E722 - # layertree still includes some formatting issues (it is ignored by Black) - gui/wxpython/lmgr/layertree.py: E722, E266, W504, E225 - gui/wxpython/lmgr/workspace.py: F841 gui/wxpython/modules/*: F841, E722 gui/wxpython/nviz/*: F841, E266, E722, F403, F405 gui/wxpython/photo2image/*: F841, E722, E265 From 0836087024efb357515abe7ff3cace7df6cd3538 Mon Sep 17 00:00:00 2001 From: Arohan Ajit Date: Wed, 9 Oct 2024 09:39:06 -0400 Subject: [PATCH 5/6] updated --- .flake8 | 4 ++++ gui/wxpython/lmgr/frame.py | 2 +- gui/wxpython/lmgr/layertree.py | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.flake8 b/.flake8 index 765961a4ba..1c04c4aa1d 100644 --- a/.flake8 +++ b/.flake8 @@ -28,6 +28,10 @@ per-file-ignores = gui/wxpython/image2target/*: F841, E722 gui/wxpython/image2target/g.gui.image2target.py: E501, F841 gui/wxpython/iscatt/*: F841 + gui/wxpython/lmgr/frame.py: F841 + # layertree still includes some formatting issues (it is ignored by Black) + gui/wxpython/lmgr/layertree.py: E266, W504, E225 + gui/wxpython/lmgr/workspace.py: F841 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 index 7f19707d53..8f5518c3f6 100644 --- a/gui/wxpython/lmgr/frame.py +++ b/gui/wxpython/lmgr/frame.py @@ -1862,7 +1862,7 @@ def OnShowAttributeTable(self, event, selection=None): # available only for vector map layers try: maptype = tree.GetLayerInfo(layer, key="maplayer").type - except (AttributeError, KeyError): + except AttributeError: maptype = None if not maptype or maptype != "vector": diff --git a/gui/wxpython/lmgr/layertree.py b/gui/wxpython/lmgr/layertree.py index 8c7da75990..d3031a1c35 100644 --- 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 Exception: + 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 (AttributeError, KeyError): + except AttributeError: pass # redraw map if auto-rendering is enabled From 19b7bdd282def76f15d38fbfbbd0d889b1e76d95 Mon Sep 17 00:00:00 2001 From: Arohan Ajit Date: Wed, 9 Oct 2024 14:05:28 -0400 Subject: [PATCH 6/6] updated --- gui/wxpython/lmgr/layertree.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gui/wxpython/lmgr/layertree.py b/gui/wxpython/lmgr/layertree.py index fecfa15529..86531bcb5a 100644 --- a/gui/wxpython/lmgr/layertree.py +++ b/gui/wxpython/lmgr/layertree.py @@ -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 Exception: - return + old = dragItem # make sure this member exists Debug.msg(4, "LayerTree.OnDrop(): layer=%s" % (self.GetItemText(dragItem)))