Changeset 733cdcd in sasview for src/sas/sasgui/guiframe

Timestamp:

May 1, 2017 6:35:46 PM (8 years ago)

Author:

GitHub <noreply@…>

Children:

df29bc2

Parents:

0cc77d8 (diff), 658dd57 (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:

Paul Kienzle <pkienzle@…> (05/01/17 18:35:46)

git-committer:

GitHub <noreply@…> (05/01/17 18:35:46)

Message:

Merge branch 'master' into raise

Location:

src/sas/sasgui/guiframe

Files:

• data_processor.py (modified) (5 diffs)
• gui_manager.py (modified) (1 diff)
• local_perspectives/plotting/SectorSlicer.py (modified) (1 diff)
• local_perspectives/plotting/binder.py (modified) (2 diffs)
• local_perspectives/plotting/boxSlicer.py (modified) (2 diffs)
• local_perspectives/plotting/plotting.py (modified) (3 diffs)
• local_perspectives/plotting/sector_mask.py (modified) (1 diff)
• plugin_base.py (modified) (1 diff)

src/sas/sasgui/guiframe/data_processor.py

@@ -909 +909 @@
                     msg = "Edit axis doesn't understand this selection.\n"
                     msg += "Please select only one column"
-                    raise ValueError, msg
+                    raise ValueError(msg)
             for (_, cell_col) in grid.selected_cells:
                 if cell_col != col:
@@ -915 +915 @@
                     msg += "this operation.\n"
                     msg += "Please select elements of the same col.\n"
-                    raise ValueError, msg
+                    raise ValueError(msg)
 
             # Finally check the highlighted cell if any cells missing
@@ -922 +922 @@
             msg = "No item selected.\n"
             msg += "Please select only one column or one cell"
-            raise ValueError, msg
+            raise ValueError(msg)
         return grid.selected_cells
 
@@ -1326 +1326 @@
             if sentence.strip() == "":
                 msg = "Select column values for x axis"
-                raise ValueError, msg
+                raise ValueError(msg)
         except:
             msg = "X axis value error."
@@ -1345 +1345 @@
             if sentence.strip() == "":
                 msg = "select value for y axis"
-                raise ValueError, msg
+                raise ValueError(msg)
         except:
             msg = "Y axis value error."

src/sas/sasgui/guiframe/gui_manager.py

@@ -2613 +2613 @@
             wx.PostEvent(self, StatusEvent(status=msg,
                                            info="error"))
-            raise ValueError, msg
+            raise ValueError(msg)
         # text = str(data)
         text = data.__str__()

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)

src/sas/sasgui/guiframe/plugin_base.py

@@ -277 +277 @@
         """
         msg = "%s plugin: does not support import theory" % str(self.sub_menu)
-        raise ValueError, msg
+        raise ValueError(msg)
 
     def on_set_state_helper(self, event):