Changeset 96e151f in sasview

Timestamp:

May 6, 2016 4:23:48 PM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

a24bd6e

Parents:

e791cca

Message:

don't fail check_packages if PIL is not available

File:

• check_packages.py (modified) (1 diff)

check_packages.py

@@ -7 +7 @@
 # Fix for error: hash-collision-3-both-1-and-1/
 # See http://jaredforsyth.com/blog/2010/apr/28/accessinit-hash-collision-3-both-1-and-1/
-import PIL.Image
-sys.modules['Image'] = PIL.Image
+try:
+    import PIL.Image
+except ImportError:
+    pass
+else:
+    sys.modules['Image'] = PIL.Image
+
 
 common_required_package_list = {