[cgkit-commits] SF.net SVN: cgkit:[326] cgkit/trunk/unittests
Brought to you by:
mbaas
Menu
▾
▴
[cgkit-commits] SF.net SVN: cgkit:[326] cgkit/trunk/unittests
|
From: <mb...@us...> - 2009-06-28 14:40:25
|
Revision: 326
http://cgkit.svn.sourceforge.net/cgkit/?rev=326&view=rev
Author: mbaas
Date: 2009-06-28 14:39:49 +0000 (Sun, 28 Jun 2009)
Log Message:
-----------
Fixes to run the tests with Python 3
Modified Paths:
--------------
cgkit/trunk/unittests/ritest.py
cgkit/trunk/unittests/test_mat3.py
cgkit/trunk/unittests/test_mat3_light.py
cgkit/trunk/unittests/test_mat4.py
cgkit/trunk/unittests/test_mat4_light.py
cgkit/trunk/unittests/test_quat.py
cgkit/trunk/unittests/test_quat_light.py
cgkit/trunk/unittests/test_ri.py
cgkit/trunk/unittests/test_vec3.py
cgkit/trunk/unittests/test_vec3_light.py
cgkit/trunk/unittests/test_vec4.py
cgkit/trunk/unittests/test_vec4_light.py
Modified: cgkit/trunk/unittests/ritest.py
===================================================================
--- cgkit/trunk/unittests/ritest.py 2009-06-28 14:36:51 UTC (rev 325)
+++ cgkit/trunk/unittests/ritest.py 2009-06-28 14:39:49 UTC (rev 326)
@@ -9,7 +9,7 @@
import numpy
has_numpy = True
except ImportError:
- print >>sys.stderr, "Warning: numpy module not found. Skipping numpy test in ritest.py."
+ sys.stderr.write("Warning: numpy module not found. Skipping numpy test in ritest.py.\n")
has_numpy = False
def normalizeRIB(inFile, outFile):
@@ -186,7 +186,7 @@
ri.RiErrorHandler(ri.RiErrorIgnore)
err = ri.RiLastError
ri.RiOption("searchpath", "shader", "&:shaders")
- ri.RiOption("render", "string bucketorder", u"horizontal")
+ ri.RiOption("render", "string bucketorder", "horizontal")
ri.RiFormat(800, 600, 1.0)
ri.RiDisplay("out.tif", ri.RI_FRAMEBUFFER, ri.RI_RGBA, "integer[2] origin", [10,10])
ri.RiCropWindow(0.25, 0.75, 0.1, 0.9)
Modified: cgkit/trunk/unittests/test_mat3.py
===================================================================
--- cgkit/trunk/unittests/test_mat3.py 2009-06-28 14:36:51 UTC (rev 325)
+++ cgkit/trunk/unittests/test_mat3.py 2009-06-28 14:39:49 UTC (rev 326)
@@ -3,7 +3,7 @@
import unittest
#from cgkit.light.cgtypes import *
from cgkit.cgtypes import *
-import math, os, pickle, cPickle, sys
+import math, os, pickle, sys
from cgkit.sl import degrees, radians
class TestMat3(unittest.TestCase):
@@ -527,11 +527,11 @@
# have to be applied just in the opposite order than mentioned
# in the fromEuler*() method name.
C = R1*R2*R3
- exec 'E = mat3.fromEuler%s(angle["X"], angle["Y"], angle["Z"])'%order
+ exec ('E = mat3.fromEuler%s(angle["X"], angle["Y"], angle["Z"])'%order)
self.assertEqual(E, C)
- exec 'x,y,z = E.toEuler%s()'%order
- exec 'E2 = mat3.fromEuler%s(x, y, z)'%order
+ exec ('x,y,z = E.toEuler%s()'%order)
+ exec ('E2 = mat3.fromEuler%s(x, y, z)'%order)
if E2!=E:
# print E
# print E2
@@ -565,12 +565,12 @@
def testPickle(self):
fname = "delme_pickle.dat"
- f = file(fname, "w")
+ f = open(fname, "wb")
m = mat3(1,2,3,4,5,6,7,8,9)
pickle.dump(m, f)
f.close()
- f = file(fname)
+ f = open(fname, "rb")
n = pickle.load(f)
f.close()
Modified: cgkit/trunk/unittests/test_mat3_light.py
===================================================================
--- cgkit/trunk/unittests/test_mat3_light.py 2009-06-28 14:36:51 UTC (rev 325)
+++ cgkit/trunk/unittests/test_mat3_light.py 2009-06-28 14:39:49 UTC (rev 326)
@@ -2,7 +2,7 @@
import unittest
from cgkit.light.cgtypes import *
-import math, os, pickle, cPickle, sys
+import math, os, pickle, sys
from cgkit.sl import degrees, radians
class TestMat3(unittest.TestCase):
@@ -526,11 +526,11 @@
# have to be applied just in the opposite order than mentioned
# in the fromEuler*() method name.
C = R1*R2*R3
- exec 'E = mat3.fromEuler%s(angle["X"], angle["Y"], angle["Z"])'%order
+ exec ('E = mat3.fromEuler%s(angle["X"], angle["Y"], angle["Z"])'%order)
self.assertEqual(E, C)
- exec 'x,y,z = E.toEuler%s()'%order
- exec 'E2 = mat3.fromEuler%s(x, y, z)'%order
+ exec ('x,y,z = E.toEuler%s()'%order)
+ exec ('E2 = mat3.fromEuler%s(x, y, z)'%order)
if E2!=E:
# print E
# print E2
@@ -564,12 +564,12 @@
def testPickle(self):
fname = "delme_pickle.dat"
- f = file(fname, "w")
+ f = open(fname, "wb")
m = mat3(1,2,3,4,5,6,7,8,9)
pickle.dump(m, f)
f.close()
- f = file(fname)
+ f = open(fname, "rb")
n = pickle.load(f)
f.close()
Modified: cgkit/trunk/unittests/test_mat4.py
===================================================================
--- cgkit/trunk/unittests/test_mat4.py 2009-06-28 14:36:51 UTC (rev 325)
+++ cgkit/trunk/unittests/test_mat4.py 2009-06-28 14:39:49 UTC (rev 326)
@@ -3,7 +3,7 @@
import unittest
from cgkit.cgtypes import *
#from cgkit.light.cgtypes import *
-import math, os, pickle, cPickle, sys, copy
+import math, os, pickle, sys, copy
class TestMat4(unittest.TestCase):
@@ -603,12 +603,12 @@
def testPickle(self):
fname = "delme_pickle.dat"
- f = file(fname, "w")
+ f = open(fname, "wb")
m = mat4(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16)
pickle.dump(m, f)
f.close()
- f = file(fname)
+ f = open(fname, "rb")
n = pickle.load(f)
f.close()
Modified: cgkit/trunk/unittests/test_mat4_light.py
===================================================================
--- cgkit/trunk/unittests/test_mat4_light.py 2009-06-28 14:36:51 UTC (rev 325)
+++ cgkit/trunk/unittests/test_mat4_light.py 2009-06-28 14:39:49 UTC (rev 326)
@@ -3,7 +3,7 @@
import unittest
#from cgkit.cgtypes import *
from cgkit.light.cgtypes import *
-import math, os, pickle, cPickle, sys, copy
+import math, os, pickle, sys, copy
class TestMat4(unittest.TestCase):
@@ -603,12 +603,12 @@
def testPickle(self):
fname = "delme_pickle.dat"
- f = file(fname, "w")
+ f = open(fname, "wb")
m = mat4(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16)
pickle.dump(m, f)
f.close()
- f = file(fname)
+ f = open(fname, "rb")
n = pickle.load(f)
f.close()
Modified: cgkit/trunk/unittests/test_quat.py
===================================================================
--- cgkit/trunk/unittests/test_quat.py 2009-06-28 14:36:51 UTC (rev 325)
+++ cgkit/trunk/unittests/test_quat.py 2009-06-28 14:39:49 UTC (rev 326)
@@ -3,7 +3,7 @@
import unittest
from cgkit.cgtypes import *
#from cgkit.light.cgtypes import *
-import math, os, pickle, cPickle
+import math, os, pickle
class TestQuat(unittest.TestCase):
@@ -94,7 +94,7 @@
c = a*2
self.failUnless(c==quat(-2,5,6,4),
"falsche Multiplikation quat*int: %s"%str(c))
- c = a*2L
+ c = a*2
self.failUnless(c==quat(-2,5,6,4),
"falsche Multiplikation quat*long: %s"%str(c))
c = 2.0*a
@@ -295,12 +295,12 @@
def testPickle(self):
fname = "delme_pickle.dat"
- f = file(fname, "w")
+ f = open(fname, "wb")
q = quat(1,2,3,4)
pickle.dump(q, f)
f.close()
- f = file(fname)
+ f = open(fname, "rb")
w = pickle.load(f)
f.close()
Modified: cgkit/trunk/unittests/test_quat_light.py
===================================================================
--- cgkit/trunk/unittests/test_quat_light.py 2009-06-28 14:36:51 UTC (rev 325)
+++ cgkit/trunk/unittests/test_quat_light.py 2009-06-28 14:39:49 UTC (rev 326)
@@ -3,7 +3,7 @@
import unittest
#from cgkit.cgtypes import *
from cgkit.light.cgtypes import *
-import math, os, pickle, cPickle
+import math, os, pickle
class TestQuat(unittest.TestCase):
@@ -94,7 +94,7 @@
c = a*2
self.failUnless(c==quat(-2,5,6,4),
"falsche Multiplikation quat*int: %s"%str(c))
- c = a*2L
+ c = a*2
self.failUnless(c==quat(-2,5,6,4),
"falsche Multiplikation quat*long: %s"%str(c))
c = 2.0*a
@@ -295,12 +295,12 @@
def testPickle(self):
fname = "delme_pickle.dat"
- f = file(fname, "w")
+ f = open(fname, "wb")
q = quat(1,2,3,4)
pickle.dump(q, f)
f.close()
- f = file(fname)
+ f = open(fname, "rb")
w = pickle.load(f)
f.close()
Modified: cgkit/trunk/unittests/test_ri.py
===================================================================
--- cgkit/trunk/unittests/test_ri.py 2009-06-28 14:36:51 UTC (rev 325)
+++ cgkit/trunk/unittests/test_ri.py 2009-06-28 14:39:49 UTC (rev 326)
@@ -39,7 +39,7 @@
def testCRiModule(self):
"""Check the cri module."""
- print "cri test is disabled"
+ print ("cri test is disabled")
return
if os.path.exists("tmp/criout.rib"):
Modified: cgkit/trunk/unittests/test_vec3.py
===================================================================
--- cgkit/trunk/unittests/test_vec3.py 2009-06-28 14:36:51 UTC (rev 325)
+++ cgkit/trunk/unittests/test_vec3.py 2009-06-28 14:39:49 UTC (rev 326)
@@ -3,7 +3,7 @@
import unittest
from cgkit.cgtypes import *
#from cgkit.light.cgtypes import *
-import math, os, pickle, cPickle
+import math, os, pickle
class TestVec3(unittest.TestCase):
@@ -25,9 +25,9 @@
self.failUnless(v==vec3(2.5,2.5,2.5),
"vec3(2.5) != vec3(2.5,2.5,2.5) : %s"%str(v))
- v = vec3(-1.5, 42L)
+ v = vec3(-1.5, 42)
self.failUnless(v==vec3(-1.5, 42.0, 0.0),
- "vec3(-1.5, 42L) != vec3(-1.5, 42.0, 0.0) : %s"%str(v))
+ "vec3(-1.5, 42) != vec3(-1.5, 42.0, 0.0) : %s"%str(v))
v = vec3(())
self.failUnless(v==vec3(0, 0, 0),
@@ -148,7 +148,7 @@
c = a*2
self.failUnless(c==vec3(-2,5,6),
"falsche Multiplikation vec3*int: %s"%str(c))
- c = a*2L
+ c = a*2
self.failUnless(c==vec3(-2,5,6),
"falsche Multiplikation vec3*long: %s"%str(c))
c = 2.0*a
@@ -464,12 +464,12 @@
def testPickle(self):
fname = "delme_pickle.dat"
- f = file(fname, "w")
+ f = open(fname, "wb")
v = vec3(1, 2.5, -3.7)
pickle.dump(v, f)
f.close()
- f = file(fname)
+ f = open(fname, "rb")
w = pickle.load(f)
f.close()
Modified: cgkit/trunk/unittests/test_vec3_light.py
===================================================================
--- cgkit/trunk/unittests/test_vec3_light.py 2009-06-28 14:36:51 UTC (rev 325)
+++ cgkit/trunk/unittests/test_vec3_light.py 2009-06-28 14:39:49 UTC (rev 326)
@@ -3,7 +3,7 @@
import unittest
#from cgkit.cgtypes import *
from cgkit.light.cgtypes import *
-import math, os, pickle, cPickle
+import math, os, pickle
class TestVec3(unittest.TestCase):
@@ -25,9 +25,9 @@
self.failUnless(v==vec3(2.5,2.5,2.5),
"vec3(2.5) != vec3(2.5,2.5,2.5) : %s"%str(v))
- v = vec3(-1.5, 42L)
+ v = vec3(-1.5, 42)
self.failUnless(v==vec3(-1.5, 42.0, 0.0),
- "vec3(-1.5, 42L) != vec3(-1.5, 42.0, 0.0) : %s"%str(v))
+ "vec3(-1.5, 42) != vec3(-1.5, 42.0, 0.0) : %s"%str(v))
v = vec3(())
self.failUnless(v==vec3(0, 0, 0),
@@ -148,7 +148,7 @@
c = a*2
self.failUnless(c==vec3(-2,5,6),
"falsche Multiplikation vec3*int: %s"%str(c))
- c = a*2L
+ c = a*2
self.failUnless(c==vec3(-2,5,6),
"falsche Multiplikation vec3*long: %s"%str(c))
c = 2.0*a
@@ -464,12 +464,12 @@
def testPickle(self):
fname = "delme_pickle.dat"
- f = file(fname, "w")
+ f = open(fname, "wb")
v = vec3(1, 2.5, -3.7)
pickle.dump(v, f)
f.close()
- f = file(fname)
+ f = open(fname, "rb")
w = pickle.load(f)
f.close()
Modified: cgkit/trunk/unittests/test_vec4.py
===================================================================
--- cgkit/trunk/unittests/test_vec4.py 2009-06-28 14:36:51 UTC (rev 325)
+++ cgkit/trunk/unittests/test_vec4.py 2009-06-28 14:39:49 UTC (rev 326)
@@ -3,7 +3,7 @@
import unittest
from cgkit.cgtypes import *
#from cgkit.light.cgtypes import *
-import math, os, pickle, cPickle
+import math, os, pickle
class TestVec4(unittest.TestCase):
@@ -25,9 +25,9 @@
self.failUnless(v==vec4(2.5,2.5,2.5,2.5),
"vec4(2.5) != (2.5,2.5,2.5,2.5) : %s"%str(v))
- v = vec4(-1.5, 42L)
+ v = vec4(-1.5, 42)
self.failUnless(v==vec4(-1.5, 42.0, 0.0),
- "vec4(-1.5, 42L) != (-1.5, 42,0,0) : %s"%str(v))
+ "vec4(-1.5, 42) != (-1.5, 42,0,0) : %s"%str(v))
v = vec4(())
self.failUnless(v==vec4(0, 0, 0, 0),
@@ -154,7 +154,7 @@
c = a*2
self.failUnless(c==vec4(-2,5,6,4),
"falsche Multiplikation vec4*int: %s"%str(c))
- c = a*2L
+ c = a*2
self.failUnless(c==vec4(-2,5,6,4),
"falsche Multiplikation vec4*long: %s"%str(c))
c = 2.0*a
@@ -421,12 +421,12 @@
def testPickle(self):
fname = "delme_pickle.dat"
- f = file(fname, "w")
+ f = file(fname, "wb")
v = vec4(1, 2.5, -3.7, 12)
pickle.dump(v, f)
f.close()
- f = file(fname)
+ f = file(fname, "rb")
w = pickle.load(f)
f.close()
Modified: cgkit/trunk/unittests/test_vec4_light.py
===================================================================
--- cgkit/trunk/unittests/test_vec4_light.py 2009-06-28 14:36:51 UTC (rev 325)
+++ cgkit/trunk/unittests/test_vec4_light.py 2009-06-28 14:39:49 UTC (rev 326)
@@ -3,7 +3,7 @@
import unittest
#from cgkit.cgtypes import *
from cgkit.light.cgtypes import *
-import math, os, pickle, cPickle
+import math, os, pickle
class TestVec4(unittest.TestCase):
@@ -25,9 +25,9 @@
self.failUnless(v==vec4(2.5,2.5,2.5,2.5),
"vec4(2.5) != (2.5,2.5,2.5,2.5) : %s"%str(v))
- v = vec4(-1.5, 42L)
+ v = vec4(-1.5, 42)
self.failUnless(v==vec4(-1.5, 42.0, 0.0),
- "vec4(-1.5, 42L) != (-1.5, 42,0,0) : %s"%str(v))
+ "vec4(-1.5, 42) != (-1.5, 42,0,0) : %s"%str(v))
v = vec4(())
self.failUnless(v==vec4(0, 0, 0, 0),
@@ -154,7 +154,7 @@
c = a*2
self.failUnless(c==vec4(-2,5,6,4),
"falsche Multiplikation vec4*int: %s"%str(c))
- c = a*2L
+ c = a*2
self.failUnless(c==vec4(-2,5,6,4),
"falsche Multiplikation vec4*long: %s"%str(c))
c = 2.0*a
@@ -421,12 +421,12 @@
def testPickle(self):
fname = "delme_pickle.dat"
- f = file(fname, "w")
+ f = file(fname, "wb")
v = vec4(1, 2.5, -3.7, 12)
pickle.dump(v, f)
f.close()
- f = file(fname)
+ f = file(fname, "rb")
w = pickle.load(f)
f.close()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|