Changeset c6bdb3b in sasview for src/sas/sasgui/__init__.py

Timestamp:

May 2, 2017 10:03:50 PM (8 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:

a67ec83

Parents:

7c105e8

Message:

more fiddling with configs

File:

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

src/sas/sasgui/__init__.py

@@ -47 +47 @@
 
 def get_app_dir():
-    if APP_FOLDER is None:
-        raise RuntimeError("Need to initialize sas.sasgui.USER_FOLDER")
     return APP_FOLDER
 
 def get_user_dir():
-    if USER_FOLDER is None:
-        raise RuntimeError("Need to initialize sas.sasgui.USER_FOLDER")
     return USER_FOLDER
 
@@ -74 +70 @@
     import os
     import sys
-    import imp
     import logging
+    from sasmodels.custom import load_module_from_path
 
     logger = logging.getLogger(__name__)
@@ -81 +77 @@
     filename = 'local_config.py'
     path = os.path.join(dirname, filename)
-    if os.path.exists(path):
-        try:
-            fObj = None
-            fObj, config_path, descr = imp.find_module('local_config', [APP_FOLDER])
-            config = imp.load_module('local_config', fObj, config_path, descr)
-            logger.info("GuiManager loaded %s" % config_path)
-            return config
-        except Exception:
-            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
-    logger.info("GuiManager config defaults to sas.sasgui.guiframe")
-    return config
-
+    try:
+        module = load_module_from_path('sas.sasgui.local_config', path)
+        logger.info("GuiManager loaded %s", path)
+        return module
+    except Exception as exc:
+        logger.critical("Error loading %s: %s", path, exc)
+        sys.exit()