Changeset 64f0a1c in sasmodels

Timestamp:

Oct 11, 2016 10:57:58 AM (8 years ago)

Author:

mathieu

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

3a45c2c

Parents:

19e7ca7

Message:

Make sure Sum|Multi models are not loaded a second time as _user. Re #766

File:

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

sasmodels/sasview_model.py

@@ -125 +125 @@
         if not hasattr(model, 'filename'):
             model.filename = kernel_module.__file__
+            # For old models, treat .pyc and .py files interchangeably.
+            # This is needed because of the Sum|Multi(p1,p2) types of models
+            # and the convoluted way in which they are created.
+            if model.filename.endswith(".py"):
+                logging.info("Loading %s as .pyc", model.filename)
+                model.filename = model.filename+'c'
         if not hasattr(model, 'id'):
             model.id = splitext(basename(model.filename))[0]