Changeset b9b612a in sasview

Timestamp:

Mar 17, 2017 8:51:44 AM (7 years ago)

Author:

krzywon

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, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

270c882b, c721b1a

Parents:

62b9793

Message:

Flatten nested try-except block.

File:

• src/sas/sascalc/dataloader/loader.py (modified) (1 diff)

src/sas/sascalc/dataloader/loader.py

@@ -62 +62 @@
             of a particular reader
 
-        Defaults to the ascii (multi-column) reader
-        if no reader was registered for the file's
-        extension.
+        Defaults to the ascii (multi-column), cansas XML, and cansas NeXuS
+        readers if no reader was registered for the file's extension.
         """
         try:
             return super(Registry, self).load(path, format=format)
-        except:
-            try:
-                # No reader was found. Default to the ascii reader.
-                ascii_loader = ascii_reader.Reader()
-                return ascii_loader.read(path)
-            except:
-                try:
-                    cansas_loader = cansas_reader.Reader()
-                    return cansas_loader.read(path)
-                except:
-                    try:
-                        cansas_nexus_loader = cansas_reader_HDF5.Reader()
-                        return cansas_nexus_loader.read(path)
-                    except:
-                        msg = "\n\tUnknown data format: %s.\n" % path
-                        msg += "\tThe file is not a known format for SasView. "
-                        msg += "The most common formats are multi-column "
-                        msg += "ASCII, CanSAS XML, andCanSAS NeXuS."
-                        raise Exception(msg)
+        except Exception:
+            pass # try the ASCII reader
+        try:
+            ascii_loader = ascii_reader.Reader()
+            return ascii_loader.read(path)
+        except Exception:
+            pass # try the cansas XML reader
+        try:
+            cansas_loader = cansas_reader.Reader()
+            return cansas_loader.read(path)
+        except Exception:
+            pass # try the cansas NeXuS reader
+        try:
+            cansas_nexus_loader = cansas_reader_HDF5.Reader()
+            return cansas_nexus_loader.read(path)
+        except Exception:
+            # No known reader available. Give up and throw an error
+            msg = "\n\tUnknown data format: %s.\n\tThe file is not a " % path
+            msg += "known format for SasView. The most common formats are "
+            msg += "multi-column ASCII, CanSAS XML, and CanSAS NeXuS."
+            raise Exception(msg)
 
     def find_plugins(self, dir):