Changeset ed61f2a1 in sasview

Timestamp:

Apr 26, 2011 5:13:55 PM (14 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:

1793cef

Parents:

9c35257

Message:

file plugin directory for .exe file

Location:

DataLoader

Files:

• loader.py (modified) (1 diff)
• readers/associations.py (modified) (1 diff)

DataLoader/loader.py

@@ -97 +97 @@
         """
         readers_found = 0
-        
+        temp_path = os.path.abspath(dir)
+        if not os.path.isdir(temp_path):
+            temp_path = os.path.join(os.getcwd(), dir)
+        if not os.path.isdir(temp_path):
+            temp_path = os.path.join(os.path.dirname(__file__), dir)
+        if not os.path.isdir(temp_path):
+            temp_path = os.path.join(os.path.dirname(os.path.sys.path[0]), dir)
+        
+        dir = temp_path
         # Check whether the directory exists
         if not os.path.isdir(dir): 
-            logging.warning("DataLoader couldn't load from %s" % dir)
+            msg = "DataLoader couldn't locate DataLoader plugin folder."
+            msg += """ "%s" does not exist""" % dir
+            logging.warning(msg)
             return readers_found
         

DataLoader/readers/associations.py

@@ -44 +44 @@
     if not os.path.isfile(path):
         path = os.path.join(os.getcwd(), settings)
-    
+    if not os.path.isfile(path):
+        path = os.path.join(os.path.dirname(os.path.sys.path[0]), settings)
     if os.path.isfile(path):
         tree = etree.parse(path, parser=etree.ETCompatXMLParser())