Merge pull request #1406 from DominiqueDevinci/contrib

SWIG Python : bug fixes related to the internal object type

Author: jan-cerny

swig/openscap_api.py

@@ -56,6 +56,13 @@ def _import_helper():
 
 import os
 
+
+def extract_type_from_obj(obj):
+    # Extract the name of structure from the representation of the object
+    # "<Swig Object of type 'struct xccdf_result_iterator *' at 0x7f8f65fc1390>"
+    # or "<Swig Object of type 'oval_agent_session_t *' at 0x7f9aa2cdf360>"
+    return re.findall(r"type '(struct )?(\b\S*\b)", obj.__repr__())[0][1]
+
 class OSCAP_List(list):
     """OSCAP List class is designed to store lists generated from openscap iterators. All functions that return iterators
     are preprocessed by creation of OSCAP List instance and move all objects given by oscap list iteration loop to list.
@@ -136,10 +143,7 @@ def __init__(self, object, instance=None):
     @staticmethod
     def new(retobj):
         if type(retobj).__name__ in ('SwigPyObject', 'PySwigObject'):
-            # Extract the name of structure from the representation of the object
-            # "<Swig Object of type 'struct xccdf_result_iterator *' at 0x7f8f65fc1390>"
-            structure = re.findall(r"type 'struct (\b\S*\b)", retobj.__repr__())[0]
-            return OSCAP_Object(structure, retobj)
+            return OSCAP_Object(extract_type_from_obj(retobj), retobj)
         else:
             return retobj
 
@@ -320,8 +324,10 @@ def free(self):
     def __start_callback(self, rule, obj):
         return obj[0](OSCAP_Object("xccdf_rule", rule), obj[1])
 
-    def __output_callback(self, rule_result, obj):
-        return obj[0](OSCAP_Object("xccdf_rule_result", rule_result), obj[1])
+    def __output_callback(self, result, obj):
+        # the returned object can be a rule_result or an oval_definition_result,
+        # so I extract the right name from the object repr.
+        return obj[0](OSCAP_Object(extract_type_from_obj(result), result), obj[1])
 
     def register_start_callback(self, cb, usr):
         if self.object != "xccdf_policy_model":