From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sun, 19 Aug 2018 07:20:13 +0000 (-0400)
Subject: bpo-34415: Updated logging.Formatter docstring. (GH-8811) (GH-8817)
X-Git-Tag: v3.7.1rc1~168
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2e4ae8f1b3147d7f0a461b4ffdde9bcc9e6a2083;p=thirdparty%2FPython%2Fcpython.git

bpo-34415: Updated logging.Formatter docstring. (GH-8811) (GH-8817)

(cherry picked from commit d3d3171da895d8cb880f23fae6be778f0ac23be7)
---

diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index 46c590687c7d..53780cd6005c 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -424,7 +424,8 @@ class Formatter(object):
     responsible for converting a LogRecord to (usually) a string which can
     be interpreted by either a human or an external system. The base Formatter
     allows a formatting string to be specified. If none is supplied, the
-    default value of "%s(message)" is used.
+    the style-dependent default value, "%(message)s", "{message}", or
+    "${message}", is used.
 
     The Formatter can be initialized with a format string which makes use of
     knowledge of the LogRecord attributes - e.g. the default value mentioned