mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-10 19:24:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #23969 from asmorkalov:as/python2_test_fix

Browse Source 
Fixed tests execution with Python 2.7
This commit is contained in:
Alexander Smorkalov 2023-07-11 20:53:01 +03:00 committed by GitHub
commit 53af876999
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/python/src2/cv2_util.hpp
View File

@ -71,7 +71,7 @@ public:
} }
operator bool() { operator bool() {
return static_cast<bool>(obj_); return obj_ != nullptr;
} }
PyObject* release() PyObject* release()

5
modules/python/test/test_misc.py
View File

@ -223,6 +223,11 @@ 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)
if sys.version_info[0] < 3:
self.assertRaisesRegexp(
Exception, msg, cv.utils.dumpInputArray, test_array
)
else:
self.assertRaisesRegex( self.assertRaisesRegex(
Exception, msg, cv.utils.dumpInputArray, test_array Exception, msg, cv.utils.dumpInputArray, test_array
) )