Changeset b854587 in sasview for sasview/setup_mac.py

Timestamp:

Apr 11, 2017 6:01:57 AM (7 years ago)

Author:

GitHub <noreply@…>

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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

7b15990

Parents:

f36e01f (diff), a42fb8e (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.

git-author:

Andrew Jackson <andrew.jackson@…> (04/11/17 06:01:57)

git-committer:

GitHub <noreply@…> (04/11/17 06:01:57)

Message:

Merge branch 'master' into pytest

File:

• sasview/setup_mac.py (modified) (1 diff)

sasview/setup_mac.py

@@ -60 +60 @@
     if os.path.isfile(libxml_path_test):
         libxml_path = libxml_path_test
-if libxml_path == None:
+if libxml_path is None:
     raise RuntimeError, "Could not find libxml2 on the system"