[tests] Use Python 3 zip/Python 2 zip consistently in tests

Author: ajtulloch

sklearn/tests/test_common.py

@@ -19,6 +19,7 @@
 from scipy import sparse
 
 from sklearn.externals.six import PY3
+from sklearn.externals.six.moves import zip
 from sklearn.utils.testing import assert_raises
 from sklearn.utils.testing import assert_equal
 from sklearn.utils.testing import assert_true

sklearn/tests/test_cross_validation.py

@@ -30,6 +30,8 @@
 from sklearn.metrics import make_scorer
 
 from sklearn.externals import six
+from sklearn.externals.six.moves import zip
+
 from sklearn.linear_model import Ridge
 from sklearn.svm import SVC
 

sklearn/tests/test_grid_search.py

@@ -24,6 +24,7 @@
 
 from scipy.stats import distributions
 
+from sklearn.externals.six.moves import zip
 from sklearn.base import BaseEstimator
 from sklearn.datasets import make_classification
 from sklearn.datasets import make_blobs

sklearn/tests/test_multiclass.py

@@ -25,6 +25,7 @@
 from sklearn.pipeline import Pipeline
 from sklearn import svm
 from sklearn import datasets
+from sklearn.externals.six.moves import zip
 
 iris = datasets.load_iris()
 rng = np.random.RandomState(0)

sklearn/tests/test_naive_bayes.py

@@ -8,6 +8,7 @@
 from sklearn.datasets import load_digits
 from sklearn.cross_validation import cross_val_score
 
+from sklearn.externals.six.moves import zip
 from sklearn.utils.testing import assert_almost_equal
 from sklearn.utils.testing import assert_array_equal
 from sklearn.utils.testing import assert_array_almost_equal

sklearn/tests/test_pipeline.py

@@ -4,6 +4,7 @@
 import numpy as np
 from scipy import sparse
 
+from sklearn.externals.six.moves import zip
 from sklearn.utils.testing import assert_raises
 from sklearn.utils.testing import assert_equal
 from sklearn.utils.testing import assert_false