Merge topic '15298_fix_exporters_in_python' into next

d5f00b2 BUG #15298. Fixes exporters in Python.

Author: utkarshayachit

Wrapping/Python/paraview/servermanager.py

@@ -2423,7 +2423,20 @@ def _getPyProxy(smproxy, outputPort=0):
     if classForProxy:
         retVal = classForProxy(proxy=smproxy, port=outputPort)
     else:
-        retVal = Proxy(proxy=smproxy, port=outputPort)
+        # Since the class for this proxy, doesn't exist yet, we attempt to
+        # create a new class definition for it, if possible and then add it
+        # to the "misc" module. This is essential since the Python property
+        # variables for a proxy are only setup whne the Proxy class is created
+        # (in _createClass).
+        # NOTE: _createClass() takes the xml group and name, not the xml label,
+        # hence we don't pass xmlName variable.
+        classForProxy = _createClass(smproxy.GetXMLGroup(), smproxy.GetXMLName())
+        if classForProxy:
+            global misc
+            misc.__dict__[classForProxy.__name__] = classForProxy
+            retVal = classForProxy(proxy=smproxy, port=outputPort)
+        else:
+            retVal = Proxy(proxy=smproxy, port=outputPort)
     return retVal
 
 def _makeUpdateCameraMethod(rv):
@@ -2582,6 +2595,65 @@ class PVModule(object):
 def _make_name_valid(name):
     return paraview.make_name_valid(name)
 
+def _createClass(groupName, proxyName, apxm=None):
+    """Defines a new class type for the proxy."""
+    global ActiveConnection
+    pxm = ProxyManager() if not apxm else apxm
+    proto = pxm.GetPrototypeProxy(groupName, proxyName)
+    if not proto:
+       paraview.print_error("Error while loading %s/%s %s"%(groupName, i['group'], proxyName))
+       return None
+    pname = proxyName
+    if paraview.compatibility.GetVersion() >= 3.5 and proto.GetXMLLabel():
+        pname = proto.GetXMLLabel()
+    pname = _make_name_valid(pname)
+    if not pname:
+        return None
+    cdict = {}
+    # Create an Initialize() method for this sub-class.
+    cdict['Initialize'] = _createInitialize(groupName, proxyName)
+    iter = PropertyIterator(proto)
+    # Add all properties as python properties.
+    for prop in iter:
+        propName = iter.GetKey()
+        if paraview.compatibility.GetVersion() >= 3.5:
+            if (prop.GetInformationOnly() and propName != "TimestepValues" ) \
+              or prop.GetIsInternal():
+                continue
+        names = [propName]
+        if paraview.compatibility.GetVersion() >= 3.5:
+            names = [iter.PropertyLabel]
+
+        propDoc = None
+        if prop.GetDocumentation():
+            propDoc = prop.GetDocumentation().GetDescription()
+        for name in names:
+            name = _make_name_valid(name)
+            if name:
+                cdict[name] = property(_createGetProperty(propName),
+                                       _createSetProperty(propName),
+                                       None,
+                                       propDoc)
+    # Add the documentation as the class __doc__
+    if proto.GetDocumentation() and \
+       proto.GetDocumentation().GetDescription():
+        doc = proto.GetDocumentation().GetDescription()
+    else:
+        doc = Proxy.__doc__
+    cdict['__doc__'] = doc
+    # Create the new type
+    if proto.GetXMLName() == "ExodusIIReader":
+        superclasses = (ExodusIIReaderProxy,)
+    elif proto.IsA("vtkSMSourceProxy"):
+        superclasses = (SourceProxy,)
+    elif proto.IsA("vtkSMViewLayoutProxy"):
+        superclasses = (ViewLayoutProxy,)
+    else:
+        superclasses = (Proxy,)
+
+    cobj = type(pname, superclasses, cdict)
+    return cobj
+
 def createModule(groupName, mdl=None):
     """Populates a module with proxy classes defined in the given group.
     If mdl is not specified, it also creates the module"""
@@ -2601,65 +2673,16 @@ def createModule(groupName, mdl=None):
     definitionIter = pxm.NewDefinitionIterator(groupName)
     for i in definitionIter:
         proxyName = i['key']
-        proto = pxm.GetPrototypeProxy(groupName, proxyName)
-        if not proto:
-           paraview.print_error("Error while loading %s/%s %s"%(groupName, i['group'], proxyName))
-           continue
-        pname = proxyName
-        if paraview.compatibility.GetVersion() >= 3.5 and\
-           proto.GetXMLLabel():
-            pname = proto.GetXMLLabel()
-        pname = _make_name_valid(pname)
-        if not pname:
-            continue
-        if pname in mdl.__dict__:
-            if debug:
-                paraview.print_warning("Warning: %s is being overwritten. This may point to an issue in the ParaView configuration files" % pname)
-        cdict = {}
-        # Create an Initialize() method for this sub-class.
-        cdict['Initialize'] = _createInitialize(groupName, proxyName)
-        iter = PropertyIterator(proto)
-        # Add all properties as python properties.
-        for prop in iter:
-            propName = iter.GetKey()
-            if paraview.compatibility.GetVersion() >= 3.5:
-                if (prop.GetInformationOnly() and propName != "TimestepValues" ) \
-                  or prop.GetIsInternal():
-                    continue
-            names = [propName]
-            if paraview.compatibility.GetVersion() >= 3.5:
-                names = [iter.PropertyLabel]
-
-            propDoc = None
-            if prop.GetDocumentation():
-                propDoc = prop.GetDocumentation().GetDescription()
-            for name in names:
-                name = _make_name_valid(name)
-                if name:
-                    cdict[name] = property(_createGetProperty(propName),
-                                           _createSetProperty(propName),
-                                           None,
-                                           propDoc)
-        # Add the documentation as the class __doc__
-        if proto.GetDocumentation() and \
-           proto.GetDocumentation().GetDescription():
-            doc = proto.GetDocumentation().GetDescription()
-        else:
-            doc = Proxy.__doc__
-        cdict['__doc__'] = doc
-        # Create the new type
-        if proto.GetXMLName() == "ExodusIIReader":
-            superclasses = (ExodusIIReaderProxy,)
-        elif proto.IsA("vtkSMSourceProxy"):
-            superclasses = (SourceProxy,)
-        elif proto.IsA("vtkSMViewLayoutProxy"):
-            superclasses = (ViewLayoutProxy,)
-        else:
-            superclasses = (Proxy,)
-
-        cobj = type(pname, superclasses, cdict)
-        # Add it to the modules dictionary
-        mdl.__dict__[pname] = cobj
+        cobj = _createClass(groupName, proxyName, apxm=pxm)
+        if cobj:
+            pname = cobj.__name__
+            if pname in mdl.__dict__ and debug:
+                paraview.print_warning(\
+                        "Warning: %s is being overwritten."\
+                        " This may point to an issue in the ParaView configuration files"\
+                        % pname)
+            # Add it to the modules dictionary
+            mdl.__dict__[pname] = cobj
     return mdl