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

Timestamp:

Oct 26, 2017 3:13:05 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:

895e7359

Parents:

def64a0

Message:

Initial changes to make SasView? run with python3

File:

• src/sas/qtgui/Calculators/DataOperationUtilityPanel.py (modified) (6 diffs, 1 prop)

src/sas/qtgui/Calculators/DataOperationUtilityPanel.py

@@ -13 +13 @@
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
 
-from UI.DataOperationUtilityUI import Ui_DataOperationUtility
+from .UI.DataOperationUtilityUI import Ui_DataOperationUtility
 
 BG_WHITE = "background-color: rgb(255, 255, 255);"
@@ -76 +76 @@
         self.filenames = filenames
 
-        if filenames.keys():
+        if list(filenames.keys()):
             # clear contents of comboboxes
             self.cbData1.clear()
@@ -85 +85 @@
             list_datafiles = []
 
-            for key_id in filenames.keys():
+            for key_id in list(filenames.keys()):
                 if filenames[key_id].get_data().title:
                     # filenames with titles
@@ -139 +139 @@
             data1 = self.data1
             data2 = self.data2
-            exec "output = data1 %s data2" % operator
+            exec("output = data1 %s data2" % operator)
         except:
             raise
@@ -300 +300 @@
                 self.cbData1.setStyleSheet(QtCore.QString(BG_RED))
                 self.cbData2.setStyleSheet(QtCore.QString(BG_RED))
-                print self.data1.__class__.__name__ != self.data2.__class__.__name__
+                print(self.data1.__class__.__name__ != self.data2.__class__.__name__)
                 logging.warning('Cannot compute data of different dimensions')
                 return False
@@ -354 +354 @@
     def _findId(self, name):
         """ find id of name in list of filenames """
-        isinstance(name, basestring)
-
-        for key_id in self.filenames.keys():
+        isinstance(name, str)
+
+        for key_id in list(self.filenames.keys()):
             # data with title
             if self.filenames[key_id].get_data().title: