Changeset 0cc77d8 in sasview for src/sas/sasgui/guiframe

Timestamp:

May 1, 2017 5:00:53 PM (8 years ago)

Author:

GitHub <noreply@…>

Children:

733cdcd

Parents:

b9d74f3 (diff), c00a797a (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 17:00:53)

git-committer:

GitHub <noreply@…> (05/01/17 17:00:53)

Message:

Merge branch 'master' into raise

Location:

src/sas/sasgui/guiframe

Files:

• config.py (modified) (2 diffs)
• data_panel.py (modified) (3 diffs)
• data_processor.py (modified) (2 diffs)
• dummyapp.py (modified) (2 diffs)
• gui_style.py (modified) (2 diffs)
• proxy.py (modified) (2 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/config.py

@@ -2 +2 @@
     Application settings
 """
+from __future__ import print_function
+
 import time
 import os
@@ -150 +152 @@
         :TODO - Need method doc string
         """
-        print "%g:  %s" % (time.clock(), message)
+        print("%g:  %s" % (time.clock(), message))
 
         if __EVT_DEBUG_2_FILE__:

src/sas/sasgui/guiframe/data_panel.py

@@ -11 +11 @@
 This module provides Graphic interface for the data_manager module.
 """
+from __future__ import print_function
+
 import wx
 from wx.build import build_options
@@ -514 +516 @@
                 self.parent.save_data2d(data, default_name)
             else:
-                print "unable to save this type of data"
+                print("unable to save this type of data")
 
     def layout_data_list(self):
@@ -1497 +1499 @@
     except:
         # raise
-        print "error", sys.exc_value
+        print("error", sys.exc_value)
 
     app.MainLoop()

src/sas/sasgui/guiframe/data_processor.py

@@ -18 +18 @@
 
 """
+from __future__ import print_function
+
 import os
 import sys
@@ -2035 +2037 @@
         frame.Show(True)
     except:
-        print sys.exc_value
+        print(sys.exc_value)
 
     app.MainLoop()

src/sas/sasgui/guiframe/dummyapp.py

@@ -3 +3 @@
 Allows the user to set an external data manager
 """
+from __future__ import print_function
+
 import sas.sasgui.guiframe.gui_manager as gui_manager
 
@@ -32 +34 @@
         plug_menu.Append(id, '&Do something')
         def _on_do_something(event):
-            print "Do something"
+            print("Do something")
         wx.EVT_MENU(self.parent, id, _on_do_something)
     

src/sas/sasgui/guiframe/gui_style.py

@@ -3 +3 @@
 Provide the style for guiframe
 """
+from __future__ import print_function
+
 import wx
 import os
@@ -79 +81 @@
 if __name__ == "__main__":
   
-    print GUIFRAME.DEFAULT_STYLE
-    print GUIFRAME.FLOATING_PANEL
-    print GUIFRAME.SINGLE_APPLICATION
+    print(GUIFRAME.DEFAULT_STYLE)
+    print(GUIFRAME.FLOATING_PANEL)
+    print(GUIFRAME.SINGLE_APPLICATION)
     style = GUIFRAME.MULTIPLE_APPLICATIONS
     style &= GUIFRAME.PLOTTING_ON
-    print style == GUIFRAME.PLOTTING_ON
+    print(style == GUIFRAME.PLOTTING_ON)
     style1 = GUIFRAME.MULTIPLE_APPLICATIONS
     style1 &= (~GUIFRAME.MANAGER_ON)
-    print style1 == GUIFRAME.DEFAULT_STYLE
-    print style1
+    print(style1 == GUIFRAME.DEFAULT_STYLE)
+    print(style1)

src/sas/sasgui/guiframe/proxy.py

@@ -1 +1 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
+from __future__ import print_function
+
 import urllib2
 import sys
@@ -157 +159 @@
     response = c.connect()
     if response is not None:
-        print 50 * '-'
+        print(50 * '-')
         content = json.loads(response.read().strip())
         pprint(content)

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):