Changeset cc2cd5a in sasview for src/sas/sascalc/dataloader/readers

Timestamp:

Mar 30, 2019 6:15:53 PM (6 years ago)

Author:

GitHub <noreply@…>

Parents:

d4cde37 (diff), 0e0c645 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jeff Krzywon <krzywon@…> (03/30/19 18:15:53)

git-committer:

GitHub <noreply@…> (03/30/19 18:15:53)

Message:

Merge 0e0c645bd0457e2a1f474d1abf25ea989689caf6 into d4cde3775cc19e3e8ac413babb90e5015eb330e7

Location:

src/sas/sascalc/dataloader/readers

Files:

• cansas_reader.py (modified) (6 diffs)
• associations.py (modified) (1 diff)

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

@@ -17 +17 @@
 # For saving individual sections of data
 from ..data_info import Data1D, Data2D, DataInfo, plottable_1D, plottable_2D, \
-    Collimation, TransmissionSpectrum, Detector, Process, Aperture, \
-    combine_data_info_with_plottable as combine_data
+    Collimation, TransmissionSpectrum, Detector, Process, Aperture
 from ..loader_exceptions import FileContentsException, DefaultReaderException, \
     DataReaderException
 from . import xml_reader
 from .xml_reader import XMLreader
-from .cansas_constants import CansasConstants, CurrentLevel
+from .cansas_constants import CansasConstants
 
 logger = logging.getLogger(__name__)
@@ -59 +58 @@
     type = ["XML files (*.xml)|*.xml", "SasView Save Files (*.svs)|*.svs"]
     # List of allowed extensions
-    ext = ['.xml', '.XML', '.svs', '.SVS']
+    ext = ['.xml', '.svs']
     # Flag to bypass extension check
     allow_all = True
@@ -81 +80 @@
         self.encoding = None
 
-    def read(self, xml_file, schema_path="", invalid=True):
+    def _read(self, xml_file, schema_path="", invalid=True):
         if schema_path != "" or not invalid:
             # read has been called from self.get_file_contents because xml file doens't conform to schema
@@ -90 +89 @@
         return super(XMLreader, self).read(xml_file)
 
-    def get_file_contents(self, xml_file=None, schema_path="", invalid=True):
+    def get_file_contents(self):
+        return self._get_file_contents(xml_file=None, schema_path="", invalid=True)
+
+    def _get_file_contents(self, xml_file=None, schema_path="", invalid=True):
         # Reset everything since we're loading a new file
         self.reset_state()
@@ -124 +126 @@
                 try:
                     # Load data with less strict schema
-                    self.read(xml_file, invalid_schema, False)
+                    self._get_file_contents(xml_file, invalid_schema, False)
 
                     # File can still be read but doesn't match schema, so raise exception
@@ -493 +495 @@
                 self.current_datainfo.errors.add(error)
             self.data_cleanup()
-            self.sort_one_d_data()
-            self.sort_two_d_data()
+            self.sort_data()
             self.reset_data_list()
             return self.output[0], None

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

@@ -54 +54 @@
                 exec("loader.associate_file_type('%s', %s)"
                      % (ext.upper(), reader))
-            except:
+            except Exception as exc:
                 msg = "read_associations: skipping association"
-                msg += " for %s\n  %s" % (ext.lower(), sys.exc_value)
+                msg += " for %s\n  %s" % (ext.lower(), exc)
                 logger.error(msg)