Changeset 5251ec6 in sasview for src/sas/sasgui/perspectives/pr/inversion_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/pr/inversion_panel.py (modified) (6 diffs)

src/sas/sasgui/perspectives/pr/inversion_panel.py

@@ -5 +5 @@
 __revision__ = "$Revision: 1193 $"
 
-import wx
 import os
 import sys
 import logging
+
+import wx
 from wx.lib.scrolledpanel import ScrolledPanel
+
 from sas.sasgui.guiframe.events import StatusEvent
 from sas.sasgui.guiframe.panel_base import PanelBase
-from inversion_state import InversionState
-from pr_widgets import PrTextCtrl
-from pr_widgets import DataFileTextCtrl
-from pr_widgets import OutputTextCtrl
 from sas.sasgui.guiframe.documentation_window import DocumentationWindow
+
+from .inversion_state import InversionState
+from .pr_widgets import PrTextCtrl
+from .pr_widgets import DataFileTextCtrl
+from .pr_widgets import OutputTextCtrl
 
 logger = logging.getLogger(__name__)
@@ -752 +755 @@
         except ValueError:
             logger.error("InversionControl._on_accept_alpha got a value that was not a number: %s" % alpha )
-        except:
+        except Exception as exc:
             # No estimate or bad estimate, either do nothing
-            logger.error("InversionControl._on_accept_alpha: %s" % sys.exc_value)
+            logger.error("InversionControl._on_accept_alpha: %s" % exc)
 
     def _on_accept_nterms(self, evt):
@@ -768 +771 @@
         except ValueError:
             logger.error("InversionControl._on_accept_nterms got a value that was not a number: %s" % nterms )
-        except:
+        except Exception as exc:
             # No estimate or bad estimate, either do nothing
-            logger.error("InversionControl._on_accept_nterms: %s" % sys.exc_value)
+            logger.error("InversionControl._on_accept_nterms: %s" % exc)
 
     def clear_panel(self):
@@ -901 +904 @@
                 message += "than the number of points"
                 wx.PostEvent(self._manager.parent, StatusEvent(status=message))
-                raise ValueError, message
+                raise ValueError(message)
             self.nfunc_ctl.SetBackgroundColour(wx.WHITE)
             self.nfunc_ctl.Refresh()
@@ -957 +960 @@
         Invoke the d_max exploration dialog
         """
-        from explore_dialog import ExploreDialog
+        from .explore_dialog import ExploreDialog
         if self._manager._last_pr is not None:
             pr = self._manager._create_plot_pr()
@@ -1008 +1011 @@
                 self._on_invert(None)
                 self._set_analysis(True)
-            except:
-                msg = "InversionControl._change_file: %s" % sys.exc_value
+            except Exception as exc:
+                msg = "InversionControl._change_file: %s" % exc
                 logger.error(msg)