8000 Merge pull request #1361 from astaric/py3k · erg/scikit-learn@a345761 · GitHub
[go: up one dir, main page]
Skip to content

Commit a345761

Browse files
ogriselogrisel
committed
Merge pull request scikit-learn#1361 from astaric/py3k
FIX Python 3 compatibility
2 parents e3fc34a + 9496a96 commit a345761

File tree

5 files changed

+13
-16
lines changed

5 files changed

+13
-16
lines changed

‎sklearn/linear_model/base.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
from ..utils.fixes import lsqr
2626
from ..utils.sparsefuncs import (csc_mean_variance_axis0,
2727
inplace_csc_column_scale)
28-
from cd_fast import sparse_std
28+
from .cd_fast import sparse_std
2929

3030

3131
###

‎sklearn/mixture/tests/test_gmm.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ def test_sample(self, n=100):
185185
g.weights_ = self.weights
186186

187187
samples = g.sample(n)
188-
self.assertEquals(samples.shape, (n, self.n_features))
188+
self.assertEqual(samples.shape, (n, self.n_features))
189189

190190
def test_train(self, params='wmc'):
191191
g = mixture.GMM(n_components=self.n_components,

‎sklearn/tests/test_hmm.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ def test_base_hmm_attributes(self):
173173

174174
h = self.StubHMM(n_components)
175175

176-
self.assertEquals(h.n_components, n_components)
176+
self.assertEqual(h.n_components, n_components)
177177

178178
h.startprob_ = startprob
179179
assert_array_almost_equal(h.startprob_, startprob)
@@ -270,7 +270,7 @@ def test_sample(self, n=1000):
270270
h.startprob_ = self.startprob
271271

272272
samples = h.sample(n)[0]
273-
self.assertEquals(samples.shape, (n, self.n_features))
273+
self.assertEqual(samples.shape, (n, self.n_features))
274274

275275
def test_fit(self, params='stmc', n_iter=5, verbose=False, **kwargs):
276276
h = hmm.GaussianHMM(self.n_components, self.covariance_type)
@@ -456,7 +456,7 @@ def test_predict(self):
456456
def test_attributes(self):
457457
h = hmm.MultinomialHMM(self.n_components)
458458

459-
self.assertEquals(h.n_components, self.n_components)
459+
self.assertEqual(h.n_components, self.n_components)
460460

461461
h.startprob_ = self.startprob
462462
assert_array_almost_equal(h.startprob_, self.startprob)
@@ -479,7 +479,7 @@ def test_attributes(self):
479479
self.assertRaises(ValueError, h.__setattr__, 'emissionprob_', [])
480480
self.assertRaises(ValueError, h.__setattr__, 'emissionprob_',
481481
np.zeros((self.n_components - 2, self.n_symbols)))
482-
self.assertEquals(h.n_symbols, self.n_symbols)
482+
self.assertEqual(h.n_symbols, self.n_symbols)
483483

484484
def test_eval(self):
485485
idx = np.repeat(range(self.n_components), 10)
@@ -493,8 +493,8 @@ def test_eval(self):
493493

494494
def test_sample(self, n=1000):
495495
samples = self.h.sample(n)[0]
496-
self.assertEquals(len(samples), n)
497-
self.assertEquals(len(np.unique(samples)), self.n_symbols)
496+
self.assertEqual(len(samples), n)
497+
self.assertEqual(len(np.unique(samples)), self.n_symbols)
498498

499499
def test_fit(self, params='ste', n_iter=5, verbose=False, **kwargs):
500500
h = self.h
@@ -586,7 +586,7 @@ def setUp(self):
586586
def test_attributes(self):
587587
h = hmm.GMMHMM(self.n_components, covariance_type=self.covariance_type)
588588

589-
self.assertEquals(h.n_components, self.n_components)
589+
self.assertEqual(h.n_components, self.n_components)
590590

591591
h.startprob_ = self.startprob
592592
assert_array_almost_equal(h.startprob_, self.startprob)
@@ -628,7 +628,7 @@ def test_sample(self, n=1000):
628628
startprob=self.startprob, transmat=self.transmat,
629629
gmms=self.gmms)
630630
samples = h.sample(n)[0]
631-
self.assertEquals(samples.shape, (n, self.n_features))
631+
self.assertEqual(samples.shape, (n, self.n_features))
632632

633633
def test_fit(self, params='stmwc', n_iter=5, verbose=False, **kwargs):
634634
h = hmm.GMMHMM(self.n_components, covars_prior=1.0)

‎sklearn/tests/test_naive_bayes.py‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,16 +92,12 @@ def test_discretenb_pickle():
9292
clf = cls().fit(X2, y2)
9393
y_pred = clf.predict(X2)
9494

95-
store = StringIO()
95+
store = BytesIO()
9696
pickle.dump(clf, store)
97-
clf = pickle.load(StringIO(store.getvalue()))
97+
clf = pickle.load(BytesIO(store.getvalue()))
9898

9999
assert_array_equal(y_pred, clf.predict(X2))
100100

101-
store = BytesIO()
102-
pickle.dump(clf, store)
103-
clf = pickle.load(BytesIO(store.getvalue()))
104-
105101

106102
def test_input_check():
107103
"""Test input checks"""

‎sklearn/utils/fixes.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ def _unique(ar, return_index=False, return_inverse=False):
107107
except ValueError:
108108
# x may be of the form dev-1ea1592
109109
np_version.append(x)
110+
np_version = tuple(np_version)
110111

111112
if np_version[:2] < (1, 5):
112113
unique = _unique

0 commit comments

Comments
 (0)
0