Changeset 2f733b1 in sasmodels

Timestamp:

Mar 6, 2018 9:56:22 AM (6 years ago)

Author:

krzywon

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

f9c8474

Parents:

a22d104

Message:

Make exception handling more specific when attempting to load models.

File:

• sasmodels/generate.py (modified) (2 diffs)

sasmodels/generate.py

@@ -898 +898 @@
     load it from :mod:`sasmodels.models`.
     """
-    # TODO: Keep current scheme (.py looks in custom folders)
-    plugin_path = environ.get('PLUGIN_MODEL_DIR', None)
     if model_name.endswith('.py'):
         kernel_module = load_custom_kernel_module(model_name)
@@ -907 +905 @@
             __import__('sasmodels.models.'+model_name)
             kernel_module = getattr(models, model_name, None)
-        except Exception:
+        except ImportError:
+            # If the model isn't a built in model, try the plugin directory
+            plugin_path = environ.get('PLUGIN_MODEL_DIR', None)
             if plugin_path is not None:
                 file_name = model_name.split(sep)[-1]
                 model_name = plugin_path + sep + file_name + ".py"
-            kernel_module = load_custom_kernel_module(model_name)
+                kernel_module = load_custom_kernel_module(model_name)
+            else:
+                raise
     return kernel_module