diff --git a/modules/python/src2/cv2.cpp b/modules/python/src2/cv2.cpp index 306559f0e3..2a19611344 100644 --- a/modules/python/src2/cv2.cpp +++ b/modules/python/src2/cv2.cpp @@ -255,9 +255,18 @@ static bool init_submodule(PyObject * root, const char * name, PyMethodDef * met } // populate module's dict PyObject * d = PyModule_GetDict(submodule); + PySafeObject module_name(PyString_FromString(name)); + if (!module_name) + { + return false; + } for (PyMethodDef * m = methods; m->ml_name != NULL; ++m) { - PyObject * method_obj = PyCFunction_NewEx(m, NULL, NULL); + PyObject * method_obj = PyCFunction_NewEx(m, NULL, module_name); + if (!method_obj) + { + return false; + } if (PyDict_SetItemString(d, m->ml_name, method_obj) < 0) { PyErr_Format(PyExc_ImportError, diff --git a/modules/python/test/test_misc.py b/modules/python/test/test_misc.py index da2f9a448d..7a36870c9b 100644 --- a/modules/python/test/test_misc.py +++ b/modules/python/test/test_misc.py @@ -795,6 +795,23 @@ class Arguments(NewOpenCVTests): self.assertTrue(isinstance(rr, tuple), msg=type(rrv)) self.assertEqual(len(rr), 3) + def test_function_module_issue_19349(self): + self.assertEqual(cv.GaussianBlur.__module__, "cv2") + self.assertEqual(str(cv.GaussianBlur), "") + + def test_function_module(self): + import inspect + import pickle + + for module, function in ((cv, cv.GaussianBlur), + (cv.utils, cv.utils.dumpInputArray), + (cv.utils.nested, cv.utils.nested.testEchoBooleanFunction)): + self.assertEqual(function.__module__, module.__name__) + self.assertIs(inspect.getmodule(function), module) + self.assertTrue(inspect.isbuiltin(function)) + self.assertIsNone(function.__self__) + self.assertIs(pickle.loads(pickle.dumps(function)), function) + def test_nested_function_availability(self): self.assertTrue(hasattr(cv.utils, "nested"), msg="Module is not generated for nested namespace")