Changeset c499331 in sasmodels for sasmodels/core.py

Timestamp:

Mar 25, 2016 5:45:02 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

d19962c

Parents:

5ff1b03

Message:

progress on having compare.py recognize vector parameters

File:

• sasmodels/core.py (modified) (3 diffs)

sasmodels/core.py

@@ -29 +29 @@
 ]
 
+try:
+    # Python 3.5 and up
+    from importlib.util import spec_from_file_location, module_from_spec
+    def load_module(fullname, path):
+        spec = spec_from_file_location(fullname, path)
+        module = module_from_spec(spec)
+        spec.loader.exec_module(module)
+        return module
+except ImportError:
+    # CRUFT: python 2
+    import imp
+    def load_module(fullname, path):
+        module = imp.load_source(fullname, path)
+        return module
+
 def list_models():
     """
@@ -50 +65 @@
     Load model info and build model.
     """
-    return build_model(load_model_info(model_name), **kw)
+    if model_name.endswith('.py'):
+        model_info = load_model_info_from_path(model_name)
+    else:
+        model_info = load_model_info(model_name)
+    return build_model(model_info, **kw)
 
 def load_model_info_from_path(path):
@@ -63 +82 @@
     # though it doesn't actually exist.  imp.load_source doesn't seem
     # to care.
-    kernel_module = imp.load_source('sasmodels.custom.'+name, path)
+    import sasmodels.custom
+    kernel_module = load_module('sasmodels.custom.'+name, path)
 
     # Now that we have the module, we can load it as usual