Changeset 425feff in sasview

Timestamp:

Feb 15, 2018 8:28:55 AM (7 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:

2924532

Parents:

3ee0451

Message:

Move the deprecation check so it is always called, regardless of file loading success.

Files:

• src/sas/sascalc/dataloader/file_reader_base_class.py (modified) (2 diffs)
• test/sasdataloader/test/utest_generic_file_reader_class.py (modified) (2 diffs)

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -94 +94 @@
                     if not self.f_open.closed:
                         self.f_open.close()
+                    if any(filepath.lower().endswith(ext) for ext in
+                           self.deprecated_extensions):
+                        self.handle_error_message(DEPRECATION_MESSAGE)
                     if len(self.output) > 0:
-                        if any(filepath.lower().endswith(ext) for ext in
-                               self.deprecated_extensions):
-                            self.handle_error_message(DEPRECATION_MESSAGE)
                         # Sort the data that's been loaded
                         self.sort_one_d_data()
@@ -156 +156 @@
         else:
             logger.warning(msg)
+            raise NoKnownLoaderException(msg)
 
     def send_to_output(self):

test/sasdataloader/test/utest_generic_file_reader_class.py

@@ -10 +10 @@
 from sas.sascalc.dataloader.data_info import DataInfo, plottable_1D
 from sas.sascalc.dataloader.loader import Loader
+from sas.sascalc.dataloader.loader_exceptions import NoKnownLoaderException
 from sas.sascalc.dataloader.file_reader_base_class import FileReader
 
@@ -29 +30 @@
 
     def test_bad_file_path(self):
-        output = self.reader.read(self.bad_file)
-        self.assertEqual(output, [])
+        self.assertRaises(NoKnownLoaderException, self.reader.read,
+                          self.bad_file)
 
     def test_good_file_path(self):