diff --git a/doc/datasets/index.rst b/doc/datasets/index.rst index cfb6538165aeb8c941a2f34925bc69c7a09aa69f..b8cf553edf99827b21b2f8bdd2f057d7e7d02dd1 100644 --- a/doc/datasets/index.rst +++ b/doc/datasets/index.rst @@ -1,11 +1,3 @@ -.. - For doctests: - - >>> import numpy as np - >>> import os - >>> from sklearn import datasets - >>> datasets.mldata.urllib2 = mock_urllib2 - .. _datasets: ========================= diff --git a/doc/datasets/mldata.rst b/doc/datasets/mldata.rst index 317cc714e29bd88950d207d447c0f9986a743bb8..337e9b1fec2efa22f546f50b31bbea46969eb9c5 100644 --- a/doc/datasets/mldata.rst +++ b/doc/datasets/mldata.rst @@ -1,3 +1,8 @@ +.. + For doctests: + + >>> import numpy as np + >>> import os .. _mldata: diff --git a/doc/datasets/mldata_fixture.py b/doc/datasets/mldata_fixture.py index 056719701a9b2c2c70aec2b94692306ebbbe1cce..e57a2506e8ee9fac12dd9ab5def44bab10008dc8 100644 --- a/doc/datasets/mldata_fixture.py +++ b/doc/datasets/mldata_fixture.py @@ -5,26 +5,27 @@ Mock urllib2 access to mldata.org from os import makedirs from os.path import join -from sklearn import datasets -from sklearn.utils.testing import mock_urllib2 +import numpy as np import tempfile -import scipy as sp import shutil +from sklearn import datasets +from sklearn.utils.testing import mock_urllib2 + def globs(globs): # setup mock urllib2 module to avoid downloading from mldata.org - mock_datasets = { + mock_dataset = { 'mnist-original': { - 'data': sp.empty((70000, 784)), - 'label': sp.repeat(sp.arange(10, dtype='d'), 7000), + 'data': np.empty((70000, 784)), + 'label': np.repeat(np.arange(10, dtype='d'), 7000), }, 'iris': { - 'data': sp.empty((150, 4)), + 'data': np.empty((150, 4)), }, 'datasets-uci-iris': { - 'double0': sp.empty((150, 4)), - 'class': sp.empty((150,)), + 'double0': np.empty((150, 4)), + 'class': np.empty((150,)), }, } @@ -36,7 +37,7 @@ def globs(globs): global _urllib2_ref _urllib2_ref = datasets.mldata.urllib2 globs['_urllib2_ref'] = _urllib2_ref - globs['mock_urllib2'] = mock_urllib2(mock_datasets) + datasets.mldata.urllib2 = mock_urllib2(mock_dataset) return globs diff --git a/sklearn/utils/testing.py b/sklearn/utils/testing.py index 3fc5aaa241bdc044d0fef97a93b9a0da1cf29df2..df78ad24645d17d9bbbd36c6eeb546dfb6e5d452 100644 --- a/sklearn/utils/testing.py +++ b/sklearn/utils/testing.py @@ -2,13 +2,11 @@ # Copyright (c) 2011 Pietro Berkes # License: Simplified BSD -import sys -import warnings + from .fixes import savemat import urllib2 from StringIO import StringIO import scipy as sp -import numpy.testing def assert_in(obj, in_=None, out_=None):