Changeset 0cc77d8 in sasview for src/sas/sascalc/dataloader/readers/tiff_reader.py

Timestamp:

May 1, 2017 5:00:53 PM (8 years ago)

Author:

GitHub <noreply@…>

Children:

733cdcd

Parents:

b9d74f3 (diff), c00a797a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Paul Kienzle <pkienzle@…> (05/01/17 17:00:53)

git-committer:

GitHub <noreply@…> (05/01/17 17:00:53)

Message:

Merge branch 'master' into raise

File:

• src/sas/sascalc/dataloader/readers/tiff_reader.py (modified) (2 diffs)

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

@@ -44 +44 @@
         except:
             msg = "tiff_reader: could not load file. Missing Image module."
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
         
         # Instantiate data object
@@ -54 +54 @@
             im = Image.open(filename)
         except:
-            raise  RuntimeError, "cannot open %s"%(filename)
+            raise  RuntimeError("cannot open %s"%(filename))
         data = im.getdata()