Replace alltrue with all

Author: itziakos

chaco/tests/test_border.py

@@ -17,7 +17,8 @@
 
 import unittest
 
-from numpy import array, alltrue, ravel
+import numpy as np
+from numpy import array, ravel
 
 # Chaco imports
 from chaco.api import Plot, PlotGraphicsContext
@@ -26,7 +27,7 @@
 class DrawBorderTestCase(unittest.TestCase):
     def assertRavelEqual(self, x, y):
         self.assertTrue(
-            alltrue(ravel(x) == ravel(y)), "\n%s\n !=\n%s" % (x, y)
+            np.all(ravel(x) == ravel(y)), "\n%s\n !=\n%s" % (x, y)
         )
 
     def test_draw_border_simple(self):

chaco/tests/test_datarange_2d.py

@@ -11,7 +11,8 @@
 import unittest
 import warnings
 
-from numpy import alltrue, arange, array, ravel, transpose, zeros, inf, isinf
+import numpy as np
+from numpy import arange, array, ravel, transpose, zeros, inf, isinf
 from numpy.testing import assert_equal, assert_
 
 from chaco.api import DataRange2D, GridDataSource, PointDataSource
@@ -249,7 +250,7 @@ def assert_close_(desired, actual):
     diff = abs(ravel(actual) - ravel(desired))
     for d in diff:
         if not isinf(d):
-            assert_(alltrue(d <= diff_allowed))
+            assert_(np.all(d <= diff_allowed))
             return
 
 

chaco/tests/test_plot.py

@@ -11,7 +11,7 @@
 import unittest
 
 import numpy as np
-from numpy import alltrue, arange, array
+from numpy import arange, array
 
 from enable.api import ComponentEditor
 from enable.testing import EnableTestAssistant
@@ -26,6 +26,7 @@
 
 
 class PlotTestCase(unittest.TestCase):
+
     def test_plot_from_unsupported_array_shape(self):
         arr = arange(8).reshape(2, 2, 2)
         data = ArrayPlotData(x=arr, y=arr)
@@ -63,7 +64,7 @@ def test_segment_plot(self):
         gc = PlotGraphicsContext((250, 250))
         gc.render_component(plot)
         actual = gc.bmp_array[:, :, :]
-        self.assertFalse(alltrue(actual == 255))
+        self.assertFalse(np.all(actual == 255))
 
     def test_segment_plot_color(self):
         x = arange(10)
@@ -77,7 +78,7 @@ def test_segment_plot_color(self):
         gc = PlotGraphicsContext((250, 250))
         gc.render_component(plot)
         actual = gc.bmp_array[:, :, :]
-        self.assertFalse(alltrue(actual == 255))
+        self.assertFalse(np.all(actual == 255))
 
     def test_segment_plot_color_width(self):
         x = arange(10)
@@ -94,7 +95,7 @@ def test_segment_plot_color_width(self):
         gc = PlotGraphicsContext((250, 250))
         gc.render_component(plot)
         actual = gc.bmp_array[:, :, :]
-        self.assertFalse(alltrue(actual == 255))
+        self.assertFalse(np.all(actual == 255))
 
     def test_segment_plot_map_screen(self):
         x = arange(10)
@@ -120,7 +121,7 @@ def test_text_plot(self):
         gc = PlotGraphicsContext((250, 250))
         gc.render_component(plot)
         actual = gc.bmp_array[:, :, :]
-        self.assertFalse(alltrue(actual == 255))
+        self.assertFalse(np.all(actual == 255))
 
     def check_map_screen(self, renderer):
         arr = arange(10)

chaco/tests/test_speedups.py

@@ -10,15 +10,16 @@
 
 import unittest
 
-from numpy import alltrue, array, ravel, zeros, isinf, linspace
+import numpy as np
+from numpy import array, ravel, zeros, isinf, linspace
 
 
 def assert_close(desired, actual):
     diff_allowed = 1e-5
     diff = abs(ravel(actual) - ravel(desired))
     for d in diff:
         if not isinf(d):
-            assert alltrue(d <= diff_allowed)
+            assert np.all(d <= diff_allowed)
             return