Changeset ba8d326 in sasview for src/sas/sasgui/perspectives/fitting/models.py

Timestamp:

Jun 23, 2017 4:16:29 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

98e3f24

Parents:

81b35396

git-author:

Paul Kienzle <pkienzle@…> (06/21/17 12:38:48)

git-committer:

Paul Kienzle <pkienzle@…> (06/23/17 16:16:29)

Message:

code cleanup

File:

• src/sas/sasgui/perspectives/fitting/models.py (modified) (10 diffs)

src/sas/sasgui/perspectives/fitting/models.py

@@ -68 +68 @@
     try:
         new_instance = model()
-    except:
+    except Exception:
         msg = "Plugin %s error in __init__ \n\t: %s %s\n" % (str(name),
                                                              str(sys.exc_type),
@@ -78 +78 @@
         try:
             value = new_instance.function()
-        except:
+        except Exception:
             msg = "Plugin %s: error writing function \n\t :%s %s\n " % \
                     (str(name), str(sys.exc_type), sys.exc_info()[1])
@@ -102 +102 @@
 
     # Find paths needed
+    # TODO: remove unneeded try/except block
     try:
         # For source
@@ -108 +109 @@
         else:
             raise
-    except:
+    except Exception:
         # Check for data path next to exe/zip file.
         #Look for maximum n_dir up of the current dir to find plugins dir
@@ -158 +159 @@
         compileall.compile_dir(dir=dir, ddir=dir, force=0,
                                quiet=report_problem)
-    except:
+    except Exception:
         return sys.exc_info()[1]
     return None
@@ -177 +178 @@
     plugin_log("looking for models in: %s" % str(directory))
     # compile_file(directory)  #always recompile the folder plugin
-    logger.info("plugin model dir: %s" % str(directory))
+    logger.info("plugin model dir: %s", str(directory))
 
     plugins = {}
@@ -192 +193 @@
                 msg += "\nwhile accessing model in %r" % path
                 plugin_log(msg)
-                logger.warning("Failed to load plugin %r. See %s for details"
-                               % (path, PLUGIN_LOG))
+                logger.warning("Failed to load plugin %r. See %s for details",
+                               path, PLUGIN_LOG)
 
     return plugins
@@ -230 +231 @@
 
 
-class ModelManagerBase:
+class ModelManagerBase(object):
     """
     Base class for the model manager
@@ -265 +266 @@
         if self.is_changed():
             return  _find_models()
-        logger.info("plugin model : %s" % str(temp))
+        logger.info("plugin model : %s", str(temp))
         return temp
 
@@ -297 +298 @@
         for name, plug in self.stored_plugins.iteritems():
             self.model_dictionary[name] = plug
-        
+
         self._get_multifunc_models()