Changeset 84545dd in sasview

Timestamp:

Sep 3, 2008 4:33:48 PM (16 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:

c87d55a

Parents:

d831626

Message:

Added module importing from zip files.

Location:

DataLoader

Files:

• loader.py (modified) (2 diffs)
• readers/readInfo.py (deleted)
• test/testplugings.py (modified) (1 diff)

DataLoader/loader.py

@@ -18 +18 @@
 import sys
 import logging
-import imp
 import time
+from zipfile import ZipFile
 
 class Registry(ExtensionRegistry):
@@ -57 +57 @@
         for item in os.listdir(dir):
             full_path = os.path.join(dir, item)
-            if os.path.isfile(full_path) and item.endswith('.py'):
-                toks = os.path.splitext(os.path.basename(item))
-                name = toks[0]
-                path = [os.path.abspath(dir)]
-                file = None
-                try:
-                    (file, path, info) = imp.find_module(name, path)
-                    module = imp.load_module( name, file, item, info )
-                    if hasattr(module, "Reader"):
-                        try:
-                            # Find supported extensions
-                            loader = module.Reader()
-                            for ext in loader.ext:
-                                if ext not in self.loaders:
-                                    self.loaders[ext] = []
-                                self.loaders[ext].insert(0,loader.read)
+            if os.path.isfile(full_path):
+                
+                # Process python files
+                if item.endswith('.py'):
+                    toks = os.path.splitext(os.path.basename(item))
+                    try:
+                        sys.path.insert(0, os.path.abspath(dir))
+                        module = __import__(toks[0], globals(), locals())
+                        if self._identify_plugin(module):
                             readers_found += 1
+                    except :
+                        logging.error("Loader: Error importing %s\n  %s" % (name, sys.exc_value))
                             
-                            # Check whether writing is supported
-                            if hasattr(loader, 'write'):
-                                for ext in loader.ext:
-                                    if ext not in self.writers:
-                                        self.writers[ext] = []
-                                    self.writers[ext].insert(0,loader.write)
-                        except:
-                            logging.error("Loader: Error accessing Reader in %s\n  %s" % (name, sys.exc_value))
-                except :
-                    logging.error("Loader: Error importing %s\n  %s" % (name, sys.exc_value))
-                finally:
-                    if not file==None:
-                        file.close()
+                # Process zip files
+                elif item.endswith('.zip'):
+                    try:
+                        # Find the modules in the zip file
+                        zfile = ZipFile(item)
+                        nlist = zfile.namelist()
+                        
+                        sys.path.insert(0, item)
+                        for mfile in nlist:
+                            try:
+                                # Change OS path to python path
+                                fullname = mfile.replace('/', '.')
+                                fullname = os.path.splitext(fullname)[0]
+                                module = __import__(fullname, globals(), locals(), [""])
+                                if self._identify_plugin(module):
+                                    readers_found += 1
+                            except:
+                                logging.error("Loader: Error importing %s\n  %s" % (mfile, sys.exc_value))
+                            
+                    except:
+                        logging.error("Loader: Error importing %s\n  %s" % (item, sys.exc_value))
+                     
         return readers_found 
+    
+    def _identify_plugin(self, module):
+        """
+            Look into a module to find whether it contains a 
+            Reader class. If so, add it to readers and (potentially)
+            to the list of writers.
+            @param module: module object
+        """
+        reader_found = False
+        
+        if hasattr(module, "Reader"):
+            try:
+                # Find supported extensions
+                loader = module.Reader()
+                for ext in loader.ext:
+                    if ext not in self.loaders:
+                        self.loaders[ext] = []
+                    self.loaders[ext].insert(0,loader.read)
+                    reader_found = True
+                     
+                # Check whether writing is supported
+                if hasattr(loader, 'write'):
+                    for ext in loader.ext:
+                        if ext not in self.writers:
+                            self.writers[ext] = []
+                        self.writers[ext].insert(0,loader.write)
+            except:
+                logging.error("Loader: Error accessing Reader in %s\n  %s" % (name, sys.exc_value))
+        return reader_found
 
     def lookup_writers(self, path):

DataLoader/test/testplugings.py

@@ -34 +34 @@
         self.assertTrue(self.L.loaders.has_key('.test'))
         
+class testZip(unittest.TestCase):
+    
+    def setUp(self):
+        self.L=Registry()
+        
+        # Create module
+        import zipfile
+        z = zipfile.PyZipFile("plugins.zip", 'w')
+        z.writepy("../plugins", "")
+        z.close()
+        
+    def testplugin_checksetup(self):
+        """ 
+            Check that the test is valid by confirming
+            that the file can't be loaded without the
+            plugins
+        """
+        self.assertRaises(ValueError, self.L.load, 'test_data.test')
+        
+    def testplugin(self):
+        """ 
+            test loading with a test reader only 
+            found in the plugins directory
+        """
+        self.L.find_plugins('.')
+        output = self.L.load('test_data.test')
+        self.assertEqual(output.x[0], 1234.)
+        self.assertTrue(self.L.loaders.has_key('.test'))
+        
+        
 if __name__ == '__main__':
     unittest.main()