Changeset b9d74f3 in sasview for src/sas/sascalc/dataloader/readers/ascii_reader.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/dataloader/readers/ascii_reader.py (modified) (3 diffs)

src/sas/sascalc/dataloader/readers/ascii_reader.py

@@ -64 +64 @@
                     input_f = open(path,'rb')
                 except:
-                    raise  RuntimeError, "ascii_reader: cannot open %s" % path
+                    raise  RuntimeError("ascii_reader: cannot open %s" % path)
                 buff = input_f.read()
                 lines = buff.splitlines()
@@ -173 +173 @@
                 if not is_data:
                     msg = "ascii_reader: x has no data"
-                    raise RuntimeError, msg
+                    raise RuntimeError(msg)
                 # Sanity check
                 if has_error_dy == True and not len(ty) == len(tdy):
                     msg = "ascii_reader: y and dy have different length"
-                    raise RuntimeError, msg
+                    raise RuntimeError(msg)
                 if has_error_dx == True and not len(tx) == len(tdx):
                     msg = "ascii_reader: y and dy have different length"
-                    raise RuntimeError, msg
+                    raise RuntimeError(msg)
                 # If the data length is zero, consider this as
                 # though we were not able to read the file.
                 if len(tx) == 0:
-                    raise RuntimeError, "ascii_reader: could not load file"
+                    raise RuntimeError("ascii_reader: could not load file")
 
                 #Let's re-order the data to make cal.
@@ -222 +222 @@
                 output.meta_data['loader'] = self.type_name
                 if len(output.x) < 1:
-                    raise RuntimeError, "%s is empty" % path
+                    raise RuntimeError("%s is empty" % path)
                 return output
 
         else:
-            raise RuntimeError, "%s is not a file" % path
+            raise RuntimeError("%s is not a file" % path)
         return None