Merge pull request #3769 from adamgreig:fix-py3-submodules

133bd564 · Vadim Pisarevsky · 18904036 · 211a1313 · 133bd564
Commit 133bd564 authored Mar 13, 2015 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

cv2.cpp modules/python/src2/cv2.cpp +3 -1

No files found.
--- a/modules/python/src2/cv2.cpp
+++ b/modules/python/src2/cv2.cpp
@@ -1235,7 +1235,9 @@ static void init_submodule(PyObject * root, const char * name, PyMethodDef * met
        submod = PyImport_AddModule(full_name.c_str());
        PyDict_SetItemString(d, short_name.c_str(), submod);
    }
-    root = submod;
+
+    if (short_name != "")
+        root = submod;
  }

  // populate module's dict