From 98ff6e5f2023f76863ce2ec8b68e29ae2a75b995 Mon Sep 17 00:00:00 2001 From: JDWarner Date: Wed, 20 Nov 2013 15:45:54 -0600 Subject: [PATCH] FIX: Specify field index for Python 2.6 compatible use of str.format() --- skimage/novice/_novice.py | 2 +- skimage/novice/tests/test_novice.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/skimage/novice/_novice.py b/skimage/novice/_novice.py index 836458a7..27721f9b 100644 --- a/skimage/novice/_novice.py +++ b/skimage/novice/_novice.py @@ -25,7 +25,7 @@ def open(path): def _verify_picture_index(index): """Raise error if picture index is not a 2D index/slice.""" if not (isinstance(index, tuple) and len(index) == 2): - raise IndexError("Expected 2D index but got {!r}".format(index)) + raise IndexError("Expected 2D index but got {0!r}".format(index)) if all(isinstance(i, int) for i in index): return index diff --git a/skimage/novice/tests/test_novice.py b/skimage/novice/tests/test_novice.py index 80065e46..5a4e6003 100644 --- a/skimage/novice/tests/test_novice.py +++ b/skimage/novice/tests/test_novice.py @@ -268,5 +268,4 @@ def test_pixel_blue_raises(): if __name__ == '__main__': - from numpy import testing - testing.run_module_suite() + np.testing.run_module_suite()