Changeset 8632a35 in sasmodels for sasmodels/bumps_model.py

Timestamp:

Feb 19, 2015 8:53:28 AM (9 years ago)

Author:

jhbakker

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:

16bc3fc, 33d38d5

Parents:

9c117a2 (diff), c9801b8 (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/bumps_model.py (modified) (1 diff)

sasmodels/bumps_model.py

@@ -17 +17 @@
 try:
     from .kernelcl import load_model as _loader
-except ImportError,exc:
+except RuntimeError,exc:
     import warnings
     warnings.warn(str(exc))