Changeset a97003e in sasview

Timestamp:

Dec 15, 2011 3:43:10 PM (12 years ago)

Author:

Mathieu Doucet <doucetm@…>

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.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

095b6ec

Parents:

13bc1b3a

Message:

Re #3 Fixing build for sansview app

File:

• sansguiframe/src/sans/guiframe/gui_manager.py (modified) (2 diffs)

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -51 +51 @@
     """    
     config_module = None
+    fObj = None
     try:
         fObj, path_config, descr = imp.find_module(file, [path])
@@ -57 +58 @@
         pass
     finally:
-        if fObj:
+        if fObj is not None:
             fObj.close()
     return config_module
-              
-try:
-    path = PATH_APP
-    config = _find_local_config('local_config', path)
-    if config is None:
-        path, _ = os.path.split(PATH_APP)
-        config = _find_local_config('local_config', path)
-except:
-    # Didn't find local config, load the default 
-    import sans.guiframe.config as config
- 
+
+# Read in the local config, which can either be with the main
+# application or in the installation directory
+config = _find_local_config('local_config', PATH_APP)
+if config is None:
+    config = _find_local_config('local_config', os.getcwd())
 if config is None:
     # Didn't find local config, load the default 
-    import sans.guiframe.config as config
+    import sans.guiframe.config as config          
        
-custom_config = None
-try:
-    path = PATH_APP
-    custom_config = _find_local_config('custom_config', path)
-    if custom_config is None:
-        path, _ = os.path.split(PATH_APP)
-        custom_config = _find_local_config('custom_config', path)
-except:
+
+custom_config = _find_local_config('custom_config', PATH_APP)
+if custom_config is None:
+    custom_config = _find_local_config('custom_config', os.getcwd())
+if custom_config is None:
     msg = "Custom_config file was not imported"
     logging.info(msg)