Changeset efe730d in sasview for src/sas/sasgui/guiframe/acknowledgebox.py

Timestamp:

Jun 25, 2016 4:07:33 AM (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:

899e084

Parents:

9501661

git-author:

Paul Kienzle <pkienzle@…> (06/25/16 02:23:59)

git-committer:

Paul Kienzle <pkienzle@…> (06/25/16 04:07:33)

Message:

move sasview to src/sas/sasview and refactor bundled apps for easier debugging

File:

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

src/sas/sasgui/guiframe/acknowledgebox.py

@@ -8 +8 @@
 __revision__ = "$Revision: 1193 $"
 
+import os
+
 import wx
 import wx.richtext
 import wx.lib.hyperlink
-import random
-import os.path
-import os
-try:
-    # Try to find a local config
-    import imp
-    path = os.getcwd()
-    if(os.path.isfile("%s/%s.py" % (path, 'local_config'))) or \
-      (os.path.isfile("%s/%s.pyc" % (path, 'local_config'))):
-        fObj, path, descr = imp.find_module('local_config', [path])
-        config = imp.load_module('local_config', fObj, path, descr)
-    else:
-        # Try simply importing local_config
-        import local_config as config
-except:
-    # Didn't find local config, load the default
-    import config
 
+from sas.sasgui import get_local_config
+config = get_local_config()
 
 class DialogAcknowledge(wx.Dialog):