diff options
| author | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2020-04-17 16:02:47 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-17 16:02:47 (GMT) |
| commit | 06a35542aad15666cace307d841a95e33f3cbee6 (patch) | |
| tree | 1181345efbb9ba1fcbdac907ff8e6598ce10243c /Lib/logging | |
| parent | 1ae035b7e847064d09df01ca62b8a761e9b5aae3 (diff) | |
| download | cpython-06a35542aad15666cace307d841a95e33f3cbee6.zip cpython-06a35542aad15666cace307d841a95e33f3cbee6.tar.gz cpython-06a35542aad15666cace307d841a95e33f3cbee6.tar.bz2 | |
bpo-40300: Allow empty logging.Formatter.default_msec_format. (GH-19551)
Diffstat (limited to 'Lib/logging')
| -rw-r--r-- | Lib/logging/__init__.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py index 84a1775..403dc81 100644 --- a/Lib/logging/__init__.py +++ b/Lib/logging/__init__.py @@ -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): |