Changeset 4a8d55c in sasview for src/sas/sascalc/dataloader/loader.py

Timestamp:

Mar 27, 2018 10:05:36 AM (6 years ago)

Author:

krzywon

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, unittest-saveload

Children:

63ddc03

Parents:

2924532

Message:

Propagate through loader when errors are thrown regardless of the error. Add tests using the same file with different extensions (including deprecated extensions).

File:

• src/sas/sascalc/dataloader/loader.py (modified) (2 diffs)

src/sas/sascalc/dataloader/loader.py

@@ -90 +90 @@
             ascii_loader = ascii_reader.Reader()
             return ascii_loader.read(path)
+        except NoKnownLoaderException:
+            pass  # Try the Cansas XML reader
         except DefaultReaderException:
             pass  # Loader specific error to try the cansas XML reader
@@ -100 +102 @@
             cansas_loader = cansas_reader.Reader()
             return cansas_loader.read(path)
+        except NoKnownLoaderException:
+            pass  # Try the NXcanSAS reader
         except DefaultReaderException:
             pass  # Loader specific error to try the NXcanSAS reader