Changeset a0986f6 in sasview

Timestamp:

Apr 27, 2011 9:02:17 AM (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:

0b6ae5f

Parents:

5683f47

Message:

remove unused directory

File:

• sansview/perspectives/fitting/models.py (modified) (3 diffs)

sansview/perspectives/fitting/models.py

@@ -18 +18 @@
    
 PLUGIN_DIR = 'plugins' 
-path = os.path.dirname(os.path.sys.path[0])
-file = os.path.join(path, "plugins.log")
-
 
 def log(message):
     """
     """
-    out = open(file, 'a')
+    out = open("plugins.log", 'a')
     out.write("%10g:  %s\n" % (time.clock(), message))
     out.close()
@@ -79 +76 @@
     plugins = {}
     # Go through files in plug-in directory
+    #always recompile the folder plugin
+    import compileall
+    dir = os.path.abspath(PLUGIN_DIR)
+    if not os.path.isdir(dir):
+        dir = os.path.join(os.getcwd(), PLUGIN_DIR)
+    if not os.path.isdir(dir):
+        dir = os.path.join(os.path.dirname(__file__), PLUGIN_DIR)
+    if not os.path.isdir(dir):
+        dir = os.path.join(os.path.dirname(os.path.sys.path[0]), PLUGIN_DIR)
+    if not os.path.isdir(dir):
+        msg = "SansView couldn't locate Model plugin folder."
+        msg += """ "%s" does not exist""" % dir
+        logging.warning(msg)
+        return plugins
+    else:
+        log("looking for models in: %s" % str(dir))
+        compileall.compile_dir(dir=dir, ddir=dir, force=1, quiet=True)
+        logging.info("pluging model dir: %s\n" % str(dir))
     try:
         list = os.listdir(dir)
@@ -180 +195 @@
         temp = {}
         if self.is_changed():
-            #always recompile the folder plugin
-            import compileall
-            if os.path.isdir(os.path.abspath(PLUGIN_DIR)):
-                dir = os.path.abspath(PLUGIN_DIR)
-            else:
-                dir = os.path.join(os.path.dirname(os.path.sys.path[0]), 'plugins')
-            if not os.path.isdir(dir):
-                log("Could not locate models plugins in: %s" % str(dir))
-            else:
-                log("looking for models in: %s" % str(dir))
-                compileall.compile_dir(dir=dir, ddir=dir, force=1, quiet=True)
-                return  _findModels(dir)
+            return  _findModels(dir)
         logging.info("pluging model : %s\n" % str(temp))
         return temp