Changeset 3ece5dd in sasview for src/sas/sascalc/data_util

Timestamp:

Jul 26, 2017 6:31:27 AM (7 years ago)

Author:

lewis

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:

bc570f4

Parents:

371b9e2

Message:

Raise and catch correct exceptions in CanSAS XML reader

File:

• src/sas/sascalc/data_util/registry.py (modified) (3 diffs)

src/sas/sascalc/data_util/registry.py

@@ -26 +26 @@
         registry['.tar.gz'] = untar
 
-        # Generic extensions to use after trying more specific extensions; 
+        # Generic extensions to use after trying more specific extensions;
         # these will be checked after the more specific extensions fail.
         registry['.gz'] = gunzip
@@ -92 +92 @@
         """
         Return the loader associated with the file type of path.
-        
+
         :param path: Data file path
         :raises ValueError: When no loaders are found for the file.
         :return: List of available readers for the file extension
-        """        
+        """
         # Find matching extensions
         extlist = [ext for ext in self.extensions() if path.endswith(ext)]
@@ -135 +135 @@
             except KeyError as e:
                 pass
+        last_exc = None
         for fn in loaders:
             try:
                 return fn(path)
             except Exception as e:
+                last_exc = e
                 pass  # give other loaders a chance to succeed
         # If we get here it is because all loaders failed
+        if last_exc is not None and len(loaders) != 0:
+            # If file has associated loader(s) and they;ve failed
+            raise last_exc
         raise NoKnownLoaderException(e.message)  # raise generic exception