Changeset b9d74f3 in sasview for src/sas/sasgui/guiframe/local_perspectives/plotting

Timestamp:

Apr 20, 2017 6:29:34 AM (8 years ago)

Author:

andyfaff

Children:

0cc77d8

Parents:

b636dfc5

git-author:

Andrew Nelson <andyfaff@…> (04/20/17 06:25:57)

git-committer:

Andrew Nelson <andyfaff@…> (04/20/17 06:29:34)

Message:

MAINT: use raise Exception() not raise Exception

Location:

src/sas/sasgui/guiframe/local_perspectives/plotting

Files:

• SectorSlicer.py (modified) (1 diff)
• binder.py (modified) (2 diffs)
• boxSlicer.py (modified) (2 diffs)
• plotting.py (modified) (3 diffs)
• sector_mask.py (modified) (1 diff)

src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py

@@ -235 +235 @@
             msg = "Phi left and phi right are different"
             msg += " %f, %f" % (self.left_line.phi, self.right_line.phi)
-            raise ValueError, msg
+            raise ValueError(msg)
         params["Phi [deg]"] = self.main_line.theta * 180 / math.pi
         params["Delta_Phi [deg]"] = math.fabs(self.left_line.phi * 180 / math.pi)

src/sas/sasgui/guiframe/local_perspectives/plotting/binder.py

@@ -187 +187 @@
         # Check that the trigger is valid
         if trigger not in self._actions:
-            raise ValueError, "%s invalid --- valid triggers are %s" \
-                % (trigger, ", ".join(self.events))
+            raise ValueError("%s invalid --- valid triggers are %s" \
+                % (trigger, ", ".join(self.events)))
         # Register the trigger callback
         self._actions[trigger][artist] = action
@@ -203 +203 @@
         """
         if action not in self.events:
-            raise ValueError, "Trigger expects " + ", ".join(self.events)
+            raise ValueError("Trigger expects " + ", ".join(self.events))
         # Tag the event with modifiers
         for mod in ('alt', 'control', 'shift', 'meta'):

src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py

@@ -152 +152 @@
             if new_slab is None:
                 msg = "post data:cannot average , averager is empty"
-                raise ValueError, msg
+                raise ValueError(msg)
             self.averager = new_slab
         if self.direction == "X":
@@ -168 +168 @@
         else:
             msg = "post data:no Box Average direction was supplied"
-            raise ValueError, msg
+            raise ValueError(msg)
         # # Average data2D given Qx or Qy
         box = self.averager(x_min=x_min, x_max=x_max, y_min=y_min, y_max=y_max,

src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py

@@ -199 +199 @@
 
         msg = "1D Panel of group ID %s could not be created" % str(group_id)
-        raise ValueError, msg
+        raise ValueError(msg)
 
     def create_2d_panel(self, data, group_id):
@@ -217 +217 @@
             return new_panel
         msg = "2D Panel of group ID %s could not be created" % str(group_id)
-        raise ValueError, msg
+        raise ValueError(msg)
 
     def update_panel(self, data, panel):
@@ -237 +237 @@
             msg += " to panel %s\n" % str(panel.window_caption)
             msg += "Please edit %s's units, labels" % str(data.name)
-            raise ValueError, msg
+            raise ValueError(msg)
         else:
             if panel.group_id not in data.list_group_id:

src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py

@@ -175 +175 @@
             msg += "different %f, %f" % (self.left_line.phi,
                                          self.right_line.phi)
-            raise ValueError, msg
+            raise ValueError(msg)
         params["Phi"] = self.main_line.theta
         params["Delta_Phi"] = math.fabs(self.left_line.phi)