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

Timestamp:

Mar 26, 2019 3:14:45 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

ticket-1094-headless

Children:

9cc1f49

Parents:

cb44d66 (diff), 2b3eb3d (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.

Message:

Merge branch 'ticket-1243' into ticket-1094-headless

Location:

src/sas/sascalc/dataloader/readers

Files:

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

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

@@ -493 +493 @@
                 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)