Changeset 2a0c7a6 in sasmodels

Timestamp:

Sep 12, 2016 1:18:36 AM (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:

4cc161e

Parents:

424fe00

Message:

allow ~ expansion in model names

File:

• sasmodels/custom/__init__.py (modified) (3 diffs)

sasmodels/custom/__init__.py

@@ -17 +17 @@
     def load_module_from_path(fullname, path):
         """load module from *path* as *fullname*"""
-        spec = spec_from_file_location(fullname, path)
+        spec = spec_from_file_location(fullname, os.path.expanduser(path))
         module = module_from_spec(spec)
         spec.loader.exec_module(module)
@@ -26 +26 @@
     def load_module_from_path(fullname, path):
         """load module from *path* as *fullname*"""
-        module = imp.load_source(fullname, path)
+        module = imp.load_source(fullname, os.path.expanduser(path))
         #os.unlink(path+"c")  # remove the automatic pyc file
         return module
@@ -35 +35 @@
     name = basename(splitext(path)[0])
     # Placing the model in the 'sasmodels.custom' name space.
-    kernel_module = load_module_from_path('sasmodels.custom.'+name, path)
+    kernel_module = load_module_from_path('sasmodels.custom.'+name,
+                                          os.path.expanduser(path))
     return kernel_module