Changeset 02dfcab in sasmodels for sasmodels/core.py

Timestamp:

Feb 24, 2015 2:21:22 PM (9 years ago)

Author:

ajj

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:

5134b2c

Parents:

43bdddc (diff), 84e01d2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasmodels

File:

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

sasmodels/core.py

@@ -12 +12 @@
 try:
     from .kernelcl import load_model as load_model_cl
-except ImportError,exc:
+except Exception,exc:
     load_model_cl = None
 from .kerneldll import load_model as load_model_dll