|
16 | 16 |
|
17 | 17 | import numpy as np |
18 | 18 | from scipy import sparse |
19 | | -from StringIO import StringIO |
20 | 19 |
|
21 | 20 | from sklearn.utils.testing import assert_raises |
22 | 21 | from sklearn.utils.testing import assert_equal |
@@ -424,10 +423,8 @@ def test_transformers_pickle(): |
424 | 423 |
|
425 | 424 | trans.fit(X, y_) |
426 | 425 | X_pred = trans.fit_transform(X, y=y_) |
427 | | - pickled_trans = StringIO.StringIO() |
428 | | - pickle.dump(trans, pickled_trans) |
429 | | - pickled_trans.pos = 0 |
430 | | - unpickled_trans = pickle.load(pickled_trans) |
| 426 | + pickled_trans = pickle.dumps(trans) |
| 427 | + unpickled_trans = pickle.loads(pickled_trans) |
431 | 428 | pickled_X_pred = unpickled_trans.fit_transform(X, y=y_) |
432 | 429 |
|
433 | 430 | try: |
@@ -671,10 +668,8 @@ def test_classifiers_pickle(): |
671 | 668 | # fit |
672 | 669 | clf.fit(X, y) |
673 | 670 | y_pred = clf.predict(X) |
674 | | - pickled_clf = StringIO.StringIO() |
675 | | - pickle.dump(clf, pickled_clf) |
676 | | - pickled_clf.pos = 0 |
677 | | - unpickled_clf = pickle.load(pickled_clf) |
| 671 | + pickled_clf = pickle.dumps(clf) |
| 672 | + unpickled_clf = pickle.loads(pickled_clf) |
678 | 673 | pickled_y_pred = unpickled_clf.predict(X) |
679 | 674 |
|
680 | 675 | try: |
@@ -794,10 +789,8 @@ def test_regressor_pickle(): |
794 | 789 | reg.fit(X, y_) |
795 | 790 | y_pred = reg.predict(X) |
796 | 791 | # store old predictions |
797 | | - pickled_reg = StringIO.StringIO() |
798 | | - pickle.dump(reg, pickled_reg) |
799 | | - pickled_reg.pos = 0 |
800 | | - unpickled_reg = pickle.load(pickled_reg) |
| 792 | + pickled_reg = pickle.dumps(reg) |
| 793 | + unpickled_reg = pickle.loads(pickled_reg) |
801 | 794 | pickled_y_pred = unpickled_reg.predict(X) |
802 | 795 |
|
803 | 796 | try: |
|
0 commit comments