Fix incomplete ctype-pytype conversion

ddacw · ddacw · commit c0661ad8ca90 · 2021-07-13T18:21:36.000+02:00
diff --git a/modules/python/src2/gen2.py b/modules/python/src2/gen2.py
@@ -452,7 +452,9 @@ def normalize_ctype_name(typename):
     for prefix_to_remove in PREFIXES_TO_REMOVE:
         if typename.startswith(prefix_to_remove):
             typename = typename[len(prefix_to_remove):]
-    return typename.replace("::", "_")
+    if typename.endswith('&'):
+        typename = typename[:-1]
+    return typename.strip()
 
 
 def is_tuple(typename):
@@ -482,10 +484,17 @@ def get_template_instantiation_type(typename):
 
 
 def convert_ctype_name_to_pytype_name(typename, classnames):
-    typename = normalize_ctype_name(typename)
+    typename = normalize_ctype_name(typename.strip())
     pytype = CTYPE_TO_PYTYPE_MAP.get(typename)
     if pytype is not None:
         return pytype
+
+    # GAPI types
+    if typename.startswith("GArray_") or typename.startswith("GArray<"):
+        return "GArray"
+    if typename.startswith("GOpaque_") or typename.startswith("GOpaque<"):
+        return "GOpaque"
+
     if is_sequence_type(typename):
         if is_template_class_instantiation(typename):
             sequence_pytype = convert_ctype_name_to_pytype_name(
@@ -517,7 +526,7 @@ def convert_ctype_name_to_pytype_name(typename, classnames):
     for classname in classnames:
         if classname.endswith('_' + typename):
             return classname
-    return typename
+    return typename.replace("::", "_")
 
 
 def get_named_params_info(all_classes, args):
