From f9cf7760a0f75d74ce0683d090719666efcd239f Mon Sep 17 00:00:00 2001
From: Stefan van der Walt <stefan@sun.ac.za>
Date: Thu, 12 Nov 2009 22:34:39 +0200
Subject: [PATCH] io: Fix doctests.

---
 scikits/image/io/collection.py | 24 ++++++++++--------------
 scikits/image/io/io.py         |  6 ++++--
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/scikits/image/io/collection.py b/scikits/image/io/collection.py
index cf065f93..52337dc5 100644
--- a/scikits/image/io/collection.py
+++ b/scikits/image/io/collection.py
@@ -47,10 +47,9 @@ class MultiImage(object):
 
     Examples
     --------
-    >>> import os.path
-    >>> fname = os.path.join('tests', 'data', 'multipage.tif')
+    >>> from scikits.image import data_dir
 
-    >>> img = MultiImage(fname)
+    >>> img = MultiImage(data_dir + '/multipage.tif')
     >>> len(img)
     2
     >>> for frame in img:
@@ -185,24 +184,21 @@ class ImageCollection(object):
 
     Examples
     --------
-    >>> from scikits.image.io import io
+    >>> import scikits.image.io as io
     >>> from scikits.image import data_dir
 
-    >>> coll = io.ImageCollection(data_dir + '/*.png')
+    >>> coll = io.ImageCollection(data_dir + '/lena*.png')
     >>> len(coll)
     2
-    >>> coll.files
-    ['.../scikits/image/data/camera.png', .../scikits/image/data/color.png']
     >>> coll[0].shape
-    (256, 256)
+    (128, 128, 3)
 
-    When `as_grey` is changed, a color image is returned in grey-scale:
+    When `as_grey` is set to True, a color image is returned in grey-scale:
+
+    >>> coll = io.ImageCollection(data_dir + '/lena*.png', as_grey=True)
+    >>> coll[0].shape
+    (128, 128)
 
-    >>> coll[1].shape
-    (370, 371, 3)
-    >>> coll.as_grey = True
-    >>> coll[1].shape
-    (256, 256)
     """
     def __init__(self, file_pattern, conserve_memory=True, as_grey=False,
                  dtype=None):
diff --git a/scikits/image/io/io.py b/scikits/image/io/io.py
index a2a431ac..479f0fe9 100644
--- a/scikits/image/io/io.py
+++ b/scikits/image/io/io.py
@@ -130,9 +130,11 @@ def show():
 
     Examples
     --------
+    >>> import scikits.image.io as io
+
     >>> for i in range(4):
-    ...     imshow(np.random.random((50, 50))
-    >>> show()
+    ...     io.imshow(np.random.random((50, 50)))
+    >>> io.show()
 
     '''
     return call_plugin('_app_show')