Changeset 70ecd530 in sasview for sansguiframe/src/sans/guiframe/local_perspectives/data_loader

Timestamp:

Oct 24, 2011 12:42:48 PM (13 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

bce8148

Parents:

7247844

Message:

minor cchange to allow sphinx build

Location:

sansguiframe/src/sans/guiframe/local_perspectives/data_loader

Files:

• __init__.py (modified) (1 diff)
• data_loader.py (modified) (1 diff)

sansguiframe/src/sans/guiframe/local_perspectives/data_loader/__init__.py

@@ -1 +1 @@
 PLUGIN_ID = "DataLoader plug-in 1.0"
-from data_loader import *
+from sans.guiframe.local_perspectives.data_loader import *

sansguiframe/src/sans/guiframe/local_perspectives/data_loader/data_loader.py

@@ -31 +31 @@
 except:
     # Didn't find local config, load the default 
-    import config
-
+    import sans.guiframe.config as config
+
+if config is None:
+    import sans.guiframe.config as config
+    
        
 extension_list = []