-                      r5d8f9b3
+                      r371b9e2
         try:
             return super(Registry, self).load(path, format=format)
+        except NoKnownLoaderException as e:
+            pass  # try the ASCII reader
+        except NoKnownLoaderException as nkl_e:
+            pass  # try the ASCII reader4
+        except Exception as reg_e:
+            pass
         try:
             ascii_loader = ascii_reader.Reader()
             return ascii_loader.read(path)
         except DefaultReaderException:
+            pass  # Loader specific error to try the cansas XML reader
+            pass  # Loader specific error to try the ascii reader
+        except FileContentsException:
+            # TODO: handle error
+            pass
         try:
             cansas_loader = cansas_reader.Reader()

src/sas/sascalc/dataloader/loader_exceptions.py

-                      rda8bb53
+                      r371b9e2
 class FileContentsException(Exception):
+class DefaultReaderException(Exception):
     """
     Exception for files with an associated reader, but with no loadable data.
     This is useful for catching loader or file format issues.
+    Exception for files with no associated reader. This should be thrown by
+    default readers only to tell Loader to try the next reader.
     """
     def __init__(self, e):
 …
 class DefaultReaderException(Exception):
+class FileContentsException(Exception):
     """
     Exception for files with no associated reader. This should be thrown by
     default readers only to tell Loader to try the next reader.
+    Exception for files with an associated reader, but with no loadable data.
+    This is useful for catching loader or file format issues.
     """
     def __init__(self, e):

src/sas/sascalc/dataloader/readers/associations.py

Note: See TracChangeset for help on using the changeset viewer.