Ticket #47762: mayavi_vtk62_191.diff

tvtk/common.py

@@ -11 +11 @@
 import vtk
 
 vtk_major_version = vtk.vtkVersion.GetVTKMajorVersion()
+vtk_minor_version = vtk.vtkVersion.GetVTKMinorVersion()
 
 ######################################################################
 # Utility functions.
@@ -46 +47 @@
 def is_old_pipeline():
     return vtk_major_version < 6
 
+def is_version_62():
+    return vtk_major_version == 6 and vtk_minor_version == 2
+
 def configure_connection(obj, inp):
     """ Configure topology for vtk pipeline obj."""
     if hasattr(inp, 'output_port'):

tvtk/tests/test_vtk_parser.py

@@ -136 +136 @@
 
         res = ['BackfaceRender', 'DeepCopy', 'Render']
         if hasattr(obj, 'GetTexture'):
-            if vtk_major_version == 6 and vtk_minor_version >= 1:
+            if vtk_major_version == 6:
                 res = ['AddShaderVariable', 'BackfaceRender', 'DeepCopy',
-                       'ReleaseGraphicsResources', 'RemoveAllTextures', 'RemoveTexture',
-                       'Render']
+                       'ReleaseGraphicsResources', 'RemoveAllTextures', 
+                       'RemoveTexture', 'Render']
+                if vtk_minor_version == 2:
+                    res.append('VTKTextureUnit')
             else:
                 res = ['AddShaderVariable', 'BackfaceRender', 'DeepCopy',
                        'LoadMaterial', 'LoadMaterialFromString',

tvtk/vtk_parser.py

@@ -7 +7 @@
 # License: BSD Style.
 
 import re
+import types
 
 # Local imports (these are relative imports for a good reason).
 import class_tree
 import vtk_module as vtk
-
+from common import is_version_62
 
 class VTKMethodParser:
     """This class provides useful methods for parsing methods of a VTK
@@ -299 +300 @@
           A VTK method object.
 
         """
+        # VTK 6.2 false built in funcs/methods are ignored
+        if is_version_62():
+            built_in_func = isinstance(method, types.BuiltinFunctionType)
+            built_in_meth = isinstance(method, types.BuiltinMethodType)
+            if not (built_in_func or built_in_meth):
+                return None
         # Remove all the C++ function signatures.
         doc = method.__doc__
         doc = doc[:doc.find('\n\n')]

tvtk/wrapper_gen.py

@@ -16 +16 @@
 
 # Local imports (these are relative imports because the package is not
 # installed when these modules are imported).
-from common import get_tvtk_name, camel2enthought
+from common import get_tvtk_name, camel2enthought, is_version_62
 import vtk_parser
 import indenter
 import special_gen
@@ -744 +744 @@
             vtk_meth = getattr(klass, m)
             self._write_tvtk_method(out, vtk_meth)
 
+
     #################################################################
     # Private utility methods.
     #################################################################
@@ -1042 +1043 @@
           If None, this is computed.  If not, the passed signature
           information is used.
         """
-        if not sig:
+        if sig is None:
             sig = self.parser.get_method_signature(vtk_meth)
+        
+        # VTK 6.2: There exists no method signature for false built in
+        # functions/methods
+        if sig is None:
+            return
 
         # Figure out if we really need to wrap the return and deref
         # the args.