diff options
| author | Stefan Behnel <stefan_ml@behnel.de> | 2021-04-14 14:29:45 +0200 |
|---|---|---|
| committer | Stefan Behnel <stefan_ml@behnel.de> | 2021-04-14 14:29:45 +0200 |
| commit | 817672d561d741402346f1d2e760f5766da36002 (patch) | |
| tree | 2c48371d5e4b1b3610c9a49800e7606c9716cce0 | |
| parent | 461e45fe36e95393583cf97f75713b0dbdbecc97 (diff) | |
| parent | b6077b23bb77205c16c8478408cd461f4d6d3351 (diff) | |
| download | cython-817672d561d741402346f1d2e760f5766da36002.tar.gz | |
Merge branch '0.29.x'
| -rw-r--r-- | CHANGES.rst | 14 | ||||
| -rw-r--r-- | tests/run/test_unicode.pyx | 18 |
2 files changed, 21 insertions, 11 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 8673af803..41becd976 100644 --- a/CHANGES.rst +++ b/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) diff --git a/tests/run/test_unicode.pyx b/tests/run/test_unicode.pyx index 742103a36..2386b5124 100644 --- a/tests/run/test_unicode.pyx +++ b/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}, |