fix: cleanup tests and fix a raw string test, enable more win32

Signed-off-by: Stephen Arnold <[email protected]>

Author: sarnold

.github/workflows/main.yml

@@ -39,7 +39,7 @@ jobs:
           CIBW_ARCHS_LINUX: auto
           CIBW_ARCHS_MACOS: auto arm64
           CIBW_TEST_SKIP: "*_arm64 *universal2:arm64 *linux_i686"
-          CIBW_ARCHS_WINDOWS: auto64
+          CIBW_ARCHS_WINDOWS: auto
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
           CIBW_MANYLINUX_I686_IMAGE: manylinux2010
           CIBW_BUILD: cp38-* cp39-* cp310-* cp311-* cp312-*

tests/re_utils.py

@@ -550,8 +550,9 @@
 
     # lookbehind: split by : but not if it is escaped by -.
     ('(?<!-):(.*?)(?<!-):', 'a:bc-:de:f', SUCCEED, 'g1', 'bc-:de' ),
-    # escaping with \ as we know it
-    (r'(?<!\\\):(.*?)(?<!\\\):', 'a:bc\\:de:f', SUCCEED, 'g1', 'bc\\:de' ),
+    # escaping with \ as we know it => updated for py311+
+    # by removing one backslash from each set of 3
+    (r'(?<!\\):(.*?)(?<!\\):', 'a:bc\\:de:f', SUCCEED, 'g1', 'bc\\:de' ),
     # terminating with ' and escaping with ? as in edifact
     ("(?<!\\?)'(.*?)(?<!\\?)'", "a'bc?'de'f", SUCCEED, 'g1', "bc?'de" ),
 

tests/test_re.py

@@ -1,14 +1,19 @@
 from __future__ import print_function
-try:
-    from test.test_support import verbose
-except ImportError:
-    from test.support import verbose
-import re2 as re
-from re import Scanner
+
 import os
 import sys
 import traceback
 from weakref import proxy
+
+import re2 as re
+from re import Scanner
+
+try:
+    from test import support
+    from test.support import verbose
+except ImportError:  # import error on Windows
+    verbose = re.VERBOSE
+
 if sys.version_info[0] > 2:
     unicode = str
     unichr = chr