Changeset e090ba90 in sasview for src/sas/sascalc/fit/models.py

Timestamp:

Oct 11, 2018 1:59:57 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1249

Children:

88d2e70

Parents:

67ed543

Message:

remove errors and warnings from py37 tests of sascalc

File:

• src/sas/sascalc/fit/models.py (modified) (6 diffs)

src/sas/sascalc/fit/models.py

@@ -12 +12 @@
 import py_compile
 import shutil
+
+from six import reraise
 
 from sasmodels.sasview_model import load_custom_model, load_standard_models
@@ -62 +64 @@
     try:
         new_instance = model()
-    except Exception:
-        msg = "Plugin %s error in __init__ \n\t: %s %s\n" % (str(name),
-                                                             str(sys.exc_type),
-                                                             sys.exc_info()[1])
+    except Exception as exc:
+        msg = ("Plugin %s error in __init__ \n\t: %s %s\n"
+               % (name, type(exc), exc))
         plugin_log(msg)
         return None
@@ -72 +73 @@
         try:
             value = new_instance.function()
-        except Exception:
+        except Exception as exc:
             msg = "Plugin %s: error writing function \n\t :%s %s\n " % \
-                    (str(name), str(sys.exc_type), sys.exc_info()[1])
+                    (str(name), str(type(exc)), exc)
             plugin_log(msg)
             return None
@@ -139 +140 @@
         if type is not None and issubclass(type, py_compile.PyCompileError):
             print("Problem with", repr(value))
-            raise type, value, tb
+            reraise(type, value, tb)
         return 1
 
@@ -153 +154 @@
         compileall.compile_dir(dir=dir, ddir=dir, force=0,
                                quiet=report_problem)
-    except Exception:
-        return sys.exc_info()[1]
+    except Exception as exc:
+        return exc
     return None
 
@@ -185 +186 @@
                     model.name = PLUGIN_NAME_BASE + model.name
                 plugins[model.name] = model
-            except Exception:
+            except Exception as exc:
                 msg = traceback.format_exc()
                 msg += "\nwhile accessing model in %r" % path