Commit317e0c9

authored

[3.9]bpo-45628: Check all parts of the suffix for an extension match. (GH-29310) (GH-29313)

1 parenta043706 commit317e0c9Copy full SHA for 317e0c9

File tree

-2

lines changed

-2

lines changed

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -368,8 +368,13 @@ def getFilesToDelete(self):`
`368`	`368`	`forfileNameinfileNames:`
`369`	`369`	`iffileName[:plen]==prefix:`
`370`	`370`	`suffix=fileName[plen:]`
`371`		`-ifself.extMatch.match(suffix):`
`372`		`-result.append(os.path.join(dirName,fileName))`
	`371`	`+# See bpo-45628: The date/time suffix could be anywhere in the`
	`372`	`+# filename`
	`373`	`+parts=suffix.split('.')`
	`374`	`+forpartinparts:`
	`375`	`+ifself.extMatch.match(part):`
	`376`	`+result.append(os.path.join(dirName,fileName))`
	`377`	`+break`
`373`	`378`	`iflen(result)<self.backupCount:`
`374`	`379`	`result= []`
`375`	`380`	`else:`

Comments

(0)