From: Mathieu Dupuy <mathieu.dupuy@critizr.com>
Date: Wed, 6 Apr 2022 16:57:54 +0000 (+0200)
Subject: Remove python2 support in logging cookbook example. (GH-32362)
X-Git-Tag: v3.11.0b1~442
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f82f9ce3239b9a7e6ffa278658dd9858f64a3c14;p=thirdparty%2FPython%2Fcpython.git

Remove python2 support in logging cookbook example. (GH-32362)
---

diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst
index f0d944940fc2..704279240b35 100644
--- a/Doc/howto/logging-cookbook.rst
+++ b/Doc/howto/logging-cookbook.rst
@@ -1788,22 +1788,15 @@ Python used.
 If you need more specialised processing, you can use a custom JSON encoder,
 as in the following complete example::
 
-    from __future__ import unicode_literals
-
     import json
     import logging
 
-    # This next bit is to ensure the script runs unchanged on 2.x and 3.x
-    try:
-        unicode
-    except NameError:
-        unicode = str
 
     class Encoder(json.JSONEncoder):
         def default(self, o):
             if isinstance(o, set):
                 return tuple(o)
-            elif isinstance(o, unicode):
+            elif isinstance(o, str):
                 return o.encode('unicode_escape').decode('ascii')
             return super().default(o)