Changeset 94daf8a in sasview

Timestamp:

Jul 9, 2008 5:26:04 PM (16 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:

8dac49d

Parents:

2fd516b

Message:

one bug fixed on testing

Location:

DataLoader

Files:

• loader.py (modified) (1 diff)
• test/testLoad.py (modified) (1 diff)
• test/testplugings.py (modified) (1 diff)

DataLoader/loader.py

@@ -34 +34 @@
                             plugins.append(module.Reader())
                         except:
-                            logging("Error accessing Reader in %s\n  %s" % (name, sys.exc_value))
+                            logging.error("Error accessing Reader in %s\n  %s" % (name, sys.exc_value))
                 except :
-                    logging("Error importing %s\n  %s" % (name, sys.exc_value))
+                    logging.error("Error importing %s\n  %s" % (name, sys.exc_value))
                 finally:
                     if not file==None:

DataLoader/test/testLoad.py

@@ -34 +34 @@
     read5=tiff_reader.Reader()
     #for each readers set an extensions inside the loader
-    L.__setitem__('.txt',read2)
-    L.__setitem__('.txt',read1)
-    L.__setitem__('.dat',read1)
+    L.__setitem__("plugins",'.txt',read2)
+    L.__setitem__(None,'.txt',read1)
+    L.__setitem__(None,'.dat',read1)
     
-    L.__setitem__('.dat',read2)
-    L.__setitem__('.ASC',read3)
-    L.__setitem__('.sans',read4)
-    L.__setitem__('.tif',read5)
-    L.__setitem__('.jpg',read5)
-    L.__setitem__('.png',read5)
-    L.__setitem__('.jpeg',read5)
-    L.__setitem__('.gif',read5)
-    L.__setitem__('.bmp',read5)
+    L.__setitem__(None,'.dat',read2)
+    L.__setitem__(None,'.ASC',read3)
+    L.__setitem__(None,'.sans',read4)
+    L.__setitem__(None,'.tif',read5)
+    L.__setitem__(None,'.jpg',read5)
+    L.__setitem__(None,'.png',read5)
+    L.__setitem__(None,'.jpeg',read5)
+    L.__setitem__(None,'.gif',read5)
+    L.__setitem__(None,'.bmp',read5)
        
     def testLoad0(self):

DataLoader/test/testplugings.py

@@ -22 +22 @@
         """ test loading with plugging"""
         self.L.__setitem__(dir='plugins')
+        read3=IgorReader.Reader()
+        self.L.__setitem__('plugins','.ASC',read3)
+        self.assertEqual(self.L.__contains__('.ASC'),True)
         #Testing loading a txt file of 2 columns, the only reader should be read1 
         xload,yload,dyload=self.L.load('test_2_columns.txt')