Changeset bd4ed1b in sasmodels

Timestamp:

May 10, 2016 2:46:06 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:

558d3b3

Parents:

a5da1f2

Message:

cleaner version of file gathering code

File:

• sasmodels/__init__.py (modified) (1 diff)

sasmodels/__init__.py

@@ -28 +28 @@
     from .generate import EXTERNAL_DIR, DATA_PATH
 
-    data_files = {}
-    def add_patterns(path, patterns):
-        data_files[joinpath(EXTERNAL_DIR, *path)] \
-            = [joinpath(DATA_PATH, *(path+[p])) for p in patterns]
-    add_patterns([], ['*.c', '*.cl', 'convert.json'])
-    add_patterns(['models'], ['*.c'])
-    add_patterns(['models', 'lib'], ['*.c'])
+    def expand_patterns(path, patterns):
+        target_path = joinpath(EXTERNAL_DIR, *path)
+        source_path = joinpath(DATA_PATH, *path)
+        files = []
+        for p in patterns:
+            files.extend(glob.glob(joinpath(source_path, p)))
+        return target_path, files
 
-    # Fish out full paths for all files.
-    return_list=[]
-    for path, patterns in data_files.items():
-        files_data=[]
-        for pattern in patterns:
-            files_data.extend(glob.glob(pattern))
-        return_list.append([path, files_data])
+    return_list = [
+        expand_patterns([], ['*.c', '*.cl', 'convert.json']),
+        expand_patterns(['models'], ['*.c']),
+        expand_patterns(['models', 'lib'], ['*.c']),
+        ]
     return return_list