Changeset dc8d1c2 in sasview for src/sas/sascalc

Timestamp:

Sep 22, 2017 6:59:52 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

56dac0b

Parents:

34d7b35

Message:

python 3 doesn't support list.sort(cmp=…)

Location:

src/sas/sascalc

Files:

• data_util/registry.py (modified) (1 diff)
• dataloader/loader.py (modified) (2 diffs)

src/sas/sascalc/data_util/registry.py

@@ -101 +101 @@
         extlist = [ext for ext in self.extensions() if path.endswith(ext)]
         # Sort matching extensions by decreasing order of length
-        extlist.sort(lambda a,b: len(a)<len(b))
+        extlist.sort(key=len)
         # Combine loaders for matching extensions into one big list
         loaders = []

src/sas/sascalc/dataloader/loader.py

@@ -75 +75 @@
         try:
             return super(Registry, self).load(path, format=format)
+        #except Exception: raise  # for debugging, don't use fallback loader
         except NoKnownLoaderException as nkl_e:
             pass  # Try the ASCII reader
@@ -329 +330 @@
         extlist = [ext for ext in self.extensions() if path.endswith(ext)]
         # Sort matching extensions by decreasing order of length
-        extlist.sort(lambda a, b: len(a) < len(b))
+        extlist.sort(key=len)
         # Combine loaders for matching extensions into one big list
         writers = []