Changeset a5da1f2 in sasmodels for sasmodels/__init__.py

Timestamp:

May 10, 2016 4:36:09 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:

bd4ed1b

Parents:

848193e

Message:

fix path to models in frozen version of application

File:

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

sasmodels/__init__.py

@@ -24 +24 @@
     """
     from os.path import join as joinpath
-    from .generate import SIBLING_DIR, DATA_PATH
+    import glob
+
+    from .generate import EXTERNAL_DIR, DATA_PATH
+
     data_files = {}
     def add_patterns(path, patterns):
-        data_files[joinpath(SIBLING_DIR, *path)] \
+        data_files[joinpath(EXTERNAL_DIR, *path)] \
             = [joinpath(DATA_PATH, *(path+[p])) for p in patterns]
     add_patterns([], ['*.c', '*.cl', 'convert.json'])
@@ -34 +37 @@
 
     # Fish out full paths for all files.
-    import glob
     return_list=[]
-    for key, values in data_files.iteritems():
+    for path, patterns in data_files.items():
         files_data=[]
-        for value in values:
-            files_data += [file for file in glob.glob(value)]
-        return_list.append([key, files_data])
+        for pattern in patterns:
+            files_data.extend(glob.glob(pattern))
+        return_list.append([path, files_data])
     return return_list