Changeset 270c882b in sasview for src/sas/sascalc/dataloader

Timestamp:

Apr 5, 2017 5:31:36 AM (8 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:

cfc6f3c7

Parents:

b9b612a

git-author:

Jeff Krzywon <krzywon@…> (04/05/17 05:31:36)

git-committer:

krzywon <krzywon@…> (04/05/17 05:31:36)

Message:

Beginning implementation of exception handling within data loader.

Location:

src/sas/sascalc/dataloader

Files:

• loader.py (modified) (4 diffs)
• loader_exceptions.py (added)

src/sas/sascalc/dataloader/loader.py

@@ -1 +1 @@
 """
     File handler to support different file extensions.
-    Uses reflectometry's registry utility.
+    Uses reflectometer registry utility.
 
     The default readers are found in the 'readers' sub-module
@@ -29 +29 @@
 # Default readers are defined in the readers sub-module
 import readers
+from loader_exceptions import NoKnownLoaderException, FileContentsException
 from readers import ascii_reader
 from readers import cansas_reader
 from readers import cansas_reader_HDF5
+
 
 class Registry(ExtensionRegistry):
@@ -38 +40 @@
     Readers and writers are supported.
     """
-
     def __init__(self):
         super(Registry, self).__init__()
 
-        ## Writers
+        # Writers
         self.writers = {}
 
-        ## List of wildcards
+        # List of wildcards
         self.wildcards = ['All (*.*)|*.*']
 
-        ## Creation time, for testing
+        # Creation time, for testing
         self._created = time.time()
 
@@ -67 +68 @@
         try:
             return super(Registry, self).load(path, format=format)
-        except Exception:
-            pass # try the ASCII reader
+        except NoKnownLoaderException as e:
+            pass  # try the ASCII reader
+        except FileContentsException as e:
+            pass
         try:
             ascii_loader = ascii_reader.Reader()
             return ascii_loader.read(path)
-        except Exception:
-            pass # try the cansas XML reader
+        except FileContentsException:
+            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
+        except FileContentsException:
+            pass  # try the cansas NeXuS reader
         try:
             cansas_nexus_loader = cansas_reader_HDF5.Reader()
             return cansas_nexus_loader.read(path)
-        except Exception:
+        except FileContentsException:
             # 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)
+            msg += "known format that can be loaded by SasView."
+            raise NoKnownLoaderException(msg)
 
     def find_plugins(self, dir):