Import NumPy more consistently in tests.

Author: QuLogic

lib/matplotlib/tests/test_backend_svg.py

@@ -1,9 +1,9 @@
-import numpy as np
 from io import BytesIO
 import re
 import tempfile
 import xml.parsers.expat
 
+import numpy as np
 import pytest
 
 import matplotlib as mpl

lib/matplotlib/tests/test_bbox_tight.py

@@ -1,6 +1,7 @@
-import numpy as np
 from io import BytesIO
 
+import numpy as np
+
 from matplotlib.testing.decorators import image_comparison
 import matplotlib.pyplot as plt
 import matplotlib.path as mpath

lib/matplotlib/tests/test_image.py

@@ -8,7 +8,6 @@
 import urllib.request
 
 import numpy as np
-from numpy import ma
 from numpy.testing import assert_array_equal
 from PIL import Image
 
@@ -820,7 +819,7 @@ def test_mask_image_over_under():
     palette.set_over('r', 1.0)
     palette.set_under('g', 1.0)
     palette.set_bad('b', 1.0)
-    Zm = ma.masked_where(Z > 1.2, Z)
+    Zm = np.ma.masked_where(Z > 1.2, Z)
     fig, (ax1, ax2) = plt.subplots(1, 2)
     im = ax1.imshow(Zm, interpolation='bilinear',
                     cmap=palette,

lib/matplotlib/tests/test_offsetbox.py

@@ -1,6 +1,8 @@
 from collections import namedtuple
-import numpy.testing as nptest
+
+from numpy.testing import assert_allclose
 import pytest
+
 from matplotlib.testing.decorators import image_comparison
 import matplotlib.pyplot as plt
 import matplotlib.patches as mpatches
@@ -143,7 +145,7 @@ def test_get_packed_offsets(wd_list, total, sep, mode):
 def test_get_packed_offsets_fixed(wd_list, total, sep, expected):
     result = _get_packed_offsets(wd_list, total, sep, mode='fixed')
     assert result[0] == expected[0]
-    nptest.assert_allclose(result[1], expected[1])
+    assert_allclose(result[1], expected[1])
 
 
 @pytest.mark.parametrize('wd_list, total, sep, expected', [
@@ -157,7 +159,7 @@ def test_get_packed_offsets_fixed(wd_list, total, sep, expected):
 def test_get_packed_offsets_expand(wd_list, total, sep, expected):
     result = _get_packed_offsets(wd_list, total, sep, mode='expand')
     assert result[0] == expected[0]
-    nptest.assert_allclose(result[1], expected[1])
+    assert_allclose(result[1], expected[1])
 
 
 @pytest.mark.parametrize('wd_list, total, sep, expected', [
@@ -174,7 +176,7 @@ def test_get_packed_offsets_expand(wd_list, total, sep, expected):
 def test_get_packed_offsets_equal(wd_list, total, sep, expected):
     result = _get_packed_offsets(wd_list, total, sep, mode='equal')
     assert result[0] == expected[0]
-    nptest.assert_allclose(result[1], expected[1])
+    assert_allclose(result[1], expected[1])
 
 
 def test_get_packed_offsets_equal_total_none_sep_none():

lib/matplotlib/tests/test_subplots.py

@@ -1,11 +1,11 @@
 import itertools
 
-import numpy
+import numpy as np
+import pytest
+
 import matplotlib.pyplot as plt
 from matplotlib.testing.decorators import image_comparison
 
-import pytest
-
 
 def check_shared(axs, x_shared, y_shared):
     """
@@ -38,14 +38,14 @@ def check_visible(axs, x_visible, y_visible):
 def test_shared():
     rdim = (4, 4, 2)
     share = {
-            'all': numpy.ones(rdim[:2], dtype=bool),
-            'none': numpy.zeros(rdim[:2], dtype=bool),
-            'row': numpy.array([
+            'all': np.ones(rdim[:2], dtype=bool),
+            'none': np.zeros(rdim[:2], dtype=bool),
+            'row': np.array([
                 [False, True, False, False],
                 [True, False, False, False],
                 [False, False, False, True],
                 [False, False, True, False]]),
-            'col': numpy.array([
+            'col': np.array([
                 [False, False, True, False],
                 [False, False, False, True],
                 [True, False, False, False],
@@ -151,8 +151,8 @@ def test_exceptions():
 
 @image_comparison(['subplots_offset_text'], remove_text=False)
 def test_subplots_offsettext():
-    x = numpy.arange(0, 1e10, 1e9)
-    y = numpy.arange(0, 100, 10)+1e4
+    x = np.arange(0, 1e10, 1e9)
+    y = np.arange(0, 100, 10)+1e4
     fig, axs = plt.subplots(2, 2, sharex='col', sharey='all')
     axs[0, 0].plot(x, x)
     axs[1, 0].plot(x, x)