Moved exceptions that don’t depend on nose to separate file to avoid making nose a dependency for matplotlib.testing.compare

astrofrog · astrofrog · commit 3da4413be8f2 · 2015-06-26T01:14:23.000+01:00
diff --git a/lib/matplotlib/testing/compare.py b/lib/matplotlib/testing/compare.py
@@ -7,7 +7,7 @@
 from __future__ import division
 
 import matplotlib
-from matplotlib.testing.noseclasses import ImageComparisonFailure
+from matplotlib.testing.exceptions import ImageComparisonFailure
 from matplotlib.testing import image_util
 from matplotlib import _png
 import math
diff --git a/lib/matplotlib/testing/exceptions.py b/lib/matplotlib/testing/exceptions.py
@@ -0,0 +1,10 @@
+class KnownFailureTest(Exception):
+    '''Raise this exception to mark a test as a known failing test.'''
+    pass
+
+class KnownFailureDidNotFailTest(Exception):
+    '''Raise this exception to mark a test should have failed but did not.'''
+    pass
+
+class ImageComparisonFailure(AssertionError):
+    '''Raise this exception to mark a test as a comparison between two images.'''
diff --git a/lib/matplotlib/testing/noseclasses.py b/lib/matplotlib/testing/noseclasses.py
@@ -1,17 +1,9 @@
 from __future__ import print_function
 import os
 from nose.plugins.errorclass import ErrorClass, ErrorClassPlugin
-
-class KnownFailureTest(Exception):
-    '''Raise this exception to mark a test as a known failing test.'''
-    pass
-
-class KnownFailureDidNotFailTest(Exception):
-    '''Raise this exception to mark a test should have failed but did not.'''
-    pass
-
-class ImageComparisonFailure(AssertionError):
-    '''Raise this exception to mark a test as a comparison between two images.'''
+from matplotlib.testing.exceptions import (KnownFailureTest,
+                                           KnownFailureDidNotFailTest,
+                                           ImageComparisonFailure)
 
 class KnownFailure(ErrorClassPlugin):
     '''Plugin that installs a KNOWNFAIL error class for the
