Changeset 5251ec6 in sasview for src/sas/sasgui/perspectives/fitting/basepage.py

Timestamp:

Oct 11, 2018 2:20:56 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1249

Children:

98b9f32

Parents:

67ed543

Message:

improved support for py37 in sasgui

File:

• src/sas/sasgui/perspectives/fitting/basepage.py (modified) (21 diffs)

src/sas/sasgui/perspectives/fitting/basepage.py

@@ -12 +12 @@
 import logging
 import traceback
-from Queue import Queue
+try:
+    from Queue import Queue
+except ImportError:
+    from queue import Queue
 from threading import Thread
 from collections import defaultdict
@@ -66 +69 @@
     FONT_VARIANT = 1
     ON_MAC = True
+if sys.version_info[0] >= 3:
+    unicode = str
 
 CUSTOM_MODEL = 'Plugin Models'
@@ -115 +120 @@
         # Q range for data set
         self.qmin_data_set = np.inf
-        self.qmax_data_set = None
+        self.qmax_data_set = -np.inf
         self.npts_data_set = 0
         # Q range
@@ -624 +629 @@
         if self.model is not None:
             self.m_name = self.model.name
-        if name in self.saved_states.keys():
+        if name in self.saved_states:
             previous_state = self.saved_states[name]
             # reset state of checkbox,textcrtl  and  regular parameters value
@@ -893 +898 @@
 
         if len(self._disp_obj_dict) > 0:
-            for k, v in self._disp_obj_dict.iteritems():
+            for k, v in self._disp_obj_dict.items():
                 self.state.disp_obj_dict[k] = v.type
 
@@ -960 +965 @@
 
             if len(self.disp_cb_dict) > 0:
-                for k, v in self.disp_cb_dict.iteritems():
+                for k, v in self.disp_cb_dict.items():
                     if v is None:
                         self.state.disp_cb_dict[k] = v
@@ -969 +974 @@
                             self.state.disp_cb_dict[k] = None
             if len(self._disp_obj_dict) > 0:
-                for k, v in self._disp_obj_dict.iteritems():
+                for k, v in self._disp_obj_dict.items():
                     self.state.disp_obj_dict[k] = v.type
 
@@ -1097 +1102 @@
 
             else:
-                keys = self.model.getParamList()
-                for item in keys:
+                for item in self.model.getParamList():
                     if item in self.disp_list and \
                             item not in self.model.details:
@@ -1142 +1146 @@
         :return: combo_box_position
         """
-        for key, value in self.master_category_dict.iteritems():
+        for key, value in self.master_category_dict.items():
             formfactor = state.formfactorcombobox.split(":")
             if isinstance(formfactor, list):
@@ -1318 +1322 @@
         Help to rest page for dispersions
         """
-        keys = self.model.getParamList()
-        for item in keys:
+        for item in self.model.getParamList():
             if item in self.disp_list and \
                             item not in self.model.details:
                 self.model.details[item] = ["", None, None]
-        # for k,v in self.state.disp_cb_dict.iteritems():
+        # for k,v in self.state.disp_cb_dict.items():
         self.disp_cb_dict = copy.deepcopy(state.disp_cb_dict)
         self.state.disp_cb_dict = copy.deepcopy(state.disp_cb_dict)
@@ -1329 +1332 @@
         self.weights = copy.deepcopy(state.weights)
 
-        for key, disp_type in state.disp_obj_dict.iteritems():
+        for key, disp_type in state.disp_obj_dict.items():
             # disp_model = disp
             disp_model = POLYDISPERSITY_MODELS[disp_type]()
@@ -1378 +1381 @@
         dlg = wx.FileDialog(self, "Choose a weight file",
                             self._default_save_location, "",
-                            "*.*", wx.OPEN)
+                            "*.*", wx.FD_OPEN)
         path = None
         if dlg.ShowModal() == wx.ID_OK:
@@ -1390 +1393 @@
         """
         ids = iter(self._id_pool)  # Reusing ids for context menu
-        for name, _ in self.state.saved_states.iteritems():
+        for name, _ in self.state.saved_states.items():
             self.number_saved_state += 1
             # Add item in the context menu
@@ -1919 +1922 @@
                 else:
                     tcrtl.SetBackgroundColour("pink")
-                    msg = "Model Error: wrong value entered: %s" % \
-                          sys.exc_info()[1]
+                    _, exc, _ = sys.exc_info()
+                    msg = "Model Error: wrong value entered: %s" % exc
                     wx.PostEvent(self.parent, StatusEvent(status=msg))
                     return
-            except Exception:
+            except Exception as exc:
                 tcrtl.SetBackgroundColour("pink")
-                msg = "Model Error: wrong value entered: %s" % sys.exc_info()[1]
+                msg = "Model Error: wrong value entered: %s" % exc
                 wx.PostEvent(self.parent, StatusEvent(status=msg))
                 return
@@ -1976 +1979 @@
                 else:
                     tcrtl.SetBackgroundColour("pink")
-                    msg = "Model Error: wrong value entered: %s" % \
-                          sys.exc_info()[1]
+                    _, exc, _ = sys.exc_info()
+                    msg = "Model Error: wrong value entered: %s" % exc
                     wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
                     return
-            except Exception:
+            except Exception as exc:
                 tcrtl.SetBackgroundColour("pink")
-                msg = "Model Error: wrong value entered: %s" % sys.exc_info()[1]
+                msg = "Model Error: wrong value entered: %s" % exc
                 wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
                 return
@@ -2291 +2294 @@
                     value_ctrl.SetValue(format_number(value))
 
-                if name not in self.model.details.keys():
+                if name not in self.model.details:
                     self.model.details[name] = ["", None, None]
                 old_low, old_high = self.model.details[name][1:3]
@@ -2750 +2753 @@
         gui_manager = self._manager.parent
         # loops through the panels [dic]
-        for _, item2 in gui_manager.plot_panels.iteritems():
+        for _, item2 in gui_manager.plot_panels.items():
             data_title = self.data.group_id
             # try to get all plots belonging to this control panel
@@ -3324 +3327 @@
             if self.data.__class__.__name__ == "Data2D":
                 name = item[1]
-                if name in content.keys():
+                if name in content:
                     values = content[name]
                     check = values[0]
@@ -3373 +3376 @@
                 if not item[1] in orient_param:
                     name = item[1]
-                    if name in content.keys():
+                    if name in content:
                         check = content[name][0]
                         # Avoid changing combox content
@@ -3480 +3483 @@
                 self.state.weights = self.weights
 
-        except Exception:
+        except Exception as exc:
             logger.error(traceback.format_exc())
-            print("Error in BasePage._paste_poly_help: %s" % \
-                  sys.exc_info()[1])
+            print("Error in BasePage._paste_poly_help: %s" % exc)
 
     def _set_disp_cb(self, isarray, item):
@@ -3548 +3550 @@
 
         self.categorybox.Clear()
-        cat_list = sorted(self.master_category_dict.keys())
+        cat_list = list(sorted(self.master_category_dict.keys()))
         if uncat_str not in cat_list:
             cat_list.append(uncat_str)