Changeset 371b9e2 in sasview for src/sas/sascalc/dataloader

Timestamp:

May 2, 2017 11:24:16 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:

3ece5dd

Parents:

5d8f9b3

git-author:

Jeff Krzywon <krzywon@…> (05/02/17 11:24:16)

git-committer:

krzywon <krzywon@…> (05/02/17 11:24:16)

Message:

Add support for a fourth reader exception and start the removal of IgorReader? support.

Location:

src/sas/sascalc/dataloader

Files:

• loader.py (modified) (1 diff)
• loader_exceptions.py (modified) (2 diffs)
• readers/associations.py (modified) (1 diff)

src/sas/sascalc/dataloader/loader.py

@@ -71 +71 @@
         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

@@ -14 +14 @@
 
 
-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):
@@ -23 +23 @@
 
 
-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

@@ -24 +24 @@
     ".h5": "cansas_reader_HDF5",
     ".txt": "ascii_reader",
-    ".asc": "IgorReader",
     ".dat": "red2d_reader",
     ".abs": "abs_reader",