potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

Fixed tests execution with Python 2.7

Browse Source
This commit is contained in:
Alexander Smorkalov
2023-07-11 16:49:11 +03:00
parent 37aa823112
commit 48c52c8bbb
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/python/src2/cv2_util.hpp
+1 -1
View File
@@ -71,7 +71,7 @@ public:
} }
operator bool() { operator bool() {
return static_cast<bool>(obj_); return obj_ != nullptr;
} }
PyObject* release() PyObject* release()
modules/python/test/test_misc.py
+8 -3
View File
@@ -223,9 +223,14 @@ class Arguments(NewOpenCVTests):
for dtype in (object, str, np.complex128): for dtype in (object, str, np.complex128):
test_array = np.zeros((4, 4, 3), dtype=dtype) test_array = np.zeros((4, 4, 3), dtype=dtype)
msg = ".*type = {} is not supported".format(test_array.dtype) msg = ".*type = {} is not supported".format(test_array.dtype)
self.assertRaisesRegex( if sys.version_info[0] < 3:
Exception, msg, cv.utils.dumpInputArray, test_array self.assertRaisesRegexp(
) Exception, msg, cv.utils.dumpInputArray, test_array
)
else:
self.assertRaisesRegex(
Exception, msg, cv.utils.dumpInputArray, test_array
)
def test_20968(self): def test_20968(self):
pixel = np.uint8([[[40, 50, 200]]]) pixel = np.uint8([[[40, 50, 200]]])