Changeset b9d74f3 in sasview for src/sas/sascalc/pr/invertor.py

Timestamp:

Apr 20, 2017 6:29:34 AM (8 years ago)

Author:

andyfaff

Children:

0cc77d8

Parents:

b636dfc5

git-author:

Andrew Nelson <andyfaff@…> (04/20/17 06:25:57)

git-committer:

Andrew Nelson <andyfaff@…> (04/20/17 06:29:34)

Message:

MAINT: use raise Exception() not raise Exception

File:

• src/sas/sascalc/pr/invertor.py (modified) (8 diffs)

src/sas/sascalc/pr/invertor.py

@@ -148 +148 @@
                 msg = "Invertor: one of your q-values is zero. "
                 msg += "Delete that entry before proceeding"
-                raise ValueError, msg
+                raise ValueError(msg)
             return self.set_x(value)
         elif name == 'y':
@@ -159 +159 @@
                 msg = "Invertor: d_max must be greater than zero."
                 msg += "Correct that entry before proceeding"
-                raise ValueError, msg
+                raise ValueError(msg)
             return self.set_dmax(value)
         elif name == 'q_min':
@@ -181 +181 @@
                 return self.set_has_bck(0)
             else:
-                raise ValueError, "Invertor: has_bck can only be True or False"
+                raise ValueError("Invertor: has_bck can only be True or False")
 
         return Cinvertor.__setattr__(self, name, value)
@@ -325 +325 @@
         if self.is_valid() <= 0:
             msg = "Invertor.invert: Data array are of different length"
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
         p = np.ones(nfunc)
@@ -358 +358 @@
         if self.is_valid() <= 0:
             msg = "Invertor.invert: Data arrays are of different length"
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
         p = np.ones(nfunc)
@@ -442 +442 @@
         if self.is_valid() < 0:
             msg = "Invertor: invalid data; incompatible data lengths."
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
         self.nfunc = nfunc
@@ -467 +467 @@
             self._get_matrix(nfunc, nq, a, b)
         except:
-            raise RuntimeError, "Invertor: could not invert I(Q)\n  %s" % sys.exc_value
+            raise RuntimeError("Invertor: could not invert I(Q)\n  %s" % sys.exc_value)
 
         # Perform the inversion (least square fit)
@@ -751 +751 @@
             except:
                 msg = "Invertor.from_file: corrupted file\n%s" % sys.exc_value
-                raise RuntimeError, msg
+                raise RuntimeError(msg)
         else:
             msg = "Invertor.from_file: '%s' is not a file" % str(path)
-            raise RuntimeError, msg
+            raise RuntimeError(msg)