Changeset 04ce9ac in sasview for src/sas/qtgui/Perspectives/Fitting/FittingUtilities.py

Timestamp:

Sep 6, 2018 11:36:09 AM (6 years ago)

Author:

Torin Cooper-Bennun <torin.cooper-bennun@…>

Branches:

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

Children:

88ada06

Parents:

04f775d

Message:

small type-checking fix

File:

• src/sas/qtgui/Perspectives/Fitting/FittingUtilities.py (modified) (1 diff)

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

@@ -75 +75 @@
     # TODO: (when the sasmodels implementation is concrete, clean this up)
     choices = None
-    if type(param.choices) is list and len(param.choices) > 0:
+    if isinstance(param.choices, (list, tuple)) and len(param.choices) > 0:
         # The choices property is concrete in sasmodels, probably will use this
         choices = param.choices
-    elif type(param.units) is list:
-        choices = param.units
+    elif isinstance(param.units, (list, tuple)):
+        choices = [str(x) for x in param.units]
 
     cbox = None