Changes in / [a0243f7:bf94e6e] in sasmodels

File:

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

sasmodels/generate.py

@@ -169 +169 @@
 
 import sys
-from os import environ
-from os.path import abspath, dirname, join as joinpath, exists, getmtime, sep
+from os.path import abspath, dirname, join as joinpath, exists, getmtime
 import re
 import string
@@ -901 +900 @@
         kernel_module = load_custom_kernel_module(model_name)
     else:
-        try:
-            from sasmodels import models
-            __import__('sasmodels.models.'+model_name)
-            kernel_module = getattr(models, model_name, None)
-        except ImportError:
-            # If the model isn't a built in model, try the plugin directory
-            plugin_path = environ.get('SAS_MODELPATH', 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)
-            else:
-                raise
+        from sasmodels import models
+        __import__('sasmodels.models.'+model_name)
+        kernel_module = getattr(models, model_name, None)
     return kernel_module