1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Doc/library/logging.rst
View File

@ -608,6 +608,9 @@ The useful mapping keys in a :class:`LogRecord` are given in the section on
attributes are ``default_time_format`` (for the strptime format string) attributes are ``default_time_format`` (for the strptime format string)
and ``default_msec_format`` (for appending the millisecond value). and ``default_msec_format`` (for appending the millisecond value).
.. versionchanged:: 3.9
The ``default_msec_format`` can be ``None``.
.. method:: formatException(exc_info) .. method:: formatException(exc_info)
Formats the specified exception information (a standard exception tuple as Formats the specified exception information (a standard exception tuple as

5
Lib/logging/__init__.py
View File

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

13
Lib/test/test_logging.py
View File

@ -3941,6 +3941,19 @@ class FormatterTest(unittest.TestCase):
f.format(r) f.format(r)
self.assertEqual(r.asctime, '1993-04-21 08:03:00,123') self.assertEqual(r.asctime, '1993-04-21 08:03:00,123')
def test_default_msec_format_none(self):
class NoMsecFormatter(logging.Formatter):
default_msec_format = None
default_time_format = '%d/%m/%Y %H:%M:%S'
r = self.get_record()
dt = datetime.datetime(1993, 4, 21, 8, 3, 0, 123, utc)
r.created = time.mktime(dt.astimezone(None).timetuple())
f = NoMsecFormatter()
f.converter = time.gmtime
self.assertEqual(f.formatTime(r), '21/04/1993 08:03:00')
class TestBufferingFormatter(logging.BufferingFormatter): class TestBufferingFormatter(logging.BufferingFormatter):
def formatHeader(self, records): def formatHeader(self, records):
return '[(%d)' % len(records) return '[(%d)' % len(records)