Merge pull request #3189 from matthew-brett/use-unittest-mock

tacaswell · tacaswell · commit 47a36bad875e · 2014-07-05T20:04:34.000-04:00
BUG: use unittest.mock for Python 3.3+
diff --git a/lib/matplotlib/tests/test_dates.py b/lib/matplotlib/tests/test_dates.py
@@ -9,7 +9,11 @@
 import tempfile
 
 import dateutil
-import mock
+try:
+    # mock in python 3.3+
+    from unittest import mock
+except ImportError:
+    import mock
 from nose.tools import assert_raises, assert_equal
 
 from matplotlib.testing.decorators import image_comparison, cleanup
diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
@@ -3,8 +3,11 @@
 
 import six
 from six.moves import xrange
-
-import mock
+try:
+    # mock in python 3.3+
+    from unittest import mock
+except ImportError:
+    import mock
 from nose.tools import assert_equal
 import numpy as np
 
diff --git a/lib/matplotlib/tests/test_patheffects.py b/lib/matplotlib/tests/test_patheffects.py
@@ -3,14 +3,19 @@
 
 import six
 
-import mock
-from nose.tools import assert_equal
 import numpy as np
 
 from matplotlib.testing.decorators import image_comparison, cleanup
 import matplotlib.pyplot as plt
 import matplotlib.patheffects as path_effects
 
+try:
+    # mock in python 3.3+
+    from unittest import mock
+except ImportError:
+    import mock
+from nose.tools import assert_equal
+
 
 @image_comparison(baseline_images=['patheffect1'], remove_text=True)
 def test_patheffect1():
