Remove python 2.6 workaround in labeled data test

jenshnielsen · jenshnielsen · commit 44cebb9503b8 · 2015-10-31T09:43:45.000Z
diff --git a/lib/matplotlib/tests/test_labeled_data_unpacking.py b/lib/matplotlib/tests/test_labeled_data_unpacking.py
@@ -7,17 +7,10 @@
     # 3.2+ versions
     from nose.tools import assert_regex, assert_not_regex
 except ImportError:
-    try:
-        # 2.7 versions
-        from nose.tools import assert_regexp_matches, assert_not_regexp_matches
-        assert_regex = assert_regexp_matches
-        assert_not_regex = assert_not_regexp_matches
-    except ImportError:
-        # 2.6 versions
-        def noop(txt, regex):
-            raise SkipTest("No assert for regex matching in py2.6")
-        assert_regex = noop
-        assert_not_regex = noop
+    # 2.7 versions
+    from nose.tools import assert_regexp_matches, assert_not_regexp_matches
+    assert_regex = assert_regexp_matches
+    assert_not_regex = assert_not_regexp_matches
 
 from ..testing import assert_produces_warning
 
