Changeset 0cc77d8 in sasview for src/sas/sasgui/perspectives/simulation

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/perspectives/simulation

Files:

• ShapeParameters.py (modified) (4 diffs)
• ShapeAdapter.py (modified) (3 diffs)

src/sas/sasgui/perspectives/simulation/ShapeParameters.py

@@ -8 +8 @@
 copyright 2009, University of Tennessee
 """
+from __future__ import print_function
+
 import wx
 import sys
@@ -312 +314 @@
             self.parent.GetSizer().Layout()
         except:
-            print "TODO: move the Layout call of editShape up to the caller"
+            print("TODO: move the Layout call of editShape up to the caller")
 
     def _readCtrlFloat(self, ctrl):
@@ -392 +394 @@
                     self.current_shape.params[item[0]] = tmp 
         except:
-            print "Could not create"
-            print sys.exc_value
+            print("Could not create")
+            print(sys.exc_value)
                 
     def _onCreate(self, evt):
@@ -485 +487 @@
         indices = self.shape_listbox.GetSelections()
         if len(indices)>0:
-            print "NOT YET IMPLMENTED"
-            print "renaming", self.shape_listbox.GetString(indices[0])
-                
+            print("NOT YET IMPLMENTED")
+            print("renaming", self.shape_listbox.GetString(indices[0]))
+                

src/sas/sasgui/perspectives/simulation/ShapeAdapter.py

@@ -87 +87 @@
             self.sim_canvas._model_changed()
         else:
-            raise ValueError, "SimShapeVisitor: Wrong class for visited object"
+            raise ValueError("SimShapeVisitor: Wrong class for visited object")
         
         
@@ -115 +115 @@
             self.sim_canvas._model_changed()
         else:
-            raise ValueError, "SimShapeVisitor: Wrong class for visited object"
+            raise ValueError("SimShapeVisitor: Wrong class for visited object")
         
     
@@ -130 +130 @@
             shape.accept_update(self)
         else:
-            raise ValueError, "ShapeAdapter: Shape [%s] not in list" % shape.name
+            raise ValueError("ShapeAdapter: Shape [%s] not in list" % shape.name)