Changeset da7af35 in sasmodels

Timestamp:

May 10, 2016 7:02:27 AM (8 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

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:

848193e, 4e00c13

Parents:

dc1e729

Message:

On windows, query content of the library.zip file for models.

File:

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

sasmodels/core.py

@@ -56 +56 @@
     """
     root = dirname(__file__)
+    available_models = []
     files = sorted(glob(joinpath(root, 'models', "[a-zA-Z]*.py")))
-    available_models = [basename(f)[:-3] for f in files]
+    if not files and os.name=='nt':
+        # Look inside library.zip on windows,
+        # being careful as the library stores only .pyc.
+        import zipfile
+        location = root[:root.find('.zip')+4]
+        zf = zipfile.ZipFile(location,'r')
+        for filepath in zf.namelist():
+            # directory structure in library.zip uses "/"
+            models_loc = "sasmodels/models"
+            if models_loc in filepath:
+                base = basename(filepath)[:-4]
+                # Careful with non-models.
+                if base[0] != "_":
+                    available_models.append(base)
+    else:
+        available_models = [basename(f)[:-3] for f in files]
     return available_models