Remove references to deprecated NumPy type aliases.

This change replaces references to a number of deprecated NumPy
type aliases (np.bool, np.int, np.float, np.complex, np.object,
np.str) with their recommended replacement (bool, int, float,
complex, object, str).

Those types were deprecated in 1.20 and are removed in 1.24,
cf https://github.com/numpy/numpy/pull/22607.

diff --git a/modules/dnn/test/pascal_semsegm_test_fcn.py b/modules/dnn/test/pascal_semsegm_test_fcn.py
index 1c8407a79d6614ac5888a55eb353193fb5f4c348..d79f6be13bb7d4ce20f750f133328e2e482f09cb 100644 (file)
--- a/modules/dnn/test/pascal_semsegm_test_fcn.py
+++ b/modules/dnn/test/pascal_semsegm_test_fcn.py
@@ -32,7 +32,7 @@ def eval_segm_result(net_out):
     channels_dim = 1
     y_dim = channels_dim + 1
     x_dim = y_dim + 1
-    res = np.zeros(net_out.shape).astype(np.int)
+    res = np.zeros(net_out.shape).astype(int)
     for i in range(net_out.shape[y_dim]):
         for j in range(net_out.shape[x_dim]):
             max_ch = np.argmax(net_out[..., i, j])
@@ -88,7 +88,7 @@ class DatasetImageFetch(object):
     @staticmethod
     def color_to_gt(color_img, colors):
         num_classes = len(colors)
-        gt = np.zeros((num_classes, color_img.shape[0], color_img.shape[1])).astype(np.int)
+        gt = np.zeros((num_classes, color_img.shape[0], color_img.shape[1])).astype(int)
         for img_y in range(color_img.shape[0]):
             for img_x in range(color_img.shape[1]):
                 c = DatasetImageFetch.pix_to_c(color_img[img_y][img_x])

diff --git a/modules/python/test/test_misc.py b/modules/python/test/test_misc.py
index f0c184e390d371977a3ac93f9e06523e240377c7..765201e9732a8d043486d1f52191de7731c8678d 100644 (file)
--- a/modules/python/test/test_misc.py
+++ b/modules/python/test/test_misc.py
@@ -211,8 +211,8 @@ class Arguments(NewOpenCVTests):
 
     def test_parse_to_bool_convertible(self):
         try_to_convert = partial(self._try_to_convert, cv.utils.dumpBool)
-        for convertible_true in (True, 1, 64, np.bool(1), np.int8(123), np.int16(11), np.int32(2),
-                                 np.int64(1), np.bool_(3), np.bool8(12)):
+        for convertible_true in (True, 1, 64, np.int8(123), np.int16(11), np.int32(2),
+                                 np.int64(1), np.bool_(12)):
             actual = try_to_convert(convertible_true)
             self.assertEqual('bool: true', actual,
                              msg=get_conversion_error_msg(convertible_true, 'bool: true', actual))
@@ -223,8 +223,8 @@ class Arguments(NewOpenCVTests):
                              msg=get_conversion_error_msg(convertible_false, 'bool: false', actual))
 
     def test_parse_to_bool_not_convertible(self):
-        for not_convertible in (1.2, np.float(2.3), 's', 'str', (1, 2), [1, 2], complex(1, 1),
-                                complex(imag=2), complex(1.1), np.array([1, 0], dtype=np.bool)):
+        for not_convertible in (1.2, np.float32(2.3), 's', 'str', (1, 2), [1, 2], complex(1, 1),
+                                complex(imag=2), complex(1.1), np.array([1, 0], dtype=bool)):
             with self.assertRaises((TypeError, OverflowError),
                                    msg=get_no_exception_msg(not_convertible)):
                 _ = cv.utils.dumpBool(not_convertible)
@@ -238,7 +238,7 @@ class Arguments(NewOpenCVTests):
                              msg=get_conversion_error_msg(convertible_true, 'bool: true', actual))
 
     def test_parse_to_bool_not_convertible_extra(self):
-        for not_convertible in (np.array([False]), np.array([True], dtype=np.bool)):
+        for not_convertible in (np.array([False]), np.array([True])):
             with self.assertRaises((TypeError, OverflowError),
                                    msg=get_no_exception_msg(not_convertible)):
                 _ = cv.utils.dumpBool(not_convertible)
@@ -255,7 +255,7 @@ class Arguments(NewOpenCVTests):
 
     def test_parse_to_int_not_convertible(self):
         min_int, max_int = get_limits(ctypes.c_int)
-        for not_convertible in (1.2, np.float(4), float(3), np.double(45), 's', 'str',
+        for not_convertible in (1.2, float(3), np.float32(4), np.double(45), 's', 'str',
                                 np.array([1, 2]), (1,), [1, 2], min_int - 1, max_int + 1,
                                 complex(1, 1), complex(imag=2), complex(1.1)):
             with self.assertRaises((TypeError, OverflowError, ValueError),
@@ -265,7 +265,7 @@ class Arguments(NewOpenCVTests):
     def test_parse_to_int_not_convertible_extra(self):
         for not_convertible in (np.bool_(True), True, False, np.float32(2.3),
                                 np.array([3, ], dtype=int), np.array([-2, ], dtype=np.int32),
-                                np.array([1, ], dtype=np.int), np.array([11, ], dtype=np.uint8)):
+                                np.array([11, ], dtype=np.uint8)):
             with self.assertRaises((TypeError, OverflowError),
                                    msg=get_no_exception_msg(not_convertible)):
                 _ = cv.utils.dumpInt(not_convertible)
@@ -282,12 +282,11 @@ class Arguments(NewOpenCVTests):
 
     def test_parse_to_int64_not_convertible(self):
         min_int64, max_int64 = get_limits(ctypes.c_longlong)
-        for not_convertible in (1.2, np.float(4), float(3), np.double(45), 's', 'str',
+        for not_convertible in (1.2, np.float32(4), float(3), np.double(45), 's', 'str',
                                 np.array([1, 2]), (1,), [1, 2], min_int64 - 1, max_int64 + 1,
                                 complex(1, 1), complex(imag=2), complex(1.1), np.bool_(True),
                                 True, False, np.float32(2.3), np.array([3, ], dtype=int),
-                                np.array([-2, ], dtype=np.int32), np.array([1, ], dtype=np.int),
-                                np.array([11, ], dtype=np.uint8)):
+                                np.array([-2, ], dtype=np.int32), np.array([11, ], dtype=np.uint8)):
             with self.assertRaises((TypeError, OverflowError, ValueError),
                                    msg=get_no_exception_msg(not_convertible)):
                 _ = cv.utils.dumpInt64(not_convertible)
@@ -305,7 +304,7 @@ class Arguments(NewOpenCVTests):
 
     def test_parse_to_size_t_not_convertible(self):
         min_long, _ = get_limits(ctypes.c_long)
-        for not_convertible in (1.2, True, False, np.bool_(True), np.float(4), float(3),
+        for not_convertible in (1.2, True, False, np.bool_(True), np.float32(4), float(3),
                                 np.double(45), 's', 'str', np.array([1, 2]), (1,), [1, 2],
                                 np.float64(6), complex(1, 1), complex(imag=2), complex(1.1),
                                 -1, min_long, np.int8(-35)):
@@ -331,7 +330,7 @@ class Arguments(NewOpenCVTests):
     def test_parse_to_float_convertible(self):
         try_to_convert = partial(self._try_to_convert, cv.utils.dumpFloat)
         min_float, max_float = get_limits(ctypes.c_float)
-        for convertible in (2, -13, 1.24, float(32), np.float(32.45), np.double(12.23),
+        for convertible in (2, -13, 1.24, np.float32(32.45), float(32), np.double(12.23),
                             np.float32(-12.3), np.float64(3.22), np.float_(-1.5), min_float,
                             max_float, np.inf, -np.inf, float('Inf'), -float('Inf'),
                             np.double(np.inf), np.double(-np.inf), np.double(float('Inf')),
@@ -357,7 +356,7 @@ class Arguments(NewOpenCVTests):
                              msg=get_conversion_error_msg(inf, expected, actual))
 
     def test_parse_to_float_not_convertible(self):
-        for not_convertible in ('s', 'str', (12,), [1, 2], np.array([1, 2], dtype=np.float),
+        for not_convertible in ('s', 'str', (12,), [1, 2], np.array([1, 2], dtype=float),
                                 np.array([1, 2], dtype=np.double), complex(1, 1), complex(imag=2),
                                 complex(1.1)):
             with self.assertRaises((TypeError), msg=get_no_exception_msg(not_convertible)):
@@ -366,7 +365,7 @@ class Arguments(NewOpenCVTests):
     def test_parse_to_float_not_convertible_extra(self):
         for not_convertible in (np.bool_(False), True, False, np.array([123, ], dtype=int),
                                 np.array([1., ]), np.array([False]),
-                                np.array([True], dtype=np.bool)):
+                                np.array([True])):
             with self.assertRaises((TypeError, OverflowError),
                                    msg=get_no_exception_msg(not_convertible)):
                 _ = cv.utils.dumpFloat(not_convertible)
@@ -375,7 +374,7 @@ class Arguments(NewOpenCVTests):
         try_to_convert = partial(self._try_to_convert, cv.utils.dumpDouble)
         min_float, max_float = get_limits(ctypes.c_float)
         min_double, max_double = get_limits(ctypes.c_double)
-        for convertible in (2, -13, 1.24, np.float(32.45), float(2), np.double(12.23),
+        for convertible in (2, -13, 1.24, np.float32(32.45), float(2), np.double(12.23),
                             np.float32(-12.3), np.float64(3.22), np.float_(-1.5), min_float,
                             max_float, min_double, max_double, np.inf, -np.inf, float('Inf'),
                             -float('Inf'), np.double(np.inf), np.double(-np.inf),
@@ -394,7 +393,7 @@ class Arguments(NewOpenCVTests):
                           "Actual: {}".format(type(nan).__name__, actual))
 
     def test_parse_to_double_not_convertible(self):
-        for not_convertible in ('s', 'str', (12,), [1, 2], np.array([1, 2], dtype=np.float),
+        for not_convertible in ('s', 'str', (12,), [1, 2], np.array([1, 2], dtype=np.float32),
                                 np.array([1, 2], dtype=np.double), complex(1, 1), complex(imag=2),
                                 complex(1.1)):
             with self.assertRaises((TypeError), msg=get_no_exception_msg(not_convertible)):
@@ -403,14 +402,14 @@ class Arguments(NewOpenCVTests):
     def test_parse_to_double_not_convertible_extra(self):
         for not_convertible in (np.bool_(False), True, False, np.array([123, ], dtype=int),
                                 np.array([1., ]), np.array([False]),
-                                np.array([12.4], dtype=np.double), np.array([True], dtype=np.bool)):
+                                np.array([12.4], dtype=np.double), np.array([True])):
             with self.assertRaises((TypeError, OverflowError),
                                    msg=get_no_exception_msg(not_convertible)):
                 _ = cv.utils.dumpDouble(not_convertible)
 
     def test_parse_to_cstring_convertible(self):
         try_to_convert = partial(self._try_to_convert, cv.utils.dumpCString)
-        for convertible in ('', 's', 'str', str(123), ('char'), np.str('test1'), np.str_('test2')):
+        for convertible in ('', 's', 'str', str(123), ('char'), np.str_('test2')):
             expected = 'string: ' + convertible
             actual = try_to_convert(convertible)
             self.assertEqual(expected, actual,
@@ -424,7 +423,7 @@ class Arguments(NewOpenCVTests):
 
     def test_parse_to_string_convertible(self):
         try_to_convert = partial(self._try_to_convert, cv.utils.dumpString)
-        for convertible in (None, '', 's', 'str', str(123), np.str('test1'), np.str_('test2')):
+        for convertible in (None, '', 's', 'str', str(123), np.str_('test2')):
             expected = 'string: ' + (convertible if convertible else '')
             actual = try_to_convert(convertible)
             self.assertEqual(expected, actual,
@@ -546,12 +545,12 @@ class Arguments(NewOpenCVTests):
 
     def test_parse_vector_int_not_convertible(self):
         np.random.seed(123098765)
-        arr = np.random.randint(-20, 20, 40).astype(np.float).reshape(10, 2, 2)
+        arr = np.random.randint(-20, 20, 40).astype(np.float32).reshape(10, 2, 2)
         int_min, int_max = get_limits(ctypes.c_int)
         test_dict = {1: 2, 3: 10, 10: 20}
         for not_convertible in ((int_min, 1, 2.5, 3, int_max), [True, 50], 'test', test_dict,
                                 reversed([1, 2, 3]),
-                                np.array([int_min, -10, 24, [1, 2]], dtype=np.object),
+                                np.array([int_min, -10, 24, [1, 2]], dtype=object),
                                 np.array([[1, 2], [3, 4]]), arr[:, 0, 1],):
             with self.assertRaises(TypeError, msg=get_no_exception_msg(not_convertible)):
                 _ = cv.utils.dumpVectorOfInt(not_convertible)
@@ -563,7 +562,7 @@ class Arguments(NewOpenCVTests):
         for convertible in ((1, 2.12, 3.5), [40, 50], tuple(),
                             np.array([-10, 24], dtype=np.int32),
                             np.array([-12.5, 1.4], dtype=np.double),
-                            np.array([10, 230, 12], dtype=np.float), arr[:, 0, 1], ):
+                            np.array([10, 230, 12], dtype=np.float32), arr[:, 0, 1], ):
             expected = "[" + ", ".join(map(lambda v: "{:.2f}".format(v), convertible)) + "]"
             actual = try_to_convert(convertible)
             self.assertEqual(expected, actual,
@@ -572,7 +571,7 @@ class Arguments(NewOpenCVTests):
     def test_parse_vector_double_not_convertible(self):
         test_dict = {1: 2, 3: 10, 10: 20}
         for not_convertible in (('t', 'e', 's', 't'), [True, 50.55], 'test', test_dict,
-                                np.array([-10.1, 24.5, [1, 2]], dtype=np.object),
+                                np.array([-10.1, 24.5, [1, 2]], dtype=object),
                                 np.array([[1, 2], [3, 4]]),):
             with self.assertRaises(TypeError, msg=get_no_exception_msg(not_convertible)):
                 _ = cv.utils.dumpVectorOfDouble(not_convertible)
@@ -584,7 +583,7 @@ class Arguments(NewOpenCVTests):
         arr_of_rect_cast = np.random.randint(10, 40, 4 * 5).astype(np.uint8).reshape(5, 4)
         for convertible in (((1, 2, 3, 4), (10, -20, 30, 10)), arr_of_rect_int32, arr_of_rect_cast,
                             arr_of_rect_int32.astype(np.int8), [[5, 3, 1, 4]],
-                            ((np.int8(4), np.uint8(10), np.int(32), np.int16(55)),)):
+                            ((np.int8(4), np.uint8(10), int(32), np.int16(55)),)):
             expected = "[" + ", ".join(map(lambda v: "[x={}, y={}, w={}, h={}]".format(*v), convertible)) + "]"
             actual = try_to_convert(convertible)
             self.assertEqual(expected, actual,
@@ -592,10 +591,10 @@ class Arguments(NewOpenCVTests):
 
     def test_parse_vector_rect_not_convertible(self):
         np.random.seed(1238765)
-        arr = np.random.randint(5, 20, 4 * 3).astype(np.float).reshape(3, 4)
+        arr = np.random.randint(5, 20, 4 * 3).astype(np.float32).reshape(3, 4)
         for not_convertible in (((1, 2, 3, 4), (10.5, -20, 30.1, 10)), arr,
                                 [[5, 3, 1, 4], []],
-                                ((np.float(4), np.uint8(10), np.int(32), np.int16(55)),)):
+                                ((float(4), np.uint8(10), int(32), np.int16(55)),)):
             with self.assertRaises(TypeError, msg=get_no_exception_msg(not_convertible)):
                 _ = cv.utils.dumpVectorOfRect(not_convertible)
 

diff --git a/modules/python/test/tst_scene_render.py b/modules/python/test/tst_scene_render.py
index 2dd6309ce1a3ab0d23081bffa4830bf90a32064d..33fef512e936c02a870819f4b4c266b421d199e8 100644 (file)
--- a/modules/python/test/tst_scene_render.py
+++ b/modules/python/test/tst_scene_render.py
@@ -85,7 +85,7 @@ class TestSceneRender():
             img[self.currentCenter[0]:self.currentCenter[0]+self.foreground.shape[0],
              self.currentCenter[1]:self.currentCenter[1]+self.foreground.shape[1]] = self.foreground
         else:
-            self.currentRect = self.initialRect + np.int( 30*cos(self.time) + 50*sin(self.time/3))
+            self.currentRect = self.initialRect + int( 30*cos(self.time) + 50*sin(self.time/3))
             if self.deformation:
                 self.currentRect[1:3] += int(self.h/20*cos(self.time))
             cv.fillConvexPoly(img, self.currentRect, (0, 0, 255))