wxGUI: Refactored try-except block to be more robust in dialogs.py (#…

…4383)
OSGeo · Sep 26, 2024 · 845dfd0 · 845dfd0
1 parent 2098577
commit 845dfd0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.flake8 b/.flake8
@@ -26,7 +26,6 @@ per-file-ignores =
     doc/gui/wxpython/example/dialogs.py: F401
     gui/scripts/d.wms.py: E501
     gui/wxpython/dbmgr/base.py: E722
-    gui/wxpython/dbmgr/dialogs.py: E722
     gui/wxpython/dbmgr/sqlbuilder.py: E722
     gui/wxpython/dbmgr/manager.py: E722
     gui/wxpython/docs/wxgui_sphinx/conf.py: E402, W291

diff --git a/gui/wxpython/dbmgr/dialogs.py b/gui/wxpython/dbmgr/dialogs.py
@@ -222,10 +222,11 @@ def GetSQLString(self, updateValues=False):
                     ctype = columns[name]["ctype"]
                     value = columns[name]["values"][idx]
                     id = columns[name]["ids"][idx]
+                    widget = self.FindWindowById(id)
                     try:
-                        newvalue = self.FindWindowById(id).GetValue()
-                    except:
-                        newvalue = self.FindWindowById(id).GetLabel()
+                        newvalue = widget.GetValue()
+                    except AttributeError:
+                        newvalue = widget.GetLabel()
 
                     if newvalue:
                         try: