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

Timestamp:

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

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/ResolutionCalculatorPanel.py (modified) (6 diffs, 1 prop)

src/sas/qtgui/Calculators/ResolutionCalculatorPanel.py

@@ -20 +20 @@
 import re
 
-from UI.ResolutionCalculatorPanelUI import Ui_ResolutionCalculatorPanel
+from .UI.ResolutionCalculatorPanelUI import Ui_ResolutionCalculatorPanel
 
 _SOURCE_MASS = {'Alpha': 6.64465620E-24,
@@ -318 +318 @@
                 self, "Choose a spectral distribution file", "",
                 "All files (*.*)",
-                None, QtGui.QFileDialog.DontUseNativeDialog)
+                QtGui.QFileDialog.DontUseNativeDialog)
 
             if datafile is None or str(datafile) == '':
@@ -328 +328 @@
             try:
                 basename = os.path.basename(datafile)
-                if basename not in self.spectrum_dic.keys():
+                if basename not in list(self.spectrum_dic.keys()):
                     self.cbCustomSpectrum.addItem(basename)
 
@@ -604 +604 @@
                 msg = "The numbers must be one or two (separated by ',')"
                 logging.info(msg)
-                raise RuntimeError, msg
+                raise RuntimeError(msg)
 
         return new_numbers_list
@@ -618 +618 @@
             new_list = [float(t) for t in string_split]
         except:
-            logging.error(sys.exc_value)
+            logging.error(sys.exc_info()[1])
         return new_list
 
@@ -658 +658 @@
                         return out
                 except:
-                    logging.error(sys.exc_value)
+                    logging.error(sys.exc_info()[1])
 
     def _validate_q_input(self, qx, qy):