Changeset 5251ec6 in sasview for src/sas/sasgui/perspectives/calculator/data_operator.py

Timestamp:

Oct 11, 2018 12: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/calculator/data_operator.py (modified) (9 diffs)

src/sas/sasgui/perspectives/calculator/data_operator.py

@@ -202 +202 @@
         else:
             text = name
-        state_list = self.get_datalist().values()
         name_list = []
-        for state in state_list:
+        for state in self.get_datalist().values():
             if state.data is None:
                 theory_list = state.get_theory()
-                theory, _ = theory_list.values()[0]
+                theory, _ = list(theory_list.values())[0]
                 d_name = str(theory.name)
             else:
@@ -393 +392 @@
         try:
             self.output = self.make_data_out(data1, data2)
-        except:
+        except Exception as exc:
             self._check_newname()
             self._set_textctrl_color(self.data1_cbox, 'pink')
             self._set_textctrl_color(self.data2_cbox, 'pink')
-            msg = "DataOperation: %s" % sys.exc_value
+            msg = "DataOperation: %s" % exc
             self.send_warnings(msg, 'error')
             self.output = None
@@ -411 +410 @@
         operator = self.operator_cbox.GetClientData(pos)
         try:
-            exec "output = data1 %s data2" % operator
+            output = eval("data1 %s data2" % operator,
+                          {"data1": data1, "data2": data2})
         except:
             raise
@@ -532 +532 @@
         self.data2_cbox.SetClientData(pos3, val)
         dnames = []
-        ids = self._data.keys()
-        for id in ids:
+        for id in self._data.keys():
             if id is not None:
                 if self._data[id].data is not None:
@@ -539 +538 @@
                 else:
                     theory_list = self._data[id].get_theory()
-                    theory, _ = theory_list.values()[0]
+                    theory, _ = list(theory_list.values())[0]
                     dnames.append(theory.name)
         ind = np.argsort(dnames)
         if len(ind) > 0:
-            val_list = np.array(self._data.values())[ind]
+            val_list = np.array(list(self._data.values()))[ind]
             for datastate in val_list:
                 data = datastate.data
@@ -588 +587 @@
         self.send_warnings('')
         self.data_namectr.SetBackgroundColour('white')
-        state_list = self.get_datalist().values()
         name = self.data_namectr.GetValue().strip()
         name_list = []
-        for state in state_list:
+        for state in self.get_datalist().values():
             if state.data is None:
                 theory_list = state.get_theory()
-                theory, _ = theory_list.values()[0]
+                theory, _ = list(theory_list.values())[0]
                 d_name = str(theory.name)
             else:
@@ -889 +887 @@
     def _onProperties(self, event):
         """
-        when clicking on Properties on context menu ,
-        The Property dialog is displayed
-        The user selects a transformation for x or y value and
-        a new plot is displayed
-        """
-        list = []
-        list = self.graph.returnPlottable()
-        if len(list.keys()) > 0:
-            first_item = list.keys()[0]
+        When clicking on Properties on context menu, the
+        Property dialog is displayed the user selects a
+        transformation for x or y value and a new plot is displayed
+        """
+        plottables = self.graph.returnPlottable()
+        if plottables:
+            # TODO: key order is random prior to py 3.7
+            first_item = list(plottables.keys())[0]
             if first_item.x != []:
                 from sas.sasgui.plottools.PropertyDialog import Properties
@@ -929 +926 @@
         and set the scale
         """
-        list = []
-        list = self.graph.returnPlottable()
         # Changing the scale might be incompatible with
         # currently displayed data (for instance, going
@@ -940 +935 @@
         _xscale = 'linear'
         _yscale = 'linear'
-        for item in list:
+        for item in self.graph.returnPlottable():
             item.setLabel(self.xLabel, self.yLabel)
             # control axis labels from the panel itself