Merge topic 'python-py3k-tests'

aa4e0d02 Fix remaining py3k issues with vtk.tk module.
c7d7de28 Add a few other minor py3k test fixes.
ae48313c Fixing tests for Python3.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !522

CMake/vtkTestDriver.py

@@ -8,6 +8,8 @@ Usage:
                           --process ...
 """
 
+from __future__ import print_function
+
 import sys
 import subprocess
 import time
@@ -25,7 +27,7 @@ if prev <= len(sys.argv):
 
 procs = []
 for cmdlist in command_lists:
-    print >> sys.stderr, "Executing '", " ".join(cmdlist), "'"
+    print("Executing '", " ".join(cmdlist), "'", file=sys.stderr)
     proc = subprocess.Popen(cmdlist)
     procs.append(proc)
     # sleep to ensure that the process starts.
@@ -39,6 +41,6 @@ for proc in procs:
 
 for proc in procs:
     if proc.returncode != 0:
-        print >> sys.stderr, "ERROR: A process exited with error. Test will fail."
+        print("ERROR: A process exited with error. Test will fail.", file=sys.stderr)
         sys.exit(1) # error
-print "All's well!"
+print("All's well!")

Common/DataModel/Testing/Python/TestNumericArrayImageData.py

@@ -16,7 +16,7 @@ import sys
 try:
     import numpy.core.numeric as numeric
 except ImportError:
-    print "WARNING: This test requires Numeric Python: http://numpy.sf.net"
+    print("WARNING: This test requires Numeric Python: http://numpy.sf.net")
     sys.exit(0)
 
 import os

Common/DataModel/Testing/Python/TestTemplates.py

@@ -12,7 +12,12 @@ Created on May 29, 2011 by David Gobbi
 """
 
 import sys
-import exceptions
+try:
+    # for Python2
+    import exceptions
+except ImportError:
+    # In Python 3 standard exceptions were moved to builtin module.
+    pass
 import vtk
 from vtk.test import Testing
 
@@ -24,6 +29,12 @@ arrayCodes = ['c', 'b', 'B', 'h', 'H',
               'i', 'I', 'l', 'L', 'q', 'Q',
               'f', 'd']
 
+# create a unicode string for python 2 and python 3
+if sys.hexversion >= 0x03000000:
+    francois = 'Fran\xe7ois'
+else:
+    francois = unicode('Fran\xe7ois', 'latin1')
+
 class TestTemplates(Testing.vtkTest):
 
     def testDenseArray(self):
@@ -47,8 +58,13 @@ class TestTemplates(Testing.vtkTest):
                 a.SetValue(i, value)
                 result = a.GetValue(i)
                 self.assertEqual(value, result)
-            elif t in [str, 'str', 'unicode']:
-                value = unicode("hello")
+            elif t in [str, 'str']:
+                value = "hello"
+                a.SetValue(i, value)
+                result = a.GetValue(i)
+                self.assertEqual(value, result)
+            elif t in ['unicode']:
+                value = francois
                 a.SetValue(i, value)
                 result = a.GetValue(i)
                 self.assertEqual(value, result)
@@ -84,8 +100,13 @@ class TestTemplates(Testing.vtkTest):
                 a.SetValue(i, value)
                 result = a.GetValue(i)
                 self.assertEqual(value, result)
-            elif t in [str, 'str', 'unicode']:
-                value = unicode("hello")
+            elif t in [str, 'str']:
+                value = "hello"
+                a.SetValue(i, value)
+                result = a.GetValue(i)
+                self.assertEqual(value, result)
+            elif t in ['unicode']:
+                value = francois
                 a.SetValue(i, value)
                 result = a.GetValue(i)
                 self.assertEqual(value, result)

Filters/Core/Testing/Python/TestContourCases.py

@@ -6,7 +6,7 @@ from vtk.test import Testing
 try:
     import numpy as np
 except ImportError:
-    print "WARNING: This test requires Numeric Python: http://numpy.sf.net"
+    print("WARNING: This test requires Numeric Python: http://numpy.sf.net")
     sys.exit(0)
 
 def GenerateCell(cellType, points):

Filters/Core/Testing/Python/fieldToPolyData.py

@@ -86,4 +86,4 @@ try:
 #    iren.Start()
 
 except IOError:
-    print  "Couldn't open PolyField.vtk for writing."
+    print("Couldn't open PolyField.vtk for writing.")

Filters/Core/Testing/Python/fieldToRGrid.py

@@ -185,4 +185,4 @@ try:
 #    iren.Start()
 
 except IOError:
-    print  "Couldn't open RGridField.vtk for writing."
+    print("Couldn't open RGridField.vtk for writing.")

Filters/Core/Testing/Python/fieldToSGrid.py

@@ -142,4 +142,4 @@ try:
 #    iren.Start()
 
 except IOError:
-    print  "Couldn't open combsg.vtk or SGridField.vtk for writing."
+    print("Couldn't open combsg.vtk or SGridField.vtk for writing.")

Filters/Core/Testing/Python/fieldToUGrid.py

@@ -141,4 +141,4 @@ try:
 #    iren.Start()
 
 except IOError:
-    print  "Couldn't open UGridField.vtk for writing."
+    print("Couldn't open UGridField.vtk for writing.")

Filters/General/Testing/Python/tableBasedClip.py

@@ -79,7 +79,7 @@ class TestClip(Testing.vtkTest):
         nps = i.GetNumberOfPoints()
         ps = vtk.vtkPoints()
         ps.SetNumberOfPoints(nps)
-        for idx in xrange(nps):
+        for idx in range(nps):
             ps.SetPoint(idx, i.GetPoint(idx))
 
         st.SetPoints(ps)

Filters/Geometry/Testing/Python/TestGhostPoints.py

 import sys
-import exceptions
 import vtk
 from vtk.test import Testing
 

Filters/Geometry/Testing/Python/geomFilter.py

@@ -182,7 +182,7 @@ oa = pd.GetCellData().GetArray('testarray')
 correctcelldata = [1, 3, 0, 2]
 for i in range(4):
     if oa.GetValue(i) != correctcelldata[i]:
-        print 'Bad celldata of test array'
+        print('Bad celldata of test array')
         import sys
         sys.exit(1)
 # --- end of script --

Filters/Geometry/Testing/Python/structuredGridBlanking.py

@@ -15,9 +15,9 @@ sg.SetExtent(0,xlim,0,ylim,0,zlim)
 
 #a handy point iterator, calls action() on each point
 def forEachPoint(xlim,ylim,zlim, action):
-    for z in xrange(0,zlim+1):
-        for y in xrange(0,ylim+1):
-            for x in xrange(0,xlim+1):
+    for z in range(0,zlim+1):
+        for y in range(0,ylim+1):
+            for x in range(0,xlim+1):
                  action((x,y,z))
 
 #make geometry
@@ -44,7 +44,7 @@ if 64 < numcells:
     sg.BlankCell(64)
 if 164 < numcells:
     sg.BlankCell(164)
-for c in xrange(180,261):
+for c in range(180,261):
     if c < sg.GetNumberOfCells():
         sg.BlankCell(c)
 
@@ -53,9 +53,9 @@ dsf.SetInputData(sg)
 dsf.Update()
 nviscells = dsf.GetOutput().GetNumberOfCells()
 if nviscells != 356:
-    print "Problem"
-    print "Test expected 356 visible surface polygons but got", \
-          nviscells
+    print("Problem")
+    print("Test expected 356 visible surface polygons but got", \
+          nviscells)
     exit(-1)
 
 #render it so we can look at it

Filters/Hybrid/Testing/Python/TestProcrustesRigidCentroid.py

@@ -153,9 +153,9 @@ ren3.GetActiveCamera().SetPosition(1, -1, 0)
 ren3.ResetCamera()
 
 renWin.Render()
-print Actor1b.GetCenter()
-print Actor2b.GetCenter()
-print Actor3b.GetCenter()
+print(Actor1b.GetCenter())
+print(Actor2b.GetCenter())
+print(Actor3b.GetCenter())
 
 iren.Initialize()
 #iren.Start()

Filters/Modeling/Testing/Python/Hyper.py

@@ -54,7 +54,7 @@ try:
         pass
 
 except IOError:
-    print  "Unable to test the writer/reader."
+    print("Unable to test the writer/reader.")
     input = ptLoad.GetOutput()
 
 # Generate hyperstreamlines

Filters/Modeling/Testing/Python/TestSpherePuzzleArrows.py

@@ -44,7 +44,7 @@ def MotionCallback (x, y):
     ren1.SetDisplayPoint(x, y, z)
     ren1.DisplayToWorld()
     pt = ren1.GetWorldPoint()
-    print pt  ###############
+    print(pt)  ###############
     x = pt[0]
     y = pt[1]
     z = pt[2]

Filters/Sources/Testing/Python/squadViewer.py

@@ -7,20 +7,26 @@ from vtk.test import Testing
 from vtk.util.misc import vtkGetDataRoot
 VTK_DATA_ROOT = vtkGetDataRoot()
 
-import Tkinter
 from vtk.tk.vtkTkRenderWindowInteractor import vtkTkRenderWindowInteractor
 from vtk.tk.vtkTkRenderWidget import vtkTkRenderWidget
 
-# Tkinter constants.
-E = Tkinter.E
-W = Tkinter.W
-N = Tkinter.N
-S = Tkinter.S
-HORIZONTAL = Tkinter.HORIZONTAL
-RIGHT = Tkinter.RIGHT
-NO = Tkinter.NO
-NORMAL = Tkinter.NORMAL
-DISABLED = Tkinter.DISABLED
+if sys.hexversion < 0x03000000:
+    # for Python2
+    import Tkinter as tkinter
+else:
+    # for Python3
+    import tkinter
+
+# tkinter constants.
+E = tkinter.E
+W = tkinter.W
+N = tkinter.N
+S = tkinter.S
+HORIZONTAL = tkinter.HORIZONTAL
+RIGHT = tkinter.RIGHT
+NO = tkinter.NO
+NORMAL = tkinter.NORMAL
+DISABLED = tkinter.DISABLED
 
 class SuperQuadricViewer(Testing.vtkTest):
     '''
@@ -68,7 +74,7 @@ class SuperQuadricViewer(Testing.vtkTest):
                 scale.config(state=DISABLED, fg='gray')
             win.Render()
 
-        self.root = Tkinter.Tk()
+        self.root = tkinter.Tk()
         self.root.title("superquadric viewer")
         # Define what to do when the user explicitly closes a window.
         self.root.protocol("WM_DELETE_WINDOW", OnClosing)
@@ -80,23 +86,23 @@ class SuperQuadricViewer(Testing.vtkTest):
 
         # Create parameter sliders
         #
-        prs = Tkinter.Scale(self.root, from_=0, to=3.5, res=0.1,
+        prs = tkinter.Scale(self.root, from_=0, to=3.5, res=0.1,
                              orient=HORIZONTAL, label="phi roundness")
-        trs = Tkinter.Scale(self.root, from_=0, to=3.5, res=0.1,
+        trs = tkinter.Scale(self.root, from_=0, to=3.5, res=0.1,
                              orient=HORIZONTAL, label="theta roundness")
-        thicks = Tkinter.Scale(self.root, from_=0.01, to=1.0, res=0.01,
+        thicks = tkinter.Scale(self.root, from_=0.01, to=1.0, res=0.01,
                              orient=HORIZONTAL, label="thickness")
 
         # Create check buttons
         #
-        toroid = Tkinter.IntVar()
+        toroid = tkinter.IntVar()
         toroid.set(0)
-        doTexture = Tkinter.IntVar()
+        doTexture = tkinter.IntVar()
         doTexture.set(0)
 
-        rframe = Tkinter.Frame(self.root)
-        torbut = Tkinter.Checkbutton(rframe, text="Toroid", variable=toroid)
-        texbut = Tkinter.Checkbutton(rframe, text="Texture", variable=doTexture)
+        rframe = tkinter.Frame(self.root)
+        torbut = tkinter.Checkbutton(rframe, text="Toroid", variable=toroid)
+        texbut = tkinter.Checkbutton(rframe, text="Texture", variable=doTexture)
 
         # Put it all together
         #
@@ -108,7 +114,7 @@ class SuperQuadricViewer(Testing.vtkTest):
         thicks.grid(sticky=N+S+E+W, padx=10, ipady=5, row=1, column=1)
         prs.grid(sticky=N+E+W+S, padx=10, ipady=5, row = 2, column = 0)
         trs.grid(sticky=N+E+W+S, padx=10, ipady=5, row = 2, column = 1)
-        Tkinter.Pack.propagate(rframe,NO)
+        tkinter.Pack.propagate(rframe,NO)
 
         prs.set(1.0)
         trs.set(0.7)

Filters/Verdict/Testing/Python/MeshQuality.py

@@ -113,7 +113,7 @@ def main():
 
             res += '\n'
 
-        print res
+        print(res)
 
 if __name__ == '__main__':
      main()

IO/Core/Testing/Python/TestGlobFileNames.py

@@ -43,25 +43,25 @@ class TestGlobFileNames(vtk.test.Testing.vtkTest):
 
         if n != 93:
             for i in range(0, n):
-                print "File:", i, " ", fileNames.GetValue(i)
-            print "GetNumberOfValues should return 93, returned", n
+                print("File:", i, " ", fileNames.GetValue(i))
+            print("GetNumberOfValues should return 93, returned", n)
 
-            print"Listing of ", VTK_DATA_ROOT, "/Data/headsq"
+            print("Listing of ", VTK_DATA_ROOT, "/Data/headsq")
             directory = vtk.vtkDirectory()
             directory.Open(VTK_DATA_ROOT + "/Data/headsq")
             m = directory.GetNumberOfFiles()
             for j in range(0, m):
-                print directory.GetFile(j)
+                print(directory.GetFile(j))
             exit(1)
 
         for i in range(0, n):
             filename = fileNames.GetValue(i)
             if filename != globFileNames.GetNthFileName(i):
-                print "mismatched filename for pattern quarter.*:", filename
+                print("mismatched filename for pattern quarter.*:", filename)
                 exit(1)
             m = re.search("[\w|\W]*quarter.*", filename)
             if m == None:
-                print "string does not match pattern quarter.*:", filename
+                print("string does not match pattern quarter.*:", filename)
 
 
         # check that we can re-use the Glob object
@@ -75,15 +75,15 @@ class TestGlobFileNames(vtk.test.Testing.vtkTest):
             filename = fileNames.GetValue(i)
 
             if filename != globFileNames.GetNthFileName(i):
-                print "mismatched filename for pattern financial.*: ", filename
+                print("mismatched filename for pattern financial.*: ", filename)
                 exit(1)
 
             m = re.search("[\w|\W]*financial.*", filename)
             if m == None:
-                print "string does not match pattern financial.*:", filename
+                print("string does not match pattern financial.*:", filename)
                 exit(1)
 
         vtk.test.Testing.interact()
 
 if __name__ == "__main__":
-     vtk.test.Testing.main([(TestGlobFileNames, 'test')])
\ No newline at end of file
+     vtk.test.Testing.main([(TestGlobFileNames, 'test')])

IO/Core/Testing/Python/TestSortFileNames.py

@@ -47,8 +47,8 @@ class TestSortFileNames(vtk.test.Testing.vtkTest):
         sortFileNames.GroupingOn()
 
         if sortFileNames.GetNumberOfGroups() != 2:
-            print "GetNumberOfGroups returned incorrect number"
-            exit(1)
+             print("GetNumberOfGroups returned incorrect number")
+             exit(1)
 
         fileNames1 = sortFileNames.GetNthGroup(0)
         fileNames2 = sortFileNames.GetNthGroup(1)
@@ -59,33 +59,33 @@ class TestSortFileNames(vtk.test.Testing.vtkTest):
         n = fileNames1.GetNumberOfValues()
         if n != numberOfFiles1:
             for i in range(0, n):
-                print fileNames1.GetValue(i)
-            print "GetNumberOfValues should return", numberOfFiles1, "not", n
+                print(fileNames1.GetValue(i))
+            print("GetNumberOfValues should return", numberOfFiles1, "not", n)
             exit(1)
 
         for i in range(0, numberOfFiles1):
             j = i + 1
             s = VTK_DATA_ROOT + "/Data/headsq/quarter." + str(j)
             if fileNames1.GetValue(i) != s:
-                print "string does not match pattern"
-                print fileNames1.GetValue(i)
-                print s
+                print("string does not match pattern")
+                print(fileNames1.GetValue(i))
+                print(s)
                 exit(1)
 
         n = fileNames2.GetNumberOfValues()
         if n != numberOfFiles2:
             for i in range(0, n):
-                print fileNames2.GetValue(i)
-            print "GetNumberOfValues should return", numberOfFiles2, "not", n
+                print(fileNames2.GetValue(i))
+            print("GetNumberOfValues should return", numberOfFiles2, "not", n)
             exit(1)
 
         for i in range(0, numberOfFiles2):
             j = i + 1
             s = VTK_DATA_ROOT + "/Data/track" + str(j) + ".binary.vtk"
             if fileNames2.GetValue(i) != s:
-                print "string does not match pattern"
-                print fileNames2.GetValue(i)
-                print s
+                print("string does not match pattern")
+                print(fileNames2.GetValue(i))
+                print(s)
                 exit(1)
 
         vtk.test.Testing.interact()

IO/Exodus/Testing/Python/TestExodusPolyhedra.py

@@ -25,20 +25,20 @@ shr.SetInputData(rd2.GetOutput().GetBlock(0).GetBlock(0))
 shr.Update()
 
 ph = rdr.GetOutput().GetBlock(0).GetBlock(0).GetCell(0)
-print '%d polyhedral faces' % ph.GetNumberOfFaces()
+print('%d polyhedral faces' % ph.GetNumberOfFaces())
 if ph.GetNumberOfFaces() != 12:
   sys.exit(1)
 for i in range(ph.GetNumberOfFaces()):
   pg = ph.GetFace(i)
   if pg.GetNumberOfEdges() != 5 or pg.GetNumberOfPoints() != 5:
-    print '  %d edges on face %d' % (pg.GetNumberOfEdges(), i)
-    print '  %d points on face %d' % (pg.GetNumberOfPoints(), i)
+    print('  %d edges on face %d' % (pg.GetNumberOfEdges(), i))
+    print('  %d points on face %d' % (pg.GetNumberOfPoints(), i))
     sys.exit(1)
   #for j in range(pg.GetNumberOfPoints()):
   #  pid = pg.GetPointId(j)
   #  x = [0.0,0.0,0.0]
   #  pg.GetPoints().GetPoint(pid, x)
-  #  print '   p%02d: %g %g %g' % (pid, x[0], x[1], x[2]);
+  #  print('   p%02d: %g %g %g' % (pid, x[0], x[1], x[2]))
 
 renWin = vtkRenderWindow()
 ri = vtkRenderWindowInteractor()

IO/Exodus/Testing/Python/TestExodusWithNaN.py

@@ -16,5 +16,5 @@ data = rdr.GetOutput().GetBlock(0).GetBlock(0)
 # Test that this dataset with NaNs gets a correct range i.e. range without NaNs
 # in it.
 drange = data.GetPointData().GetArray("dist_from_origin").GetRange()[:]
-print "'dist_from_origin' Range: ", drange
+print("'dist_from_origin' Range: ", drange)
 assert (abs(drange[0] - 0.5) < 1e-3) and (abs(drange[1] - 1.118) < 1e-3)

IO/Geometry/Testing/Python/Plot3D.py

@@ -10,7 +10,7 @@ class TestPlot3D(Testing.vtkTest):
 
         for name in names:
             r = vtk.vtkMultiBlockPLOT3DReader()
-            print "Testing ", name[0], name[1]
+            print("Testing ", name[0], name[1])
             if name[0] == "multi-ascii.xyz":
                 r.BinaryFileOff()
                 r.MultiGridOn()
@@ -40,7 +40,7 @@ class TestPlot3D(Testing.vtkTest):
 
         for name in names:
             r = vtk.vtkMultiBlockPLOT3DReader()
-            print "Testing ", name[0]
+            print("Testing ", name[0])
             r.AutoDetectFormatOn()
             r.SetFileName(str(VTK_DATA_ROOT) + "/Data/" + name[0])
             r.SetQFileName(str(VTK_DATA_ROOT) + "/Data/" + name[1])

IO/Image/Testing/Python/TestImageJSONWriter.py

@@ -19,9 +19,9 @@ dim_ref = [value for value in output.GetDimensions()]
 origin_ref = [value for value in output.GetOrigin()]
 spacing_ref = [value for value in output.GetSpacing()]
 
-print dim_ref
-print origin_ref
-print spacing_ref
+print(dim_ref)
+print(origin_ref)
+print(spacing_ref)
 
 writer = vtk.vtkJSONImageWriter()
 writer.SetInputData(image1.GetOutput())
@@ -31,36 +31,36 @@ writer.SetSlice(3)
 writer.Write()
 
 # Try to load JSON file and compare with dumped data
-print "Writing file:", tmp_file
+print("Writing file:", tmp_file)
 json_file = open(tmp_file, "r")
 json_obj = json.load(json_file)
 json_file.close()
 
 slice = json_obj['RTData']
 if json_obj["dimensions"] != dim_ref:
-    print "Dimension ERROR"
+    print("Dimension ERROR")
     sys.exit(1)
 else:
-    print "Dimension OK"
+    print("Dimension OK")
 if json_obj["origin"] != origin_ref:
-    print "Origin ERROR"
+    print("Origin ERROR")
     sys.exit(1)
 else:
-    print "Origin OK"
+    print("Origin OK")
 if json_obj["spacing"] != spacing_ref:
-    print "Spacing ERROR"
+    print("Spacing ERROR")
     sys.exit(1)
 else:
-    print "Spacing OK"
+    print("Spacing OK")
 if len(slice) == 441:
-    print "Slice size OK"
+    print("Slice size OK")
 else:
-    print "Slice size ERROR - Size of ", str(len(slice))
+    print("Slice size ERROR - Size of ", str(len(slice)))
     sys.exit(1)
 
 for i in range(len(expected_first_values)):
     if expected_first_values[i] != slice[i]:
         sys.exit(1)
 
-print "All good..."
+print("All good...")
 sys.exit()

IO/Image/Testing/Python/TestImageWriters.py

@@ -90,4 +90,4 @@ try:
     viewer.Render()
 
 except IOError:
-    print  "Unable to test the writers."
+    print("Unable to test the writers.")

IO/MINC/Testing/Python/TestMINCImageWriter.py

@@ -73,4 +73,4 @@ try:
     viewer.Render()
 
 except IOError:
-    print  "Unable to test the writer/reader."
+    print("Unable to test the writer/reader.")

IO/MINC/Testing/Python/TestMNIObjects.py

@@ -138,4 +138,4 @@ try:
 #        iren.Start()
 
 except IOError:
-    print  "Unable to test the writer/reader."
+    print("Unable to test the writer/reader.")

IO/MINC/Testing/Python/TestMNITagPoints.py

@@ -129,4 +129,4 @@ try:
 #    iren.Start()
 
 except IOError:
-    print  "Unable to test the writer/reader."
+    print("Unable to test the writer/reader.")

IO/MINC/Testing/Python/TestMNITransforms.py

@@ -153,4 +153,4 @@ try:
         pass