Skip to content

chore:delete unused module, change lambda def to def #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 29, 2025
Merged

chore:delete unused module, change lambda def to def #18

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd7754a
delete unused module, change lambda def to def
stevenhua0320 Sep 25, 2025
e54f20b
changed to AttributeError in bare except
stevenhua0320 Sep 26, 2025
5f329e6
fix: add failure case
stevenhua0320 Sep 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 18 additions & 38 deletions src/diffpy/srxplanargui/selectfiles.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,67 +12,43 @@
#
##############################################################################

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,
VGroup,
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
Expand All @@ -97,7 +73,7 @@ def object_selectallbb_changed(self, info):
info.object.datafiles[i] for i in editor.filtered_indices
]
editor.refresh()
except:
except (AttributeError, IndexError):
pass
return

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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


Expand Down