Changeset 5251ec6 in sasview for src/sas/sasgui/perspectives/invariant/invariant.py

Timestamp:

Oct 11, 2018 12:20:56 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1249

Children:

98b9f32

Parents:

67ed543

Message:

improved support for py37 in sasgui

File:

• src/sas/sasgui/perspectives/invariant/invariant.py (modified) (7 diffs)

src/sas/sasgui/perspectives/invariant/invariant.py

@@ -133 +133 @@
             name = data.__class__.__name__
             msg = "Invariant use only Data1D got: [%s] " % str(name)
-            raise ValueError, msg
+            raise ValueError(msg)
         self.compute_helper(data=data)
 
@@ -144 +144 @@
         if data_list is None:
             data_list = []
+        else:
+            data_list = list(data_list)  # force iterator to list
         if len(data_list) >= 1:
             if len(data_list) == 1:
@@ -190 +192 @@
                 try:
                     self.compute_helper(data)
-                except:
-                    msg = "Invariant Set_data: " + str(sys.exc_value)
+                except Exception as exc:
+                    msg = "Invariant Set_data: " + str(exc)
                     wx.PostEvent(self.parent, StatusEvent(status=msg, info="error"))
         else:
@@ -240 +242 @@
             msg = "invariant.save_file: the data being saved is"
             msg += " not a sas.sascalc.dataloader.data_info.Data1D object"
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
     def set_state(self, state=None, datainfo=None):
@@ -258 +260 @@
                 msg = "invariant.set_state: datainfo parameter cannot"
                 msg += " be None in standalone mode"
-                raise RuntimeError, msg
+                raise RuntimeError(msg)
             # Make sure the user sees the invariant panel after loading
             # self.parent.set_perspective(self.perspective)
@@ -281 +283 @@
             self.on_set_state_helper(None)
 
-        except:
-            logger.error("invariant.set_state: %s" % sys.exc_value)
+        except Exception as exc:
+            logger.error("invariant.set_state: %s" % exc)
 
     def on_set_state_helper(self, event=None):
@@ -320 +322 @@
         else:
             msg = "Scale can not be zero."
-            raise ValueError, msg
+            raise ValueError(msg)
         if len(new_plot.x) == 0:
             return