Merge branch '1.1_maintenance' into main

GafferHQ · Jan 30, 2023 · 660697f · 660697f
2 parents 36f20d0 + a01ae0c
commit 660697f
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/python/GafferSceneTest/MeshSegmentsTest.py b/python/GafferSceneTest/MeshSegmentsTest.py
@@ -35,7 +35,7 @@
 #
 ##########################################################################
 
-import pathlib
+import os
 import unittest
 import six
 
@@ -54,8 +54,7 @@ class MeshSegmentsTest( GafferSceneTest.SceneTestCase ) :
 	def testSampleFile( self ) :
 
 		r = GafferScene.SceneReader()
-		# /todo - remove str() when merging to main
-		r["fileName"].setValue( str( pathlib.Path( __file__ ).parent / "usdFiles" / "segmentTestMesh.usd" ) )
+		r["fileName"].setValue( os.path.join( os.path.dirname( __file__ ), "usdFiles", "segmentTestMesh.usd" ) )
 
 		f = GafferScene.PathFilter()
 		f["paths"].setValue( IECore.StringVectorData( [ "/plane" ] ) )