Changeset b9d74f3 in sasview for src/sas/sascalc/data_util

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

Location:

src/sas/sascalc/data_util

Files:

• nxsunit.py (modified) (1 diff)
• odict.py (modified) (1 diff)
• registry.py (modified) (2 diffs)

src/sas/sascalc/data_util/nxsunit.py

@@ -189 +189 @@
 
 def _check(expect,get):
-    if expect != get: raise ValueError, "Expected %s but got %s"%(expect,get)
+    if expect != get: raise ValueError("Expected %s but got %s"%(expect,get))
      #print expect,"==",get
 

src/sas/sascalc/data_util/odict.py

@@ -612 +612 @@
         """
         if len(args) > 1:
-            raise TypeError, ('pop expected at most 2 arguments, got %s' %
+            raise TypeError('pop expected at most 2 arguments, got %s' %
                 (len(args) + 1))
         if key in self:

src/sas/sascalc/data_util/registry.py

@@ -105 +105 @@
         # Raise an error if there are no matching extensions
         if len(loaders) == 0:
-            raise ValueError, "Unknown file type for "+path
+            raise ValueError("Unknown file type for "+path)
         # All done
         return loaders
@@ -159 +159 @@
     try:  reg.load('hello.cx2')
     except CxError: pass # correct failure
-    else: raise AssertError,"Incorrect error on load failure"
+    else: raise AssertError("Incorrect error on load failure")
     # Make sure the case of no loaders fails correctly
     try: reg.load('hello.missing')
     except ValueError,msg:
         assert str(msg)=="Unknown file type for hello.missing",'Message: <%s>'%(msg)
-    else: raise AssertError,"No error raised for missing extension"
+    else: raise AssertError("No error raised for missing extension")
     assert reg.formats() == ['new_cx']
     assert reg.extensions() == ['.cx','.cx.gz','.cx1','.cx1.gz','.cx2','.gz']