Changeset 5251ec6 in sasview for src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py

Timestamp:

Oct 11, 2018 12: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/calculator/resolution_calculator_panel.py (modified) (10 diffs)

src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py

@@ -148 +148 @@
         # Custom sorting
         source_list = []
-        for key, _ in self.source_mass.iteritems():
+        for key, _ in self.source_mass.items():
             name_source = str(key)
             source_list.append(name_source)
@@ -667 +667 @@
         Execute the computation of resolution
         """
+        # Clone the event before CallAfter; the event seems
+        # to delete the event when it is done processing, so
+        # the original will not be available when the call
+        # after method starts.
+        if event is not None:
+            event = event.Clone()
         wx.CallAfter(self.on_compute_call, event)
 
@@ -753 +759 @@
             wx.MessageBox(msg, 'Warning')
             return
-            #raise ValueError, "Invalid Q Input..."
+            #raise ValueError("Invalid Q Input...")
 
         # Validate the q inputs
@@ -934 +940 @@
     def _sigma_strings(self):
         """
-        Recode sigmas as strins
+        Recode sigmas as strings
         """
         sigma_r = self.format_number(self.resolution.sigma_1)
@@ -1082 +1088 @@
                 msg = "The numbers must be one or two (separated by ',')..."
                 self._status_info(msg, 'stop')
-                raise RuntimeError, msg
+                raise RuntimeError(msg)
 
         return new_string
@@ -1099 +1105 @@
                 value = float(string_split[ind])
                 new_string.append(value)
-            except:
-                logger.error(sys.exc_value)
+            except Exception as exc:
+                logger.error(exc)
 
         return new_string
@@ -1141 +1147 @@
                         out = self._string2inputlist(string)
                         return out
-                except:
-                    logger.error(sys.exc_value)
+                except Exception as exc:
+                    logger.error(exc)
 
     def _on_xy_coordinate(self, event=None):
@@ -1269 +1275 @@
             try:
                 basename = os.path.basename(path)
-                if basename not in self.spectrum_dic.keys():
+                if basename not in self.spectrum_dic:
                     self.spectrum_cb.Append(basename)
                 self.spectrum_dic[basename] = self._read_file(path)
@@ -1286 +1292 @@
         dlg = wx.FileDialog(self,
                             "Choose a wavelength spectrum file: Intensity vs. wavelength",
-                            self.parent.parent.get_save_location() , "", "*.*", wx.OPEN)
+                            self.parent.parent.get_save_location() , "", "*.*", wx.FD_OPEN)
         path = None
         if dlg.ShowModal() == wx.ID_OK:
@@ -1318 +1324 @@
                     wavelength.append(wave)
                     intensity.append(intens)
-                except:
+                except Exception as exc:
                     # Skip non-data lines
-                    logger.error(sys.exc_value)
+                    logger.error(exc)
 
             return [wavelength, intensity]