Changeset 914ba0a in sasview for src/sas/sasgui/__init__.py

Timestamp:

May 2, 2017 3:58:01 PM (7 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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

d66dbcc

Parents:

74d9780 (diff), 658dd57 (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 with master

File:

• src/sas/sasgui/__init__.py (modified) (5 diffs)

src/sas/sasgui/__init__.py

@@ -2 +2 @@
 import os
 from os.path import exists, expanduser, dirname, realpath, join as joinpath
+
 
 def dirn(path, n):
@@ -45 +46 @@
 
 
-
 def get_app_dir():
     if APP_FOLDER is None:
@@ -55 +55 @@
         raise RuntimeError("Need to initialize sas.sasgui.USER_FOLDER")
     return USER_FOLDER
+
+def get_custom_config_path():
+    dirname = os.path.join(get_user_dir(), 'config')
+    # If the directory doesn't exist, create it
+    if not os.path.exists(dirname):
+        os.makedirs(dirname)
+    path = os.path.join(dirname, "custom_config.py")
+    return path
 
 _config_cache = None
@@ -69 +77 @@
     import logging
 
+    logger = logging.getLogger(__name__)
     dirname = get_app_dir()
     filename = 'local_config.py'
@@ -77 +86 @@
             fObj, config_path, descr = imp.find_module('local_config', [APP_FOLDER])
             config = imp.load_module('local_config', fObj, config_path, descr)
-            logging.info("GuiManager loaded %s" % config_path)
+            logger.info("GuiManager loaded %s" % config_path)
             return config
         except Exception:
-            import traceback; logging.error(traceback.format_exc())
-            logging.error("Error loading %s: %s" % (path, sys.exc_value))
+            import traceback; logger.error(traceback.format_exc())
+            logger.error("Error loading %s: %s" % (path, sys.exc_value))
         finally:
             if fObj is not None:
                 fObj.close()
     from sas.sasgui.guiframe import config
-    logging.info("GuiManager config defaults to sas.sasgui.guiframe")
+    logger.info("GuiManager config defaults to sas.sasgui.guiframe")
     return config
+