Changeset b3e8629 in sasview for src/sas/qtgui/Perspectives/Fitting/FittingOptions.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/Perspectives/Fitting/FittingOptions.py (modified) (5 diffs)

src/sas/qtgui/Perspectives/Fitting/FittingOptions.py

@@ -80 +80 @@
         Use options.FIT_FIELDS to assert which line edit gets what validator
         """
-        for option in bumps.options.FIT_FIELDS.iterkeys():
+        for option in bumps.options.FIT_FIELDS.keys():
             (f_name, f_type) = bumps.options.FIT_FIELDS[option]
             validator = None
@@ -86 +86 @@
                 validator = QtGui.QIntValidator()
                 validator.setBottom(0)
-            elif f_type == types.FloatType:
+            elif f_type == float:
                 validator = QtGui.QDoubleValidator()
                 validator.setBottom(0)
@@ -153 +153 @@
 
         # Update the BUMPS singleton
-        [bumpsUpdate(o) for o in self.config.values[self.current_fitter_id].iterkeys()]
+        [bumpsUpdate(o) for o in self.config.values[self.current_fitter_id].keys()]
 
     def onHelp(self):
@@ -175 +175 @@
         if current_fitter is None:
             current_fitter = self.current_fitter_id
-        if option_id not in bumps.options.FIT_FIELDS.keys(): return None
+        if option_id not in list(bumps.options.FIT_FIELDS.keys()): return None
         option = option_id + '_' + current_fitter
         if not hasattr(self, option): return None
@@ -193 +193 @@
         """
         options = self.config.values[fitter_id]
-        for option in options.iterkeys():
+        for option in options.keys():
             # Find the widget name of the option
             # e.g. 'samples' for 'dream' is 'self.samples_dream'