Merge branch '1.4_maintenance' into 1.5_maintenance

johnhaddon · johnhaddon · commit 29ad80ebf282 · 2025-01-30T09:54:12.000Z
diff --git a/python/GafferImageTest/CatalogueTest.py b/python/GafferImageTest/CatalogueTest.py
@@ -652,7 +652,7 @@ def testNonWritableDirectory( self ) :
 		with self.assertRaisesRegex(
 			RuntimeError,
 			r".* : Could not open \".*\" " + (
-				"\(Permission denied\)" if os.name != "nt" else "\(No such file or directory\)"
+				r"\(Permission denied\)" if os.name != "nt" else r"\(No such file or directory\)"
 			)
 		) :
 			GafferImage.ImageAlgo.image( s["c"]["out"] )

Original file line number	Diff line number	Diff line change
`@@ -652,7 +652,7 @@ def testNonWritableDirectory( self ) :`
`652`	`652`	`with self.assertRaisesRegex(`
`653`	`653`	`RuntimeError,`
`654`	`654`	`r".* : Could not open \".*\" " + (`
`655`		`- "\(Permission denied\)" if os.name != "nt" else "\(No such file or directory\)"`
	`655`	`+ r"\(Permission denied\)" if os.name != "nt" else r"\(No such file or directory\)"`
`656`	`656`	`)`
`657`	`657`	`) :`
`658`	`658`	`GafferImage.ImageAlgo.image( s["c"]["out"] )`