bpo-40300: Allow empty logging.Formatter.default_msec_format. (GH-19551)

This commit is contained in:
Mariusz Felisiak 2020-04-17 18:02:47 +02:00 committed by GitHub
parent 1ae035b7e8
commit 06a35542aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 2 deletions

View file

@ -597,8 +597,9 @@ class Formatter(object):
if datefmt:
s = time.strftime(datefmt, ct)
else:
t = time.strftime(self.default_time_format, ct)
s = self.default_msec_format % (t, record.msecs)
s = time.strftime(self.default_time_format, ct)
if self.default_msec_format:
s = self.default_msec_format % (s, record.msecs)
return s
def formatException(self, ei):