Changeset b9d74f3 in sasview for src/sas/sascalc/calculator/sas_gen.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/calculator/sas_gen.py (modified) (11 diffs)

src/sas/sascalc/calculator/sas_gen.py

@@ -32 +32 @@
         factor = MFACTOR_MT
     else:
-        raise ValueError, "Invalid valueunit"
+        raise ValueError("Invalid valueunit")
     sld_m = factor * mag
     return sld_m
@@ -172 +172 @@
             if len(x[1]) > 0:
                 msg = "Not a 1D."
-                raise ValueError, msg
+                raise ValueError(msg)
             i_out = np.zeros_like(x[0])
             # 1D I is found at y =0 in the 2D pattern
@@ -179 +179 @@
         else:
             msg = "Q must be given as list of qx's and qy's"
-            raise ValueError, msg
+            raise ValueError(msg)
 
     def runXY(self, x=0.0):
@@ -194 +194 @@
         else:
             msg = "Q must be given as list of qx's and qy's"
-            raise ValueError, msg
+            raise ValueError(msg)
 
     def evalDistribution(self, qdist):
@@ -212 +212 @@
             mesg = "evalDistribution is expecting an ndarray of "
             mesg += "a list [qx,qy] where qx,qy are arrays."
-            raise RuntimeError, mesg
+            raise RuntimeError(mesg)
 
 class OMF2SLD(object):
@@ -313 +313 @@
         msg = "Error: Inconsistent data length."
         if len(self.pos_x) != length:
-            raise ValueError, msg
+            raise ValueError(msg)
         if len(self.pos_y) != length:
-            raise ValueError, msg
+            raise ValueError(msg)
         if len(self.pos_z) != length:
-            raise ValueError, msg
+            raise ValueError(msg)
         if len(self.mx) != length:
-            raise ValueError, msg
+            raise ValueError(msg)
         if len(self.my) != length:
-            raise ValueError, msg
+            raise ValueError(msg)
         if len(self.mz) != length:
-            raise ValueError, msg
+            raise ValueError(msg)
 
     def remove_null_points(self, remove=False, recenter=False):
@@ -413 +413 @@
                         msg = "Error: \n"
                         msg += "We accept only m as meshunit"
-                        raise ValueError, msg
+                        raise ValueError(msg)
                 if s_line[0].lower().count("xbase") > 0:
                     xbase = s_line[1].lstrip()
@@ -483 +483 @@
             msg = "%s is not supported: \n" % path
             msg += "We accept only Text format OMF file."
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
 class PDBReader(object):
@@ -603 +603 @@
             return output
         except:
-            raise RuntimeError, "%s is not a sld file" % path
+            raise RuntimeError("%s is not a sld file" % path)
 
     def write(self, path, data):
@@ -695 +695 @@
             return output
         except:
-            raise RuntimeError, "%s is not a sld file" % path
+            raise RuntimeError("%s is not a sld file" % path)
 
     def write(self, path, data):
@@ -704 +704 @@
         """
         if path is None:
-            raise ValueError, "Missing the file path."
+            raise ValueError("Missing the file path.")
         if data is None:
-            raise ValueError, "Missing the data to save."
+            raise ValueError("Missing the data to save.")
         x_val = data.pos_x
         y_val = data.pos_y