From 3af305e8b8a89f4b0e5874cd601568ab8dcd7334 Mon Sep 17 00:00:00 2001
From: Chris Lamb <chris@chris-lamb.co.uk>
Date: Sun, 19 Nov 2017 09:15:08 +0900
Subject: [PATCH] Fixed #28810 -- Replaced '%' style logging formatting with
 str.format() style.

---
 django/utils/log.py     | 5 +++--
 docs/topics/logging.txt | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/django/utils/log.py b/django/utils/log.py
index 495b846a62..12b830a794 100644
--- a/django/utils/log.py
+++ b/django/utils/log.py
@@ -27,7 +27,8 @@ DEFAULT_LOGGING = {
     'formatters': {
         'django.server': {
             '()': 'django.utils.log.ServerFormatter',
-            'format': '[%(server_time)s] %(message)s',
+            'format': '[{server_time}] {message}',
+            'style': '{',
         }
     },
     'handlers': {
@@ -190,4 +191,4 @@ class ServerFormatter(logging.Formatter):
         return super().format(record)
 
     def uses_server_time(self):
-        return self._fmt.find('%(server_time)') >= 0
+        return self._fmt.find('{server_time}') >= 0
diff --git a/docs/topics/logging.txt b/docs/topics/logging.txt
index 3202ee9477..5b06ffba72 100644
--- a/docs/topics/logging.txt
+++ b/docs/topics/logging.txt
@@ -299,10 +299,12 @@ Finally, here's an example of a fairly complex logging setup::
         'disable_existing_loggers': False,
         'formatters': {
             'verbose': {
-                'format': '%(levelname)s %(asctime)s %(module)s %(process)d %(thread)d %(message)s'
+                'format': '{levelname} {asctime} {module} {process:d} {thread:d} {message}',
+                'style': '{',
             },
             'simple': {
-                'format': '%(levelname)s %(message)s'
+                'format': '{levelname} {message}',
+                'style': '{',
             },
         },
         'filters': {