Merge branch '0.29.x'

CHANGES.rst

@@ -578,14 +578,24 @@ Other changes
 .. _`PEP-479`: https://www.python.org/dev/peps/pep-0479
 
 
-0.29.23 (2021-04-11)
+0.29.23 (2021-04-14)
 ====================
 
 Bugs fixed
 ----------
 
 * Some problems with Python 3.10 were resolved.
-  Patches by Victor Stinner and David Woods.  (Github issues #3919, #4046)
+  Patches by Victor Stinner and David Woods.  (Github issues #4046, #4100)
+
+* An incorrect "optimisation" was removed that allowed changes to a keyword
+  dict to leak into keyword arguments passed into a function.
+  Patch by Peng Weikang.  (Github issue #3227)
+
+* Multiplied str constants could end up as bytes constants with language_level=2.
+  Patch by Alphadelta14 and David Woods.  (Github issue #3951)
+
+* ``PY_SSIZE_T_CLEAN`` does not get defined any more if it is already defined.
+  Patch by Andrew Jones.  (Github issue #4104)
 
 
 0.29.22 (2021-02-20)

tests/run/test_unicode.pyx

@@ -1469,19 +1469,19 @@ class UnicodeTest(CommonTest,
         class Str(str, enum.Enum):
             ABC = 'abc'
         # Testing Unicode formatting strings...
-        self.assertEqual("%s, %s" % (Str.ABC, Str.ABC),
-                         'Str.ABC, Str.ABC')
-        self.assertEqual("%s, %s, %d, %i, %u, %f, %5.2f" %
+        self.assertEqual(("%s, %s" % (Str.ABC, Str.ABC)).replace("Str.", ""),
+                         'ABC, ABC')
+        self.assertEqual(("%s, %s, %d, %i, %u, %f, %5.2f" %
                         (Str.ABC, Str.ABC,
                          Int.IDES, Int.IDES, Int.IDES,
-                         Float.PI, Float.PI),
-                         'Str.ABC, Str.ABC, 15, 15, 15, 3.141593,  3.14')
+                         Float.PI, Float.PI)).replace("Str.", ""),
+                         'ABC, ABC, 15, 15, 15, 3.141593,  3.14')
 
         # formatting jobs delegated from the string implementation:
-        self.assertEqual('...%(foo)s...' % {'foo':Str.ABC},
-                         '...Str.ABC...')
-        self.assertEqual('...%(foo)s...' % {'foo':Int.IDES},
-                         '...Int.IDES...')
+        self.assertEqual(('...%(foo)s...' % {'foo':Str.ABC}).replace("Str.", ""),
+                         '...ABC...')
+        self.assertEqual(('...%(foo)s...' % {'foo':Int.IDES}).replace("Int.", ""),
+                         '...IDES...')
         self.assertEqual('...%(foo)i...' % {'foo':Int.IDES},
                          '...15...')
         self.assertEqual('...%(foo)d...' % {'foo':Int.IDES},