From baab5f11eaec5d09c5ee516bb4c31b4007580521 Mon Sep 17 00:00:00 2001
From: Andreas Mueller <amueller@ais.uni-bonn.de>
Date: Mon, 23 Apr 2012 21:50:39 +0200
Subject: [PATCH] FIX don't use Python 2.5 method of checking for warnings
---
sklearn/neighbors/tests/test_neighbors.py | 2 +-
sklearn/tests/test_cross_validation.py | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/sklearn/neighbors/tests/test_neighbors.py b/sklearn/neighbors/tests/test_neighbors.py
index 17e42e21a1..66e675c92c 100644
--- a/sklearn/neighbors/tests/test_neighbors.py
+++ b/sklearn/neighbors/tests/test_neighbors.py
@@ -57,7 +57,7 @@ def test_warn_on_equidistant(n_samples=100, n_features=3, k=3):
print algorithm, estimator, len(warn_queue)
assert_equal(len(warn_queue), 1)
- assert_equal(warn_queue[0].message.message, expected_message)
+ assert_equal(str(warn_queue[0].message), expected_message)
def test_unsupervised_kneighbors(n_samples=20, n_features=5,
diff --git a/sklearn/tests/test_cross_validation.py b/sklearn/tests/test_cross_validation.py
index d82922a970..b780c7508e 100644
--- a/sklearn/tests/test_cross_validation.py
+++ b/sklearn/tests/test_cross_validation.py
@@ -175,10 +175,10 @@ def test_shuffle_split_warnings():
cval.train_test_split(range(3), train_fraction=0.1)
assert_equal(len(warn_queue), 4)
- assert_equal(warn_queue[0].message.message, expected_message[0])
- assert_equal(warn_queue[1].message.message, expected_message[1])
- assert_equal(warn_queue[2].message.message, expected_message[0])
- assert_equal(warn_queue[3].message.message, expected_message[1])
+ assert_equal(str(warn_queue[0].message), expected_message[0])
+ assert_equal(str(warn_queue[1].message), expected_message[1])
+ assert_equal(str(warn_queue[2].message), expected_message[0])
+ assert_equal(str(warn_queue[3].message), expected_message[1])
def test_train_test_split():
@@ -323,10 +323,10 @@ def test_bootstrap_errors():
def test_shufflesplit_errors():
- assert_raises(ValueError, cval.ShuffleSplit, 10, test_fraction=2.0)
- assert_raises(ValueError, cval.ShuffleSplit, 10, test_fraction=1.0)
- assert_raises(ValueError, cval.ShuffleSplit, 10, test_fraction=0.1,
- train_fraction=0.95)
+ assert_raises(ValueError, cval.ShuffleSplit, 10, test_size=2.0)
+ assert_raises(ValueError, cval.ShuffleSplit, 10, test_size=1.0)
+ assert_raises(ValueError, cval.ShuffleSplit, 10, test_size=0.1,
+ train_size=0.95)
assert_raises(ValueError, cval.ShuffleSplit, 10, test_size=11)
assert_raises(ValueError, cval.ShuffleSplit, 10, test_size=10)
assert_raises(ValueError, cval.ShuffleSplit, 10, test_size=8,
--
GitLab