Changeset fbfc488 in sasview for src/sas/qtgui/Calculators/DataOperationUtilityPanel.py

Timestamp:

Nov 9, 2017 8:43:55 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

d6b8a1d

Parents:

7969b9c

git-author:

Piotr Rozyczko <rozyczko@…> (11/03/17 10:58:39)

git-committer:

Piotr Rozyczko <rozyczko@…> (11/09/17 08:43:55)

Message:

More Qt5 related fixes.

File:

• src/sas/qtgui/Calculators/DataOperationUtilityPanel.py (modified) (1 diff)

src/sas/qtgui/Calculators/DataOperationUtilityPanel.py

@@ -140 +140 @@
             data1 = self.data1
             data2 = self.data2
-            exec("output = data1 %s data2" % operator)
-        except:
-            raise
+            output = eval("data1 %s data2" % operator)
+        except Exception as ex:
+            logging.error(ex)
+            return
 
         self.output = output