Changeset b3e8629 in sasview for src/sas/qtgui/Calculators/SlitSizeCalculator.py

Timestamp:

Nov 9, 2017 8:41:54 AM (6 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:

cee5c78

Parents:

749b715

git-author:

Piotr Rozyczko <rozyczko@…> (10/26/17 03:13:05)

git-committer:

Piotr Rozyczko <rozyczko@…> (11/09/17 08:41:54)

Message:

Initial changes to make SasView? run with python3

File:

• src/sas/qtgui/Calculators/SlitSizeCalculator.py (modified) (5 diffs, 1 prop)

src/sas/qtgui/Calculators/SlitSizeCalculator.py

@@ -11 +11 @@
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
 
-from UI.SlitSizeCalculator import Ui_SlitSizeCalculator
+from .UI.SlitSizeCalculator import Ui_SlitSizeCalculator
 from sas.sascalc.dataloader.loader import Loader
 from sas.sascalc.calculator.slit_length_calculator import SlitlengthCalculator
@@ -76 +76 @@
         # But only with Qt built-in dialog (non-platform native)
         path = QtGui.QFileDialog.getOpenFileName(self, "Choose a file", "",
-                                                 "SAXSess 1D data (*.txt *.TXT *.dat *.DAT)", None,
+                                                 "SAXSess 1D data (*.txt *.TXT *.dat *.DAT)",
                                                  QtGui.QFileDialog.DontUseNativeDialog)
 
@@ -107 +107 @@
             self.clearResults()
             msg = "ERROR: Data hasn't been loaded correctly"
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
         if data.__class__.__name__ == 'Data2D':
             self.clearResults()
             msg = "Slit Length cannot be computed for 2D Data"
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
         #compute the slit size
@@ -120 +120 @@
             if xdata == [] or xdata is None or ydata == [] or ydata is None:
                 msg = "The current data is empty please check x and y"
-                raise ValueError, msg
+                raise ValueError(msg)
             slit_length_calculator = SlitlengthCalculator()
             slit_length_calculator.set_data(x=xdata, y=ydata)
@@ -126 +126 @@
         except:
             self.clearResults()
-            msg = "Slit Size Calculator: %s" % (sys.exc_value)
-            raise RuntimeError, msg
+            msg = "Slit Size Calculator: %s" % (sys.exc_info()[1])
+            raise RuntimeError(msg)
 
         slit_length_str = "{:.5f}".format(slit_length)