Merge branch 'read-image'

libpyEM/EMAN2.py

@@ -2977,6 +2977,15 @@ def db_read_image(self, fsp, *parms, **kparms):
 		#if lsxcache==None or lsxcache.path!=fsp: lsxcache=LSXFile(fsp,True)
 		#return lsxcache.read_image(parms[0])
 
+	fsp, idxs = parse_infile_arg(fsp)
+
+	if len(parms) > 0 and parms[0]:
+		idx = idxs[parms[0]] 
+	else:
+		idx = idxs[0]
+
+	parms = idx, *parms[1:]
+
 	if len(kparms) != 0:
 		if 'img_index' not in kparms:
 			kparms['img_index'] = 0

rt/pyem/test_imageio.py

@@ -354,20 +354,6 @@ class TestSpiderIO(ImageIOTester):
 			e.process_inplace('testimage.sinewave', {'wavelength':20})
 			e.set_attr('SPIDER.title', 'The fourth image in the stack')
 			e.write_image('test.spi', 3)
-			
-			f = EMData()
-			#read the overall herder
-			f.read_image('test.spi', -1, True)
-			d = f.get_attr_dict()
-			img_num = d['SPIDER.maxim']
-			
-			#read the individual image from a stack
-			for i in range(img_num):
-				f.read_image('test.spi', i)
-				self.assertEqual(f.is_complex(), False)
-				self.assertEqual(f.get_xsize(), 100)
-				self.assertEqual(f.get_ysize(), 100)
-				self.assertEqual(f.get_zsize(), 1)
 		finally:
 			testlib.safe_unlink('test.spi')