Skip to content

Commit 0bf70c0

Browse files
committed
ShaderNetworkAlgoTest : Don't use six
We no longer support Python 2.
1 parent fa9c8ea commit 0bf70c0

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

test/IECoreScene/ShaderNetworkAlgoTest.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ def testSplineInputs( self ):
602602
output = "testSplines"
603603
)
604604

605-
with six.assertRaisesRegex( self, Exception, r".*Cannot handle input to testSplines.fC3fcatmullRom\[0\].y.b : expanded spline has 33 control points, but max input adapter size is 32.*" ):
605+
with self.assertRaisesRegex( Exception, r".*Cannot handle input to testSplines.fC3fcatmullRom\[0\].y.b : expanded spline has 33 control points, but max input adapter size is 32.*" ):
606606
IECoreScene.ShaderNetworkAlgo.convertToOSLConventions( n, 11000 )
607607

608608
n = IECoreScene.ShaderNetwork(
@@ -619,7 +619,7 @@ def testSplineInputs( self ):
619619
output = "testSplines"
620620
)
621621

622-
with six.assertRaisesRegex( self, Exception, "Invalid spline point index xx" ):
622+
with self.assertRaisesRegex( Exception, "Invalid spline point index xx" ):
623623
IECoreScene.ShaderNetworkAlgo.convertToOSLConventions( n, 11000 )
624624

625625
n = IECoreScene.ShaderNetwork(
@@ -636,7 +636,7 @@ def testSplineInputs( self ):
636636
output = "testSplines"
637637
)
638638

639-
with six.assertRaisesRegex( self, Exception, "Spline index -1 is out of range in spline with 6 points." ):
639+
with self.assertRaisesRegex( Exception, "Spline index -1 is out of range in spline with 6 points." ):
640640
IECoreScene.ShaderNetworkAlgo.convertToOSLConventions( n, 11000 )
641641

642642
n = IECoreScene.ShaderNetwork(
@@ -653,7 +653,7 @@ def testSplineInputs( self ):
653653
output = "testSplines"
654654
)
655655

656-
with six.assertRaisesRegex( self, Exception, "Spline index 100 is out of range in spline with 6 points." ):
656+
with self.assertRaisesRegex( Exception, "Spline index 100 is out of range in spline with 6 points." ):
657657
IECoreScene.ShaderNetworkAlgo.convertToOSLConventions( n, 11000 )
658658

659659
def testColor4ComponentConnections( self ) :

0 commit comments

Comments
 (0)