From dd7754a34a41ccd8b3e4e4643b28f462426fecfa Mon Sep 17 00:00:00 2001
From: stevenhua0320 <r.hua@mail.utoronto.ca>
Date: Thu, 25 Sep 2025 16:29:42 -0400
Subject: [PATCH 1/3] delete unused module, change lambda def to def

---
 src/diffpy/srxplanargui/selectfiles.py | 56 +++++++++-----------------
 1 file changed, 18 insertions(+), 38 deletions(-)

diff --git a/src/diffpy/srxplanargui/selectfiles.py b/src/diffpy/srxplanargui/selectfiles.py
index 2ef6304..8248080 100644
--- a/src/diffpy/srxplanargui/selectfiles.py
+++ b/src/diffpy/srxplanargui/selectfiles.py
@@ -12,53 +12,29 @@
 #
 ##############################################################################
 
-import fnmatch
-import functools
+
 import os
-import re
-import sys
-from collections import OrderedDict
 
 from pyface.api import ImageResource
 from traits.api import (
     Any,
-    Array,
     Bool,
     Button,
-    CFloat,
-    CInt,
-    DelegatesTo,
-    Dict,
     Directory,
     Enum,
     Event,
-    File,
-    Float,
     HasTraits,
     Instance,
-    Int,
-    List,
     Property,
-    Range,
     Str,
-    cached_property,
     on_trait_change,
     property_depends_on,
 )
-from traits.etsconfig.api import ETSConfig
 from traitsui.api import (
-    Action,
-    ArrayEditor,
-    ButtonEditor,
-    CheckListEditor,
-    EnumEditor,
     Group,
     Handler,
     HGroup,
-    HistoryEditor,
     Item,
-    RangeEditor,
-    Tabbed,
     TableEditor,
     TextEditor,
     TitleEditor,
@@ -66,13 +42,13 @@
     View,
     spring,
 )
-from traitsui.menu import CancelButton, Menu, OKButton, OKCancelButtons, ToolBar
-from traitsui.qt4.table_editor import TableEditor as TableEditorBE
+from traitsui.editors.table_editor import TableEditor as TableEditorBE
+from traitsui.menu import CancelButton, OKButton
 from traitsui.table_column import ObjectColumn
 
 try:
     from diffpy.pdfgetx.functs import sortKeyNumericString
-except:
+except ImportError:
     from diffpy.pdfgete.functs import sortKeyNumericString
 
 from diffpy.srxplanar.loadimage import openImage, saveImage
@@ -97,7 +73,7 @@ def object_selectallbb_changed(self, info):
                 info.object.datafiles[i] for i in editor.filtered_indices
             ]
             editor.refresh()
-        except:
+        except ImportError:
             pass
         return
 
@@ -211,9 +187,9 @@ def _changeInputdir(self):
     def _plotbb_fired(self):
         try:
             imagefile = self.selected[0].fullname
-        except:
+        except IndexError:
             imagefile = None
-        if imagefile != None:
+        if imagefile is not None:
             if os.path.exists(imagefile):
                 imageplot = ImagePlot(
                     imagefile=imagefile, srx=self.srx, srxconfig=self.srxconfig
@@ -335,18 +311,22 @@ def _createFileNameFilter(pattern, casesensitive):
     """
     try:
         from diffpy.pdfgetx.multipattern import MultiPattern
-    except:
+    except ImportError:
         from diffpy.pdfgete.multipattern import MultiPattern
     # MultiPattern always matches for an empty pattern, thus there
     # is no need to handle empty search string in a special way.
     patterns = pattern.split()
-    if casesensitive:
-        mp = MultiPattern(patterns)
-        rv = lambda x: mp.match(x.basename)
-    else:
+    if not casesensitive:
         patterns = [p.lower() for p in patterns]
-        mp = MultiPattern(patterns)
-        rv = lambda x: mp.match(x.basename.lower())
+
+    mp = MultiPattern(patterns)
+
+    def rv(x):
+        name = x.basename
+        if not casesensitive:
+            name = name.lower()
+        return mp.match(name)
+
     return rv
 
 

From e54f20b2ef588a4b2981c67f7d7beeb42f4b31c7 Mon Sep 17 00:00:00 2001
From: stevenhua0320 <r.hua@mail.utoronto.ca>
Date: Thu, 25 Sep 2025 21:51:44 -0400
Subject: [PATCH 2/3] changed to AttributeError in bare except

---
 src/diffpy/srxplanargui/selectfiles.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/diffpy/srxplanargui/selectfiles.py b/src/diffpy/srxplanargui/selectfiles.py
index 8248080..e5333d9 100644
--- a/src/diffpy/srxplanargui/selectfiles.py
+++ b/src/diffpy/srxplanargui/selectfiles.py
@@ -73,7 +73,7 @@ def object_selectallbb_changed(self, info):
                 info.object.datafiles[i] for i in editor.filtered_indices
             ]
             editor.refresh()
-        except ImportError:
+        except AttributeError:
             pass
         return
 

From 5f329e60a9ba109099f117ed5a29fd37a75536de Mon Sep 17 00:00:00 2001
From: stevenhua0320 <r.hua@mail.utoronto.ca>
Date: Fri, 26 Sep 2025 21:11:03 -0400
Subject: [PATCH 3/3] fix: add failure case

---
 src/diffpy/srxplanargui/selectfiles.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/diffpy/srxplanargui/selectfiles.py b/src/diffpy/srxplanargui/selectfiles.py
index e5333d9..005f364 100644
--- a/src/diffpy/srxplanargui/selectfiles.py
+++ b/src/diffpy/srxplanargui/selectfiles.py
@@ -73,7 +73,7 @@ def object_selectallbb_changed(self, info):
                 info.object.datafiles[i] for i in editor.filtered_indices
             ]
             editor.refresh()
-        except AttributeError:
+        except (AttributeError, IndexError):
             pass
         return