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

Timestamp:

Oct 11, 2018 2: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/simulation/ShapeParameters.py (modified) (4 diffs)

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

@@ -10 +10 @@
 from __future__ import print_function
 
+import sys
+from copy import deepcopy
+
 import wx
-import sys
 import wx.lib.newevent
-from copy import deepcopy
-import SimCanvas
+
+from . import SimCanvas
 
 (CreateShapeEvent, EVT_ADD_SHAPE) = wx.lib.newevent.NewEvent()
@@ -201 +203 @@
             n = 1
             self.parameters = []
-            keys = shape.params.keys()
-            keys.sort()
-            
-            for item in keys:
+            
+            for item in sorted(shape.params.keys()):
                 if item in ['contrast', 'order']:
                     continue
@@ -393 +393 @@
                 if not tmp==None:
                     self.current_shape.params[item[0]] = tmp 
-        except:
+        except Exception as exc:
             print("Could not create")
-            print(sys.exc_value)
+            print(exc)
                 
     def _onCreate(self, evt):
@@ -489 +489 @@
             print("NOT YET IMPLMENTED")
             print("renaming", self.shape_listbox.GetString(indices[0]))
-