Changeset 47be5a1 in sasview for src/sas/_config.py

Timestamp:

Nov 2, 2018 1:04:28 PM (5 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249

Children:

93b34cc

Parents:

d742b56

Message:

redo handling of cust config failures

File:

• src/sas/_config.py (modified) (2 diffs)

src/sas/_config.py

@@ -94 +94 @@
             logger.error("Could not copy default custom config.")
 
+    custom_config = load_custom_config(path)
+
     #Adding SAS_OPENCL if it doesn't exist in the config file
     # - to support backcompability
-    if not "SAS_OPENCL" in open(path).read():
+    if not hasattr(custom_config, "SAS_OPENCL"):
+        custom_config.SAS_OPENCL = None
         try:
             open(config_file, "a+").write("SAS_OPENCL = \"None\"\n")
@@ -102 +105 @@
             logger.error("Could not update custom config with SAS_OPENCL.")
 
-    custom_config = load_custom_config(path)
     return custom_config
-
 
 def load_custom_config(path):