From c23ed5cf9690c021d2a0507f7725f6d8cff4f452 Mon Sep 17 00:00:00 2001 From: Vinay Sajip Date: Fri, 30 Jul 2021 11:44:16 +0100 Subject: [PATCH 1/2] bpo-44753: Don't use logfile extension when determining old files to be deleted. --- Lib/logging/handlers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py index 9506b9acdd4fa3..5a4503ea8320e9 100644 --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -359,7 +359,8 @@ def getFilesToDelete(self): dirName, baseName = os.path.split(self.baseFilename) fileNames = os.listdir(dirName) result = [] - prefix = baseName + "." + # See bpo-44753: Don't use the extension when computing the prefix. + prefix = os.path.split(baseName)[0] + "." plen = len(prefix) for fileName in fileNames: if fileName[:plen] == prefix: From 48e5e0b06df09aa58b233707b3b39295746f29ac Mon Sep 17 00:00:00 2001 From: Vinay Sajip Date: Fri, 30 Jul 2021 12:14:07 +0100 Subject: [PATCH 2/2] Correct typo - should use splitext(). --- Lib/logging/handlers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py index 5a4503ea8320e9..e2579db58046df 100644 --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -360,7 +360,7 @@ def getFilesToDelete(self): fileNames = os.listdir(dirName) result = [] # See bpo-44753: Don't use the extension when computing the prefix. - prefix = os.path.split(baseName)[0] + "." + prefix = os.path.splitext(baseName)[0] + "." plen = len(prefix) for fileName in fileNames: if fileName[:plen] == prefix: