wxGUI: Added TypeError to lmgr/ (#4537)

OSGeo · Oct 17, 2024 · a740da1 · a740da1
1 parent 39ff021
commit a740da1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/gui/wxpython/lmgr/frame.py b/gui/wxpython/lmgr/frame.py
@@ -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 AttributeError:
+        except (AttributeError, TypeError):
             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 AttributeError:
+        except (AttributeError, TypeError):
             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 AttributeError:
+        except (AttributeError, TypeError):
             maptype = None
 
         if not maptype or maptype != "vector":

diff --git a/gui/wxpython/lmgr/layertree.py b/gui/wxpython/lmgr/layertree.py
@@ -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:
+        except (AttributeError, TypeError):
             pass
 
         # redraw map if auto-rendering is enabled
@@ -2399,7 +2399,7 @@ def __FindSubItemByName(self, item, value):
         while item and item.IsOk():
             try:
                 itemLayer = self.GetLayerInfo(item, key="maplayer")
-            except KeyError:
+            except (KeyError, TypeError):
                 return None
 
             if itemLayer and value == itemLayer.GetName():