From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 29 Oct 2021 15:25:31 +0000 (-0700)
Subject: [3.10] bpo-45628: Check all parts of the suffix for an extension match. (GH-29310... 
X-Git-Tag: v3.10.1~121
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=191a93905a84f272b2232701dc5dcc69987330f5;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
index 4dcbe4530fcf..4e8f0a8cc2f4 100644
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -371,8 +371,13 @@ class TimedRotatingFileHandler(BaseRotatingHandler):
         for fileName in fileNames:
             if fileName[:plen] == prefix:
                 suffix = fileName[plen:]
-                if self.extMatch.match(suffix):
-                    result.append(os.path.join(dirName, fileName))
+                # See bpo-45628: The date/time suffix could be anywhere in the
+                # filename
+                parts = suffix.split('.')
+                for part in parts:
+                    if self.extMatch.match(part):
+                        result.append(os.path.join(dirName, fileName))
+                        break
         if len(result) < self.backupCount:
             result = []
         else: