Merge from v6

Author: lelit

CHANGES.rst

@@ -73,6 +73,13 @@ Version 7
 Version 6
 #########
 
+6.16 (2025-03-17)
+~~~~~~~~~~~~~~~~~
+
+- No visible changes, just a workaround to a strange CI Windows-only failure on a test
+  introduced by v6.15
+
+
 6.15 (2025-03-17)
 ~~~~~~~~~~~~~~~~~
 

tests/test_printers_prettification.py

@@ -3,7 +3,7 @@
 # :Created:   dom 17 mar 2019 10:46:03 CET
 # :Author:    Lele Gaifax <lele@metapensiero.it>
 # :License:   GNU General Public License version 3 or later
-# :Copyright: © 2019, 2020, 2021, 2024 Lele Gaifax
+# :Copyright: © 2019, 2020, 2021, 2024, 2025 Lele Gaifax
 #
 
 from ast import literal_eval
@@ -84,6 +84,9 @@ def test_prettification(src, lineno, case):
     expected = parts[0].strip().replace('\\n\\\n', '\n').replace('\\s', ' ')
     if expected.endswith('\\'):
         expected = expected[:-1] + '\n'
+    if '{ZERO WIDTH NO-BREAK SPACE}' in expected:
+        expected = expected.replace('{ZERO WIDTH NO-BREAK SPACE}',
+                                    '\N{ZERO WIDTH NO-BREAK SPACE}')
     if len(parts) == 2:
         options = literal_eval(parts[1])
     else:

tests/test_printers_prettification/dml/select.sql

@@ -458,7 +458,7 @@ footer
 select 1
 -- */ foobar
 =
-SELECT 1 /**/ foobar*/
+SELECT 1 /**{ZERO WIDTH NO-BREAK SPACE}/ foobar*/
 :
 {'preserve_comments': True, 'raw_stream': True}