Changeset 5251ec6 in sasview for src/sas/sasgui/plottools/fitDialog.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/plottools/fitDialog.py (modified) (4 diffs)

src/sas/sasgui/plottools/fitDialog.py

@@ +1 @@
+import sys
+import math
+
 import wx
-from plottables import Theory1D
-import math
 import numpy as np
-import fittings
-import transform
-import sys
+
+from . import fittings
+from . import transform
+from .plottables import Theory1D
 
 # Linear fit panel size
@@ -86 +88 @@
         self.layout()
         # Receives the type of model for the fitting
-        from LineModel import LineModel
+        from .LineModel import LineModel
         self.model = LineModel()
         # Display the fittings values
@@ -671 +673 @@
                 return x
             else:
-                raise ValueError, "cannot compute log of a negative number"
+                raise ValueError("cannot compute log of a negative number")
 
     def floatInvTransform(self, x):
@@ -734 +736 @@
         except:
             msg = "LinearFit.set_fit_region: fit range must be floats"
-            raise ValueError, msg
+            raise ValueError(msg)
         self.xminFit.SetValue(format_number(xmin))
         self.xmaxFit.SetValue(format_number(xmax))