Changeset 270c882b in sasview for src/sas/sascalc/data_util

Timestamp:

Apr 5, 2017 5:31:36 AM (8 years ago)

Author:

krzywon

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

cfc6f3c7

Parents:

b9b612a

git-author:

Jeff Krzywon <krzywon@…> (04/05/17 05:31:36)

git-committer:

krzywon <krzywon@…> (04/05/17 05:31:36)

Message:

Beginning implementation of exception handling within data loader.

File:

• src/sas/sascalc/data_util/registry.py (modified) (7 diffs)

src/sas/sascalc/data_util/registry.py

@@ -7 +7 @@
 """
 
-import os.path
+from sas.sascalc.dataloader.loader_exceptions import NoKnownLoaderException
+
 
 class ExtensionRegistry(object):
@@ -61 +62 @@
     def __init__(self, **kw):
         self.loaders = {}
+
     def __setitem__(self, ext, loader):
         if ext not in self.loaders:
             self.loaders[ext] = []
         self.loaders[ext].insert(0,loader)
+
     def __getitem__(self, ext):
         return self.loaders[ext]
+
     def __contains__(self, ext):
         return ext in self.loaders
+
     def formats(self):
         """
@@ -76 +81 @@
         names.sort()
         return names
+
     def extensions(self):
         """
@@ -83 +89 @@
         exts.sort()
         return exts
+
     def lookup(self, path):
         """
@@ -105 +112 @@
         # 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
+
     def load(self, path, format=None):
         """
@@ -117 +125 @@
         """
         if format is None:
-            loaders = self.lookup(path)
+            try:
+                loaders = self.lookup(path)
+            except ValueError as e:
+                pass
         else:
-            loaders = self.loaders[format]
+            try:
+                loaders = self.loaders[format]
+            except KeyError as e:
+                pass
         for fn in loaders:
             try:
                 return fn(path)
-            except:
-                pass # give other loaders a chance to succeed
+            except Exception as e:
+                pass  # give other loaders a chance to succeed
         # If we get here it is because all loaders failed
-        raise # reraises last exception
+        raise NoKnownLoaderException(e.message)  # raise generic exception
 
+
+# TODO: Move this to the unit test folder
 def test():
     reg = ExtensionRegistry()
@@ -163 +179 @@
     try: reg.load('hello.missing')
     except ValueError,msg:
-        assert str(msg)=="Unknown file type for hello.missing",'Message: <%s>'%(msg)
+        assert str(msg)=="Unknown file type for hello.missing",\
+            'Message: <%s>'%(msg)
     else: raise AssertError,"No error raised for missing extension"
     assert reg.formats() == ['new_cx']