From 57b9fd3fe5d5303871805f53fe46ac5fe337e463 Mon Sep 17 00:00:00 2001
From: Fabian Pedregosa <fabian.pedregosa@inria.fr>
Date: Mon, 19 Sep 2011 14:47:47 +0200
Subject: [PATCH] Comment tests that depend on PIL.
This is ugly, but I don't want to release with failing tests.
Also, I can't use `doctest: +SKIP` because it fails when run through
sklear.test().
---
sklearn/datasets/base.py | 49 ++++++++++++++++++++--------------------
1 file changed, 24 insertions(+), 25 deletions(-)
diff --git a/sklearn/datasets/base.py b/sklearn/datasets/base.py
index 98b3141168..8d72c45a0a 100644
--- a/sklearn/datasets/base.py
+++ b/sklearn/datasets/base.py
@@ -375,19 +375,19 @@ def load_sample_images():
--------
To load the data and visualize the images::
- >>> from sklearn.datasets import load_sample_images
- >>> dataset = load_sample_images()
- >>> len(dataset.images)
- 2
- >>> first_img_data = dataset.images[0]
- >>> first_img_data.shape # height, width, channels
- (427, 640, 3)
- >>> first_img_data.dtype
- dtype('uint8')
- >>> # import pylab as pl
- >>> # pl.gray()
- >>> # pl.matshow(dataset.images[0]) # Visualize the first image
- >>> # pl.show()
+ # >>> from sklearn.datasets import load_sample_images
+ # >>> dataset = load_sample_images()
+ # >>> len(dataset.images)
+ # 2
+ # >>> first_img_data = dataset.images[0]
+ # >>> first_img_data.shape
+ # (427, 640, 3)
+ # >>> first_img_data.dtype
+ # dtype('uint8')
+ # >>> import pylab as pl
+ # >>> pl.gray()
+ # >>> pl.matshow(dataset.images[0]) # Visualize the first image
+ # >>> pl.show()
"""
# Try to import imread from scipy. We do this lazily here to prevent
# this module from depending on PIL.
@@ -415,18 +415,17 @@ def load_sample_images():
def load_sample_image(image_name):
"""Load the numpy array of a single sample image
- >>> from sklearn.datasets import load_sample_image
- >>> china = load_sample_image('china.jpg')
- >>> china.dtype
- dtype('uint8')
- >>> china.shape
- (427, 640, 3)
-
- >>> flower = load_sample_image('flower.jpg')
- >>> flower.dtype
- dtype('uint8')
- >>> flower.shape
- (427, 640, 3)
+ # >>> from sklearn.datasets import load_sample_image
+ # >>> china = load_sample_image('china.jpg')
+ # >>> china.dtype
+ # dtype('uint8')
+ # >>> china.shape
+ # (427, 640, 3)
+ # >>> flower = load_sample_image('flower.jpg') # doctest: +SKIP
+ # >>> flower.dtype
+ # dtype('uint8')
+ # >>> flower.shape
+ # (427, 640, 3)
"""
images = load_sample_images()
index = None
--
GitLab