Changeset 87d44c7 in sasview

Timestamp:

Apr 7, 2017 1:32:08 AM (8 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:

bb81385

Parents:

ec8886e (diff), 49165488 (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:

Paul Kienzle <pkienzle@…> (04/07/17 01:32:08)

git-committer:

GitHub <noreply@…> (04/07/17 01:32:08)

Message:

Merge pull request #66 from andyfaff/get_none

MAINT: Avoid None as a redundant second argument to dict.get()

File:

• src/sas/sasgui/guiframe/gui_manager.py (modified) (1 diff)

src/sas/sasgui/guiframe/gui_manager.py

@@ -2122 +2122 @@
         """
         if custom_config is not None:
-            sas_opencl = os.environ.get("SAS_OPENCL",None)
+            sas_opencl = os.environ.get("SAS_OPENCL")
             new_config_lines = []
             config_file = open(custom_config.__file__)