diff -ur scikit-learn-0.14.1/doc/conf.py scikit-learn-0.14.1.six/doc/conf.py
--- scikit-learn-0.14.1/doc/conf.py 2013-09-16 12:57:15.315322935 +0200
+++ scikit-learn-0.14.1.six/doc/conf.py 2013-09-16 13:18:26.080486311 +0200
@@ -14,7 +14,7 @@
import sys
import os
-from sklearn.externals.six import u
+from six import u
# If extensions (or modules to document with autodoc) are in another
# directory, add these directories to sys.path here. If the directory
diff -ur scikit-learn-0.14.1/doc/modules/tree.rst scikit-learn-0.14.1.six/doc/modules/tree.rst
--- scikit-learn-0.14.1/doc/modules/tree.rst 2013-08-09 12:16:59.000000000 +0200
+++ scikit-learn-0.14.1.six/doc/modules/tree.rst 2013-09-16 13:23:18.117832097 +0200
@@ -123,7 +123,7 @@
exporter. Below is an example export of a tree trained on the entire
iris dataset::
- >>> from sklearn.externals.six import StringIO
+ >>> from six import StringIO
>>> with open("iris.dot", 'w') as f:
... f = tree.export_graphviz(clf, out_file=f)
@@ -138,7 +138,7 @@
Alternatively, if we have Python module ``pydot`` installed, we can generate
a PDF file (or any other supported file type) directly in Python::
- >>> from sklearn.externals.six import StringIO # doctest: +SKIP
+ >>> from six import StringIO # doctest: +SKIP
>>> import pydot # doctest: +SKIP
>>> dot_data = StringIO.StringIO() # doctest: +SKIP
>>> tree.export_graphviz(clf, out_file=dot_data) # doctest: +SKIP
diff -ur scikit-learn-0.14.1/doc/tutorial/basic/tutorial.rst scikit-learn-0.14.1.six/doc/tutorial/basic/tutorial.rst
--- scikit-learn-0.14.1/doc/tutorial/basic/tutorial.rst 2013-08-09 12:16:59.000000000 +0200
+++ scikit-learn-0.14.1.six/doc/tutorial/basic/tutorial.rst 2013-09-16 13:22:36.181495247 +0200
@@ -223,6 +223,6 @@
which is more efficient on big data, but can only pickle to the disk
and not to a string::
- >>> from sklearn.externals import joblib
+ >>> import joblib
>>> joblib.dump(clf, 'filename.pkl') # doctest: +SKIP
diff -ur scikit-learn-0.14.1/examples/applications/svm_gui.py scikit-learn-0.14.1.six/examples/applications/svm_gui.py
--- scikit-learn-0.14.1/examples/applications/svm_gui.py 2013-09-16 12:57:15.304322845 +0200
+++ scikit-learn-0.14.1.six/examples/applications/svm_gui.py 2013-09-16 13:18:25.821484231 +0200
@@ -35,7 +35,7 @@
from sklearn import svm
from sklearn.datasets import dump_svmlight_file
-from sklearn.externals.six.moves import xrange
+from six.moves import xrange
y_min, y_max = -50, 50
x_min, x_max = -50, 50
diff -ur scikit-learn-0.14.1/examples/ensemble/plot_adaboost_multiclass.py scikit-learn-0.14.1.six/examples/ensemble/plot_adaboost_multiclass.py
--- scikit-learn-0.14.1/examples/ensemble/plot_adaboost_multiclass.py 2013-09-16 12:57:15.267322546 +0200
+++ scikit-learn-0.14.1.six/examples/ensemble/plot_adaboost_multiclass.py 2013-09-16 13:18:23.854468430 +0200
@@ -29,13 +29,13 @@
#
# License: BSD 3 clause
-from sklearn.externals.six.moves import zip
+from six.moves import zip
import pylab as pl
from sklearn.datasets import make_gaussian_quantiles
from sklearn.ensemble import AdaBoostClassifier
-from sklearn.externals.six.moves import xrange
+from six.moves import xrange
from sklearn.metrics import accuracy_score
from sklearn.tree import DecisionTreeClassifier
diff -ur scikit-learn-0.14.1/examples/ensemble/plot_forest_iris.py scikit-learn-0.14.1.six/examples/ensemble/plot_forest_iris.py
--- scikit-learn-0.14.1/examples/ensemble/plot_forest_iris.py 2013-09-16 12:57:15.265322530 +0200
+++ scikit-learn-0.14.1.six/examples/ensemble/plot_forest_iris.py 2013-09-16 13:18:23.776467804 +0200
@@ -47,7 +47,7 @@
from sklearn.datasets import load_iris
from sklearn.ensemble import (RandomForestClassifier, ExtraTreesClassifier,
AdaBoostClassifier)
-from sklearn.externals.six.moves import xrange
+from six.moves import xrange
from sklearn.tree import DecisionTreeClassifier
# Parameters
diff -ur scikit-learn-0.14.1/examples/mixture/plot_gmm_classifier.py scikit-learn-0.14.1.six/examples/mixture/plot_gmm_classifier.py
--- scikit-learn-0.14.1/examples/mixture/plot_gmm_classifier.py 2013-09-16 12:57:15.268322554 +0200
+++ scikit-learn-0.14.1.six/examples/mixture/plot_gmm_classifier.py 2013-09-16 13:18:23.908468864 +0200
@@ -34,7 +34,7 @@
from sklearn import datasets
from sklearn.cross_validation import StratifiedKFold
-from sklearn.externals.six.moves import xrange
+from six.moves import xrange
from sklearn.mixture import GMM
diff -ur scikit-learn-0.14.1/examples/mixture/plot_gmm_sin.py scikit-learn-0.14.1.six/examples/mixture/plot_gmm_sin.py
--- scikit-learn-0.14.1/examples/mixture/plot_gmm_sin.py 2013-09-16 12:57:15.268322554 +0200
+++ scikit-learn-0.14.1.six/examples/mixture/plot_gmm_sin.py 2013-09-16 13:18:23.897468776 +0200
@@ -22,7 +22,7 @@
import matplotlib as mpl
from sklearn import mixture
-from sklearn.externals.six.moves import xrange
+from six.moves import xrange
# Number of samples per component
n_samples = 100
diff -ur scikit-learn-0.14.1/sklearn/base.py scikit-learn-0.14.1.six/sklearn/base.py
--- scikit-learn-0.14.1/sklearn/base.py 2013-09-16 12:57:15.457324085 +0200
+++ scikit-learn-0.14.1.six/sklearn/base.py 2013-09-16 13:18:30.228519630 +0200
@@ -8,7 +8,7 @@
import numpy as np
from scipy import sparse
-from .externals import six
+import six
###############################################################################
diff -ur scikit-learn-0.14.1/sklearn/cluster/bicluster/spectral.py scikit-learn-0.14.1.six/sklearn/cluster/bicluster/spectral.py
--- scikit-learn-0.14.1/sklearn/cluster/bicluster/spectral.py 2013-09-16 12:57:15.477324247 +0200
+++ scikit-learn-0.14.1.six/sklearn/cluster/bicluster/spectral.py 2013-09-16 13:18:30.657523076 +0200
@@ -12,7 +12,7 @@
from scipy.sparse import issparse
from sklearn.base import BaseEstimator, BiclusterMixin
-from sklearn.externals import six
+import six
from sklearn.utils.arpack import svds
from sklearn.utils.arpack import eigsh
from sklearn.cluster import KMeans
diff -ur scikit-learn-0.14.1/sklearn/cluster/hierarchical.py scikit-learn-0.14.1.six/sklearn/cluster/hierarchical.py
--- scikit-learn-0.14.1/sklearn/cluster/hierarchical.py 2013-09-16 12:57:15.479324263 +0200
+++ scikit-learn-0.14.1.six/sklearn/cluster/hierarchical.py 2013-09-16 13:18:30.717523559 +0200
@@ -16,7 +16,7 @@
from ..base import BaseEstimator, ClusterMixin
from joblib import Memory
-from ..externals import six
+import six
from ..metrics import euclidean_distances
from ..utils import array2d
from ..utils.sparsetools import connected_components
diff -ur scikit-learn-0.14.1/sklearn/cluster/mean_shift_.py scikit-learn-0.14.1.six/sklearn/cluster/mean_shift_.py
--- scikit-learn-0.14.1/sklearn/cluster/mean_shift_.py 2013-09-16 12:57:15.474324223 +0200
+++ scikit-learn-0.14.1.six/sklearn/cluster/mean_shift_.py 2013-09-16 13:18:30.602522635 +0200
@@ -7,7 +7,7 @@
from collections import defaultdict
import numpy as np
-from ..externals import six
+import six
from ..utils import extmath, check_random_state
from ..base import BaseEstimator, ClusterMixin
from ..neighbors import NearestNeighbors
diff -ur scikit-learn-0.14.1/sklearn/cluster/tests/test_k_means.py scikit-learn-0.14.1.six/sklearn/cluster/tests/test_k_means.py
--- scikit-learn-0.14.1/sklearn/cluster/tests/test_k_means.py 2013-09-16 12:57:15.485324311 +0200
+++ scikit-learn-0.14.1.six/sklearn/cluster/tests/test_k_means.py 2013-09-16 13:18:30.871524796 +0200
@@ -23,7 +23,7 @@
from sklearn.cluster.k_means_ import _mini_batch_step
from sklearn.cluster._k_means import csr_row_norm_l2
from sklearn.datasets.samples_generator import make_blobs
-from sklearn.externals.six.moves import cStringIO as StringIO
+from six.moves import cStringIO as StringIO
# non centered, sparse centers to check the
diff -ur scikit-learn-0.14.1/sklearn/cluster/tests/test_spectral.py scikit-learn-0.14.1.six/sklearn/cluster/tests/test_spectral.py
--- scikit-learn-0.14.1/sklearn/cluster/tests/test_spectral.py 2013-09-16 12:57:15.486324320 +0200
+++ scikit-learn-0.14.1.six/sklearn/cluster/tests/test_spectral.py 2013-09-16 13:18:30.897525004 +0200
@@ -1,6 +1,6 @@
"""Testing for Spectral Clustering methods"""
-from sklearn.externals.six.moves import cPickle
+from six.moves import cPickle
from sklearn.metrics.pairwise import kernel_metrics
dumps, loads = cPickle.dumps, cPickle.loads
diff -ur scikit-learn-0.14.1/sklearn/covariance/shrunk_covariance_.py scikit-learn-0.14.1.six/sklearn/covariance/shrunk_covariance_.py
--- scikit-learn-0.14.1/sklearn/covariance/shrunk_covariance_.py 2013-09-16 12:57:15.373323404 +0200
+++ scikit-learn-0.14.1.six/sklearn/covariance/shrunk_covariance_.py 2013-09-16 13:18:27.270495870 +0200
@@ -18,7 +18,7 @@
import numpy as np
from .empirical_covariance_ import empirical_covariance, EmpiricalCovariance
-from ..externals.six.moves import xrange
+from six.moves import xrange
from ..utils import array2d
diff -ur scikit-learn-0.14.1/sklearn/covariance/tests/test_graph_lasso.py scikit-learn-0.14.1.six/sklearn/covariance/tests/test_graph_lasso.py
--- scikit-learn-0.14.1/sklearn/covariance/tests/test_graph_lasso.py 2013-09-16 12:57:15.377323437 +0200
+++ scikit-learn-0.14.1.six/sklearn/covariance/tests/test_graph_lasso.py 2013-09-16 13:18:27.355496553 +0200
@@ -11,7 +11,7 @@
from sklearn.covariance import (graph_lasso, GraphLasso, GraphLassoCV,
empirical_covariance)
from sklearn.datasets.samples_generator import make_sparse_spd_matrix
-from sklearn.externals.six.moves import StringIO
+from six.moves import StringIO
from sklearn.utils import check_random_state
diff -ur scikit-learn-0.14.1/sklearn/cross_decomposition/pls_.py scikit-learn-0.14.1.six/sklearn/cross_decomposition/pls_.py
--- scikit-learn-0.14.1/sklearn/cross_decomposition/pls_.py 2013-09-16 12:57:15.404323656 +0200
+++ scikit-learn-0.14.1.six/sklearn/cross_decomposition/pls_.py 2013-09-16 13:18:28.327504360 +0200
@@ -7,7 +7,7 @@
from ..base import BaseEstimator, RegressorMixin, TransformerMixin
from ..utils import check_arrays
-from ..externals import six
+import six
import warnings
from abc import ABCMeta, abstractmethod
diff -ur scikit-learn-0.14.1/sklearn/cross_validation.py scikit-learn-0.14.1.six/sklearn/cross_validation.py
--- scikit-learn-0.14.1/sklearn/cross_validation.py 2013-09-16 12:57:15.362323315 +0200
+++ scikit-learn-0.14.1.six/sklearn/cross_validation.py 2013-09-16 13:18:27.021493870 +0200
@@ -23,7 +23,7 @@
from .utils import check_arrays, check_random_state, safe_mask
from .utils.fixes import unique
from joblib import Parallel, delayed
-from .externals.six import string_types, with_metaclass
+from six import string_types, with_metaclass
from .metrics.scorer import _deprecate_loss_and_score_funcs
__all__ = ['Bootstrap',
diff -ur scikit-learn-0.14.1/sklearn/datasets/lfw.py scikit-learn-0.14.1.six/sklearn/datasets/lfw.py
--- scikit-learn-0.14.1/sklearn/datasets/lfw.py 2013-09-16 12:57:15.423323809 +0200
+++ scikit-learn-0.14.1.six/sklearn/datasets/lfw.py 2013-09-16 13:18:29.253511799 +0200
@@ -33,7 +33,7 @@
from .base import get_data_home, Bunch
from joblib import Memory
-from ..externals.six import b, u
+from six import b, u
logger = logging.getLogger(__name__)
diff -ur scikit-learn-0.14.1/sklearn/datasets/samples_generator.py scikit-learn-0.14.1.six/sklearn/datasets/samples_generator.py
--- scikit-learn-0.14.1/sklearn/datasets/samples_generator.py 2013-09-16 12:57:15.433323890 +0200
+++ scikit-learn-0.14.1.six/sklearn/datasets/samples_generator.py 2013-09-16 13:18:29.626514795 +0200
@@ -14,7 +14,7 @@
from ..preprocessing import LabelBinarizer
from ..utils import array2d, check_random_state
from ..utils import shuffle as util_shuffle
-from ..externals import six
+import six
map = six.moves.map
zip = six.moves.zip
diff -ur scikit-learn-0.14.1/sklearn/datasets/svmlight_format.py scikit-learn-0.14.1.six/sklearn/datasets/svmlight_format.py
--- scikit-learn-0.14.1/sklearn/datasets/svmlight_format.py 2013-09-16 12:57:15.422323801 +0200
+++ scikit-learn-0.14.1.six/sklearn/datasets/svmlight_format.py 2013-09-16 13:18:29.236511662 +0200
@@ -24,9 +24,9 @@
from ._svmlight_format import _load_svmlight_file
from .. import __version__
-from ..externals import six
+import six
from ..utils import atleast2d_or_csr
-from ..externals.six import u, b
+from six import u, b
def load_svmlight_file(f, n_features=None, dtype=np.float64,
diff -ur scikit-learn-0.14.1/sklearn/datasets/_svmlight_format.pyx scikit-learn-0.14.1.six/sklearn/datasets/_svmlight_format.pyx
--- scikit-learn-0.14.1/sklearn/datasets/_svmlight_format.pyx 2013-08-09 12:16:59.000000000 +0200
+++ scikit-learn-0.14.1.six/sklearn/datasets/_svmlight_format.pyx 2013-09-16 13:20:17.540381617 +0200
@@ -10,7 +10,7 @@
import numpy as np
import scipy.sparse as sp
-from ..externals.six import b
+from six import b
from ..utils.arraybuilder import ArrayBuilder
diff -ur scikit-learn-0.14.1/sklearn/datasets/tests/test_base.py scikit-learn-0.14.1.six/sklearn/datasets/tests/test_base.py
--- scikit-learn-0.14.1/sklearn/datasets/tests/test_base.py 2013-09-16 12:57:15.429323858 +0200
+++ scikit-learn-0.14.1.six/sklearn/datasets/tests/test_base.py 2013-09-16 13:18:29.557514241 +0200
@@ -16,7 +16,7 @@
from sklearn.datasets import load_iris
from sklearn.datasets import load_boston
-from sklearn.externals.six import b, u
+from six import b, u
from sklearn.utils.testing import assert_false
from sklearn.utils.testing import assert_true
diff -ur scikit-learn-0.14.1/sklearn/datasets/tests/test_lfw.py scikit-learn-0.14.1.six/sklearn/datasets/tests/test_lfw.py
--- scikit-learn-0.14.1/sklearn/datasets/tests/test_lfw.py 2013-09-16 12:57:15.428323850 +0200
+++ scikit-learn-0.14.1.six/sklearn/datasets/tests/test_lfw.py 2013-09-16 13:18:29.509513855 +0200
@@ -13,7 +13,7 @@
import shutil
import tempfile
import numpy as np
-from sklearn.externals import six
+import six
try:
try:
from scipy.misc import imsave
diff -ur scikit-learn-0.14.1/sklearn/datasets/tests/test_svmlight_format.py scikit-learn-0.14.1.six/sklearn/datasets/tests/test_svmlight_format.py
--- scikit-learn-0.14.1/sklearn/datasets/tests/test_svmlight_format.py 2013-09-16 12:57:15.430323866 +0200
+++ scikit-learn-0.14.1.six/sklearn/datasets/tests/test_svmlight_format.py 2013-09-16 13:18:29.571514353 +0200
@@ -6,7 +6,7 @@
import shutil
import tempfile
-from sklearn.externals.six import b
+from six import b
from sklearn.utils.testing import assert_equal
from sklearn.utils.testing import assert_array_equal
from sklearn.utils.testing import assert_array_almost_equal
@@ -14,7 +14,7 @@
from sklearn.utils.testing import raises
from sklearn.utils.testing import assert_in
-from sklearn.externals.six import b
+from six import b
import sklearn
from sklearn.datasets import (load_svmlight_file, load_svmlight_files,
diff -ur scikit-learn-0.14.1/sklearn/datasets/twenty_newsgroups.py scikit-learn-0.14.1.six/sklearn/datasets/twenty_newsgroups.py
--- scikit-learn-0.14.1/sklearn/datasets/twenty_newsgroups.py 2013-09-16 12:57:15.424323818 +0200
+++ scikit-learn-0.14.1.six/sklearn/datasets/twenty_newsgroups.py 2013-09-16 13:18:29.279512007 +0200
@@ -52,7 +52,7 @@
from ..utils.fixes import in1d
from ..feature_extraction.text import CountVectorizer
from ..preprocessing import normalize
-import joblib; from ..externals import six
+import joblib; import six
if six.PY3:
from urllib.request import urlopen
diff -ur scikit-learn-0.14.1/sklearn/decomposition/dict_learning.py scikit-learn-0.14.1.six/sklearn/decomposition/dict_learning.py
--- scikit-learn-0.14.1/sklearn/decomposition/dict_learning.py 2013-09-16 12:57:15.386323510 +0200
+++ scikit-learn-0.14.1.six/sklearn/decomposition/dict_learning.py 2013-09-16 13:18:27.680499163 +0200
@@ -16,7 +16,7 @@
from ..base import BaseEstimator, TransformerMixin
from joblib import Parallel, delayed, cpu_count
-from ..externals.six.moves import zip
+from six.moves import zip
from ..utils import array2d, check_random_state, gen_even_slices
from ..utils.extmath import randomized_svd
from ..linear_model import Lasso, orthogonal_mp_gram, LassoLars, Lars
diff -ur scikit-learn-0.14.1/sklearn/decomposition/factor_analysis.py scikit-learn-0.14.1.six/sklearn/decomposition/factor_analysis.py
--- scikit-learn-0.14.1/sklearn/decomposition/factor_analysis.py 2013-09-16 12:57:15.396323591 +0200
+++ scikit-learn-0.14.1.six/sklearn/decomposition/factor_analysis.py 2013-09-16 13:18:27.917501067 +0200
@@ -17,7 +17,7 @@
from ..base import BaseEstimator, TransformerMixin
-from ..externals.six.moves import xrange
+from six.moves import xrange
from ..utils import array2d, check_arrays
from ..utils.extmath import fast_logdet
diff -ur scikit-learn-0.14.1/sklearn/decomposition/fastica_.py scikit-learn-0.14.1.six/sklearn/decomposition/fastica_.py
--- scikit-learn-0.14.1/sklearn/decomposition/fastica_.py 2013-09-16 12:57:15.390323542 +0200
+++ scikit-learn-0.14.1.six/sklearn/decomposition/fastica_.py 2013-09-16 13:18:27.743499669 +0200
@@ -13,8 +13,8 @@
from scipy import linalg
from ..base import BaseEstimator, TransformerMixin
-from ..externals import six
-from ..externals.six import moves
+import six
+from six import moves
from ..utils import array2d, as_float_array, check_random_state, deprecated
diff -ur scikit-learn-0.14.1/sklearn/decomposition/tests/test_dict_learning.py scikit-learn-0.14.1.six/sklearn/decomposition/tests/test_dict_learning.py
--- scikit-learn-0.14.1/sklearn/decomposition/tests/test_dict_learning.py 2013-09-16 12:57:15.394323574 +0200
+++ scikit-learn-0.14.1.six/sklearn/decomposition/tests/test_dict_learning.py 2013-09-16 13:18:27.851500537 +0200
@@ -90,7 +90,7 @@
def test_dict_learning_online_verbosity():
n_components = 5
# test verbosity
- from sklearn.externals.six.moves import cStringIO as StringIO
+ from six.moves import cStringIO as StringIO
import sys
old_stdout = sys.stdout
sys.stdout = StringIO()
diff -ur scikit-learn-0.14.1/sklearn/decomposition/tests/test_fastica.py scikit-learn-0.14.1.six/sklearn/decomposition/tests/test_fastica.py
--- scikit-learn-0.14.1/sklearn/decomposition/tests/test_fastica.py 2013-09-16 12:57:15.392323558 +0200
+++ scikit-learn-0.14.1.six/sklearn/decomposition/tests/test_fastica.py 2013-09-16 13:18:27.795500087 +0200
@@ -17,7 +17,7 @@
from sklearn.decomposition import FastICA, fastica, PCA
from sklearn.decomposition.fastica_ import _gs_decorrelation
-from sklearn.externals.six import moves
+from six import moves
def center_and_norm(x, axis=-1):
diff -ur scikit-learn-0.14.1/sklearn/dummy.py scikit-learn-0.14.1.six/sklearn/dummy.py
--- scikit-learn-0.14.1/sklearn/dummy.py 2013-09-16 12:57:15.406323672 +0200
+++ scikit-learn-0.14.1.six/sklearn/dummy.py 2013-09-16 13:18:28.819508313 +0200
@@ -6,7 +6,7 @@
import numpy as np
from .base import BaseEstimator, ClassifierMixin, RegressorMixin
-from .externals.six.moves import xrange
+from six.moves import xrange
from .utils import check_random_state
from .utils.fixes import unique
from .utils.validation import safe_asarray
diff -ur scikit-learn-0.14.1/sklearn/ensemble/forest.py scikit-learn-0.14.1.six/sklearn/ensemble/forest.py
--- scikit-learn-0.14.1/sklearn/ensemble/forest.py 2013-09-16 12:57:15.338323121 +0200
+++ scikit-learn-0.14.1.six/sklearn/ensemble/forest.py 2013-09-16 13:18:26.551490095 +0200
@@ -45,8 +45,8 @@
from ..base import ClassifierMixin, RegressorMixin
from joblib import Parallel, delayed, cpu_count
-from ..externals import six
-from ..externals.six.moves import xrange
+import six
+from six.moves import xrange
from ..feature_selection.from_model import _LearntSelectorMixin
from ..metrics import r2_score
from ..preprocessing import OneHotEncoder
diff -ur scikit-learn-0.14.1/sklearn/ensemble/gradient_boosting.py scikit-learn-0.14.1.six/sklearn/ensemble/gradient_boosting.py
--- scikit-learn-0.14.1/sklearn/ensemble/gradient_boosting.py 2013-09-16 12:57:15.335323096 +0200
+++ scikit-learn-0.14.1.six/sklearn/ensemble/gradient_boosting.py 2013-09-16 13:18:26.518489829 +0200
@@ -37,7 +37,7 @@
from ..utils import check_random_state, array2d, check_arrays, column_or_1d
from ..utils.extmath import logsumexp
from ..utils.fixes import unique
-from ..externals import six
+import six
from ..tree.tree import DecisionTreeRegressor
from ..tree._tree import DTYPE, TREE_LEAF
diff -ur scikit-learn-0.14.1/sklearn/ensemble/partial_dependence.py scikit-learn-0.14.1.six/sklearn/ensemble/partial_dependence.py
--- scikit-learn-0.14.1/sklearn/ensemble/partial_dependence.py 2013-09-16 12:57:15.327323032 +0200
+++ scikit-learn-0.14.1.six/sklearn/ensemble/partial_dependence.py 2013-09-16 13:18:26.343488424 +0200
@@ -5,7 +5,7 @@
from itertools import count
-from sklearn.externals.six.moves import zip
+from six.moves import zip
import numbers
@@ -15,8 +15,8 @@
from ..utils.extmath import cartesian
from joblib import Parallel, delayed
-from ..externals import six
-from ..externals.six.moves import xrange
+import six
+from six.moves import xrange
from ..utils import array2d
from ..tree._tree import DTYPE
diff -ur scikit-learn-0.14.1/sklearn/ensemble/tests/test_gradient_boosting.py scikit-learn-0.14.1.six/sklearn/ensemble/tests/test_gradient_boosting.py
--- scikit-learn-0.14.1/sklearn/ensemble/tests/test_gradient_boosting.py 2013-09-16 12:57:15.331323064 +0200
+++ scikit-learn-0.14.1.six/sklearn/ensemble/tests/test_gradient_boosting.py 2013-09-16 13:18:26.418489026 +0200
@@ -533,7 +533,7 @@
def test_verbose_output():
"""Check verbose=1 does not cause error. """
- from sklearn.externals.six.moves import cStringIO as StringIO
+ from six.moves import cStringIO as StringIO
import sys
old_stdout = sys.stdout
sys.stdout = StringIO()
@@ -558,7 +558,7 @@
def test_more_verbose_output():
"""Check verbose=2 does not cause error. """
- from sklearn.externals.six.moves import cStringIO as StringIO
+ from six.moves import cStringIO as StringIO
import sys
old_stdout = sys.stdout
sys.stdout = StringIO()
diff -ur scikit-learn-0.14.1/sklearn/ensemble/weight_boosting.py scikit-learn-0.14.1.six/sklearn/ensemble/weight_boosting.py
--- scikit-learn-0.14.1/sklearn/ensemble/weight_boosting.py 2013-09-16 12:57:15.329323048 +0200
+++ scikit-learn-0.14.1.six/sklearn/ensemble/weight_boosting.py 2013-09-16 13:18:26.389488793 +0200
@@ -27,8 +27,8 @@
from .base import BaseEnsemble
from ..base import ClassifierMixin, RegressorMixin
-from ..externals import six
-from ..externals.six.moves import xrange, zip
+import six
+from six.moves import xrange, zip
from ..tree import DecisionTreeClassifier, DecisionTreeRegressor
from ..tree._tree import DTYPE
from ..utils import array2d, check_arrays, check_random_state, column_or_1d
diff -ur scikit-learn-0.14.1/sklearn/externals/setup.py scikit-learn-0.14.1.six/sklearn/externals/setup.py
--- scikit-learn-0.14.1/sklearn/externals/setup.py 2013-09-16 12:57:15.405323663 +0200
+++ scikit-learn-0.14.1.six/sklearn/externals/setup.py 2013-09-16 13:19:30.372002736 +0200
@@ -3,6 +3,5 @@
def configuration(parent_package='', top_path=None):
from numpy.distutils.misc_util import Configuration
- config = Configuration('externals', parent_package, top_path)
return config
diff -ur scikit-learn-0.14.1/sklearn/feature_extraction/dict_vectorizer.py scikit-learn-0.14.1.six/sklearn/feature_extraction/dict_vectorizer.py
--- scikit-learn-0.14.1/sklearn/feature_extraction/dict_vectorizer.py 2013-09-16 12:57:15.487324328 +0200
+++ scikit-learn-0.14.1.six/sklearn/feature_extraction/dict_vectorizer.py 2013-09-16 13:18:30.931525278 +0200
@@ -9,8 +9,8 @@
import scipy.sparse as sp
from ..base import BaseEstimator, TransformerMixin
-from ..externals import six
-from ..externals.six.moves import xrange
+import six
+from six.moves import xrange
from ..utils import atleast2d_or_csr, tosequence
diff -ur scikit-learn-0.14.1/sklearn/feature_extraction/text.py scikit-learn-0.14.1.six/sklearn/feature_extraction/text.py
--- scikit-learn-0.14.1/sklearn/feature_extraction/text.py 2013-09-16 12:57:15.493324376 +0200
+++ scikit-learn-0.14.1.six/sklearn/feature_extraction/text.py 2013-09-16 13:18:31.082526490 +0200
@@ -25,11 +25,11 @@
import scipy.sparse as sp
from ..base import BaseEstimator, TransformerMixin
-from ..externals.six.moves import xrange
+from six.moves import xrange
from ..preprocessing import normalize
from .hashing import FeatureHasher
from .stop_words import ENGLISH_STOP_WORDS
-from sklearn.externals import six
+import six
__all__ = ['CountVectorizer',
'ENGLISH_STOP_WORDS',
diff -ur scikit-learn-0.14.1/sklearn/feature_selection/base.py scikit-learn-0.14.1.six/sklearn/feature_selection/base.py
--- scikit-learn-0.14.1/sklearn/feature_selection/base.py 2013-09-16 12:57:15.380323461 +0200
+++ scikit-learn-0.14.1.six/sklearn/feature_selection/base.py 2013-09-16 13:18:27.523497903 +0200
@@ -11,7 +11,7 @@
from ..base import TransformerMixin
from ..utils import array2d, atleast2d_or_csr, safe_mask
-from ..externals import six
+import six
class SelectorMixin(six.with_metaclass(ABCMeta, TransformerMixin)):
diff -ur scikit-learn-0.14.1/sklearn/feature_selection/from_model.py scikit-learn-0.14.1.six/sklearn/feature_selection/from_model.py
--- scikit-learn-0.14.1/sklearn/feature_selection/from_model.py 2013-09-16 12:57:15.383323485 +0200
+++ scikit-learn-0.14.1.six/sklearn/feature_selection/from_model.py 2013-09-16 13:18:27.614498633 +0200
@@ -4,7 +4,7 @@
import numpy as np
from ..base import TransformerMixin
-from ..externals import six
+import six
from ..utils import safe_mask, atleast2d_or_csc
diff -ur scikit-learn-0.14.1/sklearn/feature_selection/univariate_selection.py scikit-learn-0.14.1.six/sklearn/feature_selection/univariate_selection.py
--- scikit-learn-0.14.1/sklearn/feature_selection/univariate_selection.py 2013-09-16 12:57:15.384323493 +0200
+++ scikit-learn-0.14.1.six/sklearn/feature_selection/univariate_selection.py 2013-09-16 13:18:27.634498794 +0200
@@ -20,7 +20,7 @@
atleast2d_or_csr, check_arrays, safe_asarray, safe_sqr,
safe_mask)
from ..utils.extmath import safe_sparse_dot
-from ..externals import six
+import six
from .base import SelectorMixin
diff -ur scikit-learn-0.14.1/sklearn/grid_search.py scikit-learn-0.14.1.six/sklearn/grid_search.py
--- scikit-learn-0.14.1/sklearn/grid_search.py 2013-09-16 12:57:15.372323396 +0200
+++ scikit-learn-0.14.1.six/sklearn/grid_search.py 2013-09-16 13:18:27.251495717 +0200
@@ -25,7 +25,7 @@
from .base import MetaEstimatorMixin
from .cross_validation import check_cv
from joblib import Parallel, delayed, logger
-from .externals import six
+import six
from .utils import safe_mask, check_random_state
from .utils.validation import _num_samples, check_arrays
from .metrics.scorer import _deprecate_loss_and_score_funcs
diff -ur scikit-learn-0.14.1/sklearn/linear_model/base.py scikit-learn-0.14.1.six/sklearn/linear_model/base.py
--- scikit-learn-0.14.1/sklearn/linear_model/base.py 2013-09-16 12:57:15.444323980 +0200
+++ scikit-learn-0.14.1.six/sklearn/linear_model/base.py 2013-09-16 13:18:29.801516200 +0200
@@ -20,7 +20,7 @@
from scipy import linalg
from scipy import sparse
-from ..externals import six
+import six
from joblib import Parallel, delayed
from ..base import BaseEstimator, ClassifierMixin, RegressorMixin
from ..utils import as_float_array, atleast2d_or_csr, safe_asarray
diff -ur scikit-learn-0.14.1/sklearn/linear_model/coordinate_descent.py scikit-learn-0.14.1.six/sklearn/linear_model/coordinate_descent.py
--- scikit-learn-0.14.1/sklearn/linear_model/coordinate_descent.py 2013-09-16 12:57:15.436323915 +0200
+++ scikit-learn-0.14.1.six/sklearn/linear_model/coordinate_descent.py 2013-09-16 13:18:29.662515084 +0200
@@ -20,8 +20,8 @@
from ..utils import array2d, atleast2d_or_csc, deprecated
from ..cross_validation import check_cv
from joblib import Parallel, delayed
-from ..externals import six
-from ..externals.six.moves import xrange
+import six
+from six.moves import xrange
from ..utils.extmath import safe_sparse_dot
from . import cd_fast
diff -ur scikit-learn-0.14.1/sklearn/linear_model/least_angle.py scikit-learn-0.14.1.six/sklearn/linear_model/least_angle.py
--- scikit-learn-0.14.1/sklearn/linear_model/least_angle.py 2013-09-16 12:57:15.441323955 +0200
+++ scikit-learn-0.14.1.six/sklearn/linear_model/least_angle.py 2013-09-16 13:18:29.750515791 +0200
@@ -23,7 +23,7 @@
from ..utils import array2d, arrayfuncs, as_float_array
from ..cross_validation import check_cv
from joblib import Parallel, delayed
-from ..externals.six.moves import xrange
+from six.moves import xrange
def lars_path(X, y, Xy=None, Gram=None, max_iter=500,
diff -ur scikit-learn-0.14.1/sklearn/linear_model/randomized_l1.py scikit-learn-0.14.1.six/sklearn/linear_model/randomized_l1.py
--- scikit-learn-0.14.1/sklearn/linear_model/randomized_l1.py 2013-09-16 12:57:15.438323931 +0200
+++ scikit-learn-0.14.1.six/sklearn/linear_model/randomized_l1.py 2013-09-16 13:18:29.692515325 +0200
@@ -16,7 +16,7 @@
from .base import center_data
from ..base import BaseEstimator, TransformerMixin
-from ..externals import six
+import six
from joblib import Memory, Parallel, delayed
from ..utils import (as_float_array, check_random_state, safe_asarray,
check_arrays, safe_mask)
diff -ur scikit-learn-0.14.1/sklearn/linear_model/ridge.py scikit-learn-0.14.1.six/sklearn/linear_model/ridge.py
--- scikit-learn-0.14.1/sklearn/linear_model/ridge.py 2013-09-16 12:57:15.446323996 +0200
+++ scikit-learn-0.14.1.six/sklearn/linear_model/ridge.py 2013-09-16 13:18:29.828516417 +0200
@@ -24,7 +24,7 @@
from ..utils import column_or_1d
from ..preprocessing import LabelBinarizer
from ..grid_search import GridSearchCV
-from ..externals import six
+import six
from ..metrics.scorer import _deprecate_loss_and_score_funcs
diff -ur scikit-learn-0.14.1/sklearn/linear_model/stochastic_gradient.py scikit-learn-0.14.1.six/sklearn/linear_model/stochastic_gradient.py
--- scikit-learn-0.14.1/sklearn/linear_model/stochastic_gradient.py 2013-09-16 12:57:15.448324012 +0200
+++ scikit-learn-0.14.1.six/sklearn/linear_model/stochastic_gradient.py 2013-09-16 13:18:29.856516642 +0200
@@ -19,7 +19,7 @@
column_or_1d)
from ..utils.extmath import safe_sparse_dot
from ..utils.multiclass import _check_partial_fit_first_call
-from ..externals import six
+import six
from .sgd_fast import plain_sgd as plain_sgd
from ..utils.seq_dataset import ArrayDataset, CSRDataset
diff -ur scikit-learn-0.14.1/sklearn/linear_model/tests/test_least_angle.py scikit-learn-0.14.1.six/sklearn/linear_model/tests/test_least_angle.py
--- scikit-learn-0.14.1/sklearn/linear_model/tests/test_least_angle.py 2013-09-16 12:57:15.454324060 +0200
+++ scikit-learn-0.14.1.six/sklearn/linear_model/tests/test_least_angle.py 2013-09-16 13:18:30.117518739 +0200
@@ -24,7 +24,7 @@
"""
# also test verbose output
- from sklearn.externals.six.moves import cStringIO as StringIO
+ from six.moves import cStringIO as StringIO
import sys
old_stdout = sys.stdout
sys.stdout = StringIO()
diff -ur scikit-learn-0.14.1/sklearn/manifold/spectral_embedding_.py scikit-learn-0.14.1.six/sklearn/manifold/spectral_embedding_.py
--- scikit-learn-0.14.1/sklearn/manifold/spectral_embedding_.py 2013-09-16 12:57:15.460324109 +0200
+++ scikit-learn-0.14.1.six/sklearn/manifold/spectral_embedding_.py 2013-09-16 13:18:30.278520032 +0200
@@ -12,7 +12,7 @@
from scipy.sparse.linalg.eigen.lobpcg.lobpcg import symeig
from ..base import BaseEstimator, TransformerMixin
-from ..externals import six
+import six
from ..utils import check_random_state
from ..utils.validation import atleast2d_or_csr
from ..utils.graph import graph_laplacian
diff -ur scikit-learn-0.14.1/sklearn/metrics/metrics.py scikit-learn-0.14.1.six/sklearn/metrics/metrics.py
--- scikit-learn-0.14.1/sklearn/metrics/metrics.py 2013-09-16 12:57:15.342323153 +0200
+++ scikit-learn-0.14.1.six/sklearn/metrics/metrics.py 2013-09-16 13:18:26.613490593 +0200
@@ -24,7 +24,7 @@
from scipy.sparse import coo_matrix
from scipy.spatial.distance import hamming as sp_hamming
-from ..externals.six.moves import zip
+from six.moves import zip
from ..preprocessing import LabelBinarizer
from ..utils import check_arrays
from ..utils import deprecated
diff -ur scikit-learn-0.14.1/sklearn/metrics/scorer.py scikit-learn-0.14.1.six/sklearn/metrics/scorer.py
--- scikit-learn-0.14.1/sklearn/metrics/scorer.py 2013-09-16 12:57:15.338323121 +0200
+++ scikit-learn-0.14.1.six/sklearn/metrics/scorer.py 2013-09-16 13:18:26.565490207 +0200
@@ -27,7 +27,7 @@
recall_score, log_loss)
from .cluster import adjusted_rand_score
-from ..externals import six
+import six
class _BaseScorer(six.with_metaclass(ABCMeta, object)):
diff -ur scikit-learn-0.14.1/sklearn/metrics/tests/test_metrics.py scikit-learn-0.14.1.six/sklearn/metrics/tests/test_metrics.py
--- scikit-learn-0.14.1/sklearn/metrics/tests/test_metrics.py 2013-09-16 12:57:15.346323186 +0200
+++ scikit-learn-0.14.1.six/sklearn/metrics/tests/test_metrics.py 2013-09-16 13:18:26.675491091 +0200
@@ -55,7 +55,7 @@
from sklearn.metrics.metrics import _check_reg_targets
-from sklearn.externals.six.moves import xrange
+from six.moves import xrange
REGRESSION_METRICS = {
diff -ur scikit-learn-0.14.1/sklearn/mixture/dpgmm.py scikit-learn-0.14.1.six/sklearn/mixture/dpgmm.py
--- scikit-learn-0.14.1/sklearn/mixture/dpgmm.py 2013-09-16 12:57:15.357323275 +0200
+++ scikit-learn-0.14.1.six/sklearn/mixture/dpgmm.py 2013-09-16 13:18:26.947493275 +0200
@@ -15,7 +15,7 @@
from scipy import linalg
from scipy.spatial.distance import cdist
-from ..externals.six.moves import xrange
+from six.moves import xrange
from ..utils import check_random_state, deprecated
from ..utils.extmath import norm, logsumexp, pinvh
from .. import cluster
diff -ur scikit-learn-0.14.1/sklearn/mixture/gmm.py scikit-learn-0.14.1.six/sklearn/mixture/gmm.py
--- scikit-learn-0.14.1/sklearn/mixture/gmm.py 2013-09-16 12:57:15.354323251 +0200
+++ scikit-learn-0.14.1.six/sklearn/mixture/gmm.py 2013-09-16 13:18:26.881492745 +0200
@@ -16,7 +16,7 @@
from ..utils.extmath import logsumexp, pinvh
from .. import cluster
-from sklearn.externals.six.moves import zip
+from six.moves import zip
EPS = np.finfo(float).eps
diff -ur scikit-learn-0.14.1/sklearn/naive_bayes.py scikit-learn-0.14.1.six/sklearn/naive_bayes.py
--- scikit-learn-0.14.1/sklearn/naive_bayes.py 2013-09-16 12:57:15.500324433 +0200
+++ scikit-learn-0.14.1.six/sklearn/naive_bayes.py 2013-09-16 13:18:31.259527912 +0200
@@ -28,7 +28,7 @@
from .utils import array2d, atleast2d_or_csr, column_or_1d, check_arrays
from .utils.extmath import safe_sparse_dot, logsumexp
from .utils.multiclass import _check_partial_fit_first_call
-from .externals import six
+import six
__all__ = ['BernoulliNB', 'GaussianNB', 'MultinomialNB']
diff -ur scikit-learn-0.14.1/sklearn/neighbors/base.py scikit-learn-0.14.1.six/sklearn/neighbors/base.py
--- scikit-learn-0.14.1/sklearn/neighbors/base.py 2013-09-16 12:57:15.399323615 +0200
+++ scikit-learn-0.14.1.six/sklearn/neighbors/base.py 2013-09-16 13:18:28.226503549 +0200
@@ -20,7 +20,7 @@
from ..utils import safe_asarray, atleast2d_or_csr, check_arrays
from ..utils.validation import DataConversionWarning
from ..utils.fixes import unique
-from ..externals import six
+import six
VALID_METRICS = dict(ball_tree=BallTree.valid_metrics,
diff -ur scikit-learn-0.14.1/sklearn/neighbors/nearest_centroid.py scikit-learn-0.14.1.six/sklearn/neighbors/nearest_centroid.py
--- scikit-learn-0.14.1/sklearn/neighbors/nearest_centroid.py 2013-09-16 12:57:15.398323607 +0200
+++ scikit-learn-0.14.1.six/sklearn/neighbors/nearest_centroid.py 2013-09-16 13:18:27.962501429 +0200
@@ -12,7 +12,7 @@
from scipy import sparse as sp
from ..base import BaseEstimator, ClassifierMixin
-from ..externals.six.moves import xrange
+from six.moves import xrange
from ..metrics.pairwise import pairwise_distances
from ..utils.validation import check_arrays, atleast2d_or_csr, column_or_1d
diff -ur scikit-learn-0.14.1/sklearn/neural_network/rbm.py scikit-learn-0.14.1.six/sklearn/neural_network/rbm.py
--- scikit-learn-0.14.1/sklearn/neural_network/rbm.py 2013-09-16 12:57:15.494324384 +0200
+++ scikit-learn-0.14.1.six/sklearn/neural_network/rbm.py 2013-09-16 13:18:31.111526723 +0200
@@ -12,7 +12,7 @@
from ..base import BaseEstimator
from ..base import TransformerMixin
-from ..externals.six.moves import xrange
+from six.moves import xrange
from ..utils import check_arrays
from ..utils import check_random_state
from ..utils import gen_even_slices
diff -ur scikit-learn-0.14.1/sklearn/pipeline.py scikit-learn-0.14.1.six/sklearn/pipeline.py
--- scikit-learn-0.14.1/sklearn/pipeline.py 2013-09-16 12:57:15.405323663 +0200
+++ scikit-learn-0.14.1.six/sklearn/pipeline.py 2013-09-16 13:18:28.756507806 +0200
@@ -13,9 +13,9 @@
from .base import BaseEstimator, TransformerMixin
from joblib import Parallel, delayed
-from .externals import six
+import six
from .utils import tosequence
-from .externals.six import iteritems
+from six import iteritems
__all__ = ['Pipeline', 'FeatureUnion']
diff -ur scikit-learn-0.14.1/sklearn/preprocessing/data.py scikit-learn-0.14.1.six/sklearn/preprocessing/data.py
--- scikit-learn-0.14.1/sklearn/preprocessing/data.py 2013-09-16 12:57:15.365323340 +0200
+++ scikit-learn-0.14.1.six/sklearn/preprocessing/data.py 2013-09-16 13:18:27.082494360 +0200
@@ -21,7 +21,7 @@
from ..utils.sparsefuncs import inplace_csr_row_normalize_l2
from ..utils.sparsefuncs import inplace_csr_column_scale
from ..utils.sparsefuncs import mean_variance_axis0
-from ..externals import six
+import six
zip = six.moves.zip
map = six.moves.map
diff -ur scikit-learn-0.14.1/sklearn/preprocessing/imputation.py scikit-learn-0.14.1.six/sklearn/preprocessing/imputation.py
--- scikit-learn-0.14.1/sklearn/preprocessing/imputation.py 2013-09-16 12:57:15.363323323 +0200
+++ scikit-learn-0.14.1.six/sklearn/preprocessing/imputation.py 2013-09-16 13:18:27.056494151 +0200
@@ -14,7 +14,7 @@
from ..utils import atleast2d_or_csr
from ..utils import atleast2d_or_csc
-from ..externals import six
+import six
zip = six.moves.zip
map = six.moves.map
diff -ur scikit-learn-0.14.1/sklearn/preprocessing/label.py scikit-learn-0.14.1.six/sklearn/preprocessing/label.py
--- scikit-learn-0.14.1/sklearn/preprocessing/label.py 2013-09-16 12:57:15.366323348 +0200
+++ scikit-learn-0.14.1.six/sklearn/preprocessing/label.py 2013-09-16 13:18:27.108494569 +0200
@@ -14,7 +14,7 @@
from ..utils.multiclass import unique_labels
from ..utils.multiclass import type_of_target
-from ..externals import six
+import six
zip = six.moves.zip
map = six.moves.map
diff -ur scikit-learn-0.14.1/sklearn/qda.py scikit-learn-0.14.1.six/sklearn/qda.py
--- scikit-learn-0.14.1/sklearn/qda.py 2013-09-16 12:57:15.370323380 +0200
+++ scikit-learn-0.14.1.six/sklearn/qda.py 2013-09-16 13:18:27.212495404 +0200
@@ -11,7 +11,7 @@
import numpy as np
from .base import BaseEstimator, ClassifierMixin
-from .externals.six.moves import xrange
+from six.moves import xrange
from .utils.fixes import unique
from .utils import check_arrays, array2d, column_or_1d
diff -ur scikit-learn-0.14.1/sklearn/random_projection.py scikit-learn-0.14.1.six/sklearn/random_projection.py
--- scikit-learn-0.14.1/sklearn/random_projection.py 2013-09-16 12:57:15.458324093 +0200
+++ scikit-learn-0.14.1.six/sklearn/random_projection.py 2013-09-16 13:18:30.248519791 +0200
@@ -36,8 +36,8 @@
import scipy.sparse as sp
from .base import BaseEstimator, TransformerMixin
-from .externals import six
-from .externals.six.moves import xrange
+import six
+from six.moves import xrange
from .utils import check_random_state
from .utils.extmath import safe_sparse_dot
from .utils.random import sample_without_replacement
diff -ur scikit-learn-0.14.1/sklearn/semi_supervised/label_propagation.py scikit-learn-0.14.1.six/sklearn/semi_supervised/label_propagation.py
--- scikit-learn-0.14.1/sklearn/semi_supervised/label_propagation.py 2013-09-16 12:57:15.326323024 +0200
+++ scikit-learn-0.14.1.six/sklearn/semi_supervised/label_propagation.py 2013-09-16 13:18:26.318488223 +0200
@@ -62,7 +62,7 @@
from ..metrics.pairwise import rbf_kernel
from ..utils.graph import graph_laplacian
from ..utils.extmath import safe_sparse_dot
-from ..externals import six
+import six
from ..neighbors.unsupervised import NearestNeighbors
diff -ur scikit-learn-0.14.1/sklearn/setup.py scikit-learn-0.14.1.six/sklearn/setup.py
--- scikit-learn-0.14.1/sklearn/setup.py 2013-09-16 12:57:15.456324077 +0200
+++ scikit-learn-0.14.1.six/sklearn/setup.py 2013-09-16 13:19:57.923224042 +0200
@@ -35,7 +35,6 @@
config.add_subpackage('feature_selection/tests')
config.add_subpackage('utils')
config.add_subpackage('utils/tests')
- config.add_subpackage('externals')
config.add_subpackage('mixture')
config.add_subpackage('mixture/tests')
config.add_subpackage('gaussian_process')
diff -ur scikit-learn-0.14.1/sklearn/svm/base.py scikit-learn-0.14.1.six/sklearn/svm/base.py
--- scikit-learn-0.14.1/sklearn/svm/base.py 2013-09-16 12:57:15.323322999 +0200
+++ scikit-learn-0.14.1.six/sklearn/svm/base.py 2013-09-16 13:18:26.236487564 +0200
@@ -13,7 +13,7 @@
from ..utils import ConvergenceWarning, compute_class_weight, deprecated
from ..utils.fixes import unique
from ..utils.extmath import safe_sparse_dot
-from ..externals import six
+import six
LIBSVM_IMPL = ['c_svc', 'nu_svc', 'one_class', 'epsilon_svr', 'nu_svr']
diff -ur scikit-learn-0.14.1/sklearn/tests/test_common.py scikit-learn-0.14.1.six/sklearn/tests/test_common.py
--- scikit-learn-0.14.1/sklearn/tests/test_common.py 2013-09-16 12:57:15.472324206 +0200
+++ scikit-learn-0.14.1.six/sklearn/tests/test_common.py 2013-09-16 13:18:30.562522313 +0200
@@ -18,7 +18,7 @@
import numpy as np
from scipy import sparse
-from sklearn.externals.six import PY3
+from six import PY3
from sklearn.utils.testing import assert_raises
from sklearn.utils.testing import assert_equal
from sklearn.utils.testing import assert_true
diff -ur scikit-learn-0.14.1/sklearn/tests/test_cross_validation.py scikit-learn-0.14.1.six/sklearn/tests/test_cross_validation.py
--- scikit-learn-0.14.1/sklearn/tests/test_cross_validation.py 2013-09-16 12:57:15.470324190 +0200
+++ scikit-learn-0.14.1.six/sklearn/tests/test_cross_validation.py 2013-09-16 13:18:30.527522032 +0200
@@ -26,7 +26,7 @@
from sklearn.metrics import fbeta_score
from sklearn.metrics import make_scorer
-from sklearn.externals import six
+import six
from sklearn.linear_model import Ridge
from sklearn.svm import SVC
diff -ur scikit-learn-0.14.1/sklearn/tests/test_dummy.py scikit-learn-0.14.1.six/sklearn/tests/test_dummy.py
--- scikit-learn-0.14.1/sklearn/tests/test_dummy.py 2013-09-16 12:57:15.463324133 +0200
+++ scikit-learn-0.14.1.six/sklearn/tests/test_dummy.py 2013-09-16 13:18:30.349520602 +0200
@@ -2,7 +2,7 @@
import numpy as np
from sklearn.base import clone
-from sklearn.externals.six.moves import xrange
+from six.moves import xrange
from sklearn.utils.testing import (assert_array_equal,
assert_equal,
assert_almost_equal,
diff -ur scikit-learn-0.14.1/sklearn/tests/test_grid_search.py scikit-learn-0.14.1.six/sklearn/tests/test_grid_search.py
--- scikit-learn-0.14.1/sklearn/tests/test_grid_search.py 2013-09-16 12:57:15.469324182 +0200
+++ scikit-learn-0.14.1.six/sklearn/tests/test_grid_search.py 2013-09-16 13:18:30.499521807 +0200
@@ -4,8 +4,8 @@
"""
from collections import Iterable, Sized
-from sklearn.externals.six.moves import cStringIO as StringIO
-from sklearn.externals.six.moves import xrange
+from six.moves import cStringIO as StringIO
+from six.moves import xrange
from itertools import chain, product
import pickle
import sys
diff -ur scikit-learn-0.14.1/sklearn/tree/export.py scikit-learn-0.14.1.six/sklearn/tree/export.py
--- scikit-learn-0.14.1/sklearn/tree/export.py 2013-09-16 12:57:15.366323348 +0200
+++ scikit-learn-0.14.1.six/sklearn/tree/export.py 2013-09-16 13:18:27.129494737 +0200
@@ -9,7 +9,7 @@
# Satrajit Gosh <satrajit.ghosh@gmail.com>
# Licence: BSD 3 clause
-from ..externals import six
+import six
from . import _tree
diff -ur scikit-learn-0.14.1/sklearn/tree/tests/test_export.py scikit-learn-0.14.1.six/sklearn/tree/tests/test_export.py
--- scikit-learn-0.14.1/sklearn/tree/tests/test_export.py 2013-09-16 12:57:15.368323364 +0200
+++ scikit-learn-0.14.1.six/sklearn/tree/tests/test_export.py 2013-09-16 13:18:27.178495131 +0200
@@ -7,7 +7,7 @@
from sklearn.tree import DecisionTreeClassifier
from sklearn.tree import export_graphviz
-from sklearn.externals.six import StringIO
+from six import StringIO
# toy sample
X = [[-2, -1], [-1, -1], [-1, -2], [1, 1], [1, 2], [2, 1]]
diff -ur scikit-learn-0.14.1/sklearn/tree/tree.py scikit-learn-0.14.1.six/sklearn/tree/tree.py
--- scikit-learn-0.14.1/sklearn/tree/tree.py 2013-09-16 12:57:15.370323380 +0200
+++ scikit-learn-0.14.1.six/sklearn/tree/tree.py 2013-09-16 13:18:27.199495300 +0200
@@ -18,8 +18,8 @@
from warnings import warn
from ..base import BaseEstimator, ClassifierMixin, RegressorMixin
-from ..externals import six
-from ..externals.six.moves import xrange
+import six
+from six.moves import xrange
from ..feature_selection.from_model import _LearntSelectorMixin
from ..utils import array2d, check_random_state
from ..utils.fixes import unique
diff -ur scikit-learn-0.14.1/sklearn/utils/extmath.py scikit-learn-0.14.1.six/sklearn/utils/extmath.py
--- scikit-learn-0.14.1/sklearn/utils/extmath.py 2013-09-16 12:57:15.413323728 +0200
+++ scikit-learn-0.14.1.six/sklearn/utils/extmath.py 2013-09-16 13:18:28.944509317 +0200
@@ -12,7 +12,7 @@
from . import check_random_state
from .fixes import qr_economic
from ._logistic_sigmoid import _log_logistic_sigmoid
-from ..externals.six.moves import xrange
+from six.moves import xrange
from .validation import array2d
diff -ur scikit-learn-0.14.1/sklearn/utils/fixes.py scikit-learn-0.14.1.six/sklearn/utils/fixes.py
--- scikit-learn-0.14.1/sklearn/utils/fixes.py 2013-09-16 12:57:15.407323680 +0200
+++ scikit-learn-0.14.1.six/sklearn/utils/fixes.py 2013-09-16 13:18:28.833508425 +0200
@@ -12,7 +12,7 @@
import collections
from operator import itemgetter
import inspect
-from sklearn.externals import six
+import six
import numpy as np
diff -ur scikit-learn-0.14.1/sklearn/utils/multiclass.py scikit-learn-0.14.1.six/sklearn/utils/multiclass.py
--- scikit-learn-0.14.1/sklearn/utils/multiclass.py 2013-09-16 12:57:15.411323712 +0200
+++ scikit-learn-0.14.1.six/sklearn/utils/multiclass.py 2013-09-16 13:18:28.901508971 +0200
@@ -11,7 +11,7 @@
import numpy as np
-from ..externals.six import string_types
+from six import string_types
def _unique_multiclass(y):
diff -ur scikit-learn-0.14.1/sklearn/utils/tests/test_multiclass.py scikit-learn-0.14.1.six/sklearn/utils/tests/test_multiclass.py
--- scikit-learn-0.14.1/sklearn/utils/tests/test_multiclass.py 2013-09-16 12:57:15.419323777 +0200
+++ scikit-learn-0.14.1.six/sklearn/utils/tests/test_multiclass.py 2013-09-16 13:18:29.143510915 +0200
@@ -1,7 +1,7 @@
import numpy as np
from itertools import product
-from sklearn.externals.six.moves import xrange
-from sklearn.externals.six import iteritems
+from six.moves import xrange
+from six import iteritems
from sklearn.utils.testing import assert_array_equal
from sklearn.utils.testing import assert_equal
diff -ur scikit-learn-0.14.1/sklearn/utils/tests/test_murmurhash.py scikit-learn-0.14.1.six/sklearn/utils/tests/test_murmurhash.py
--- scikit-learn-0.14.1/sklearn/utils/tests/test_murmurhash.py 2013-09-16 12:57:15.418323769 +0200
+++ scikit-learn-0.14.1.six/sklearn/utils/tests/test_murmurhash.py 2013-09-16 13:18:29.110510650 +0200
@@ -3,7 +3,7 @@
# License: BSD 3 clause
import numpy as np
-from sklearn.externals.six import b, u
+from six import b, u
from sklearn.utils.murmurhash import murmurhash3_32
from numpy.testing import assert_array_almost_equal
from numpy.testing import assert_array_equal
diff -ur scikit-learn-0.14.1/sklearn/utils/validation.py scikit-learn-0.14.1.six/sklearn/utils/validation.py
--- scikit-learn-0.14.1/sklearn/utils/validation.py 2013-09-16 12:57:15.420323785 +0200
+++ scikit-learn-0.14.1.six/sklearn/utils/validation.py 2013-09-16 13:18:29.158511036 +0200
@@ -8,7 +8,7 @@
import numpy as np
from scipy import sparse
-from ..externals import six
+import six
from .fixes import safe_copy