Changeset 195d1d8

Timestamp:

May 7, 2024, 4:43:41 PM (7 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

083e637

Parents:

0f4c513

Message:

update search strings to raw strings for python 3.12

Files:

• src/ResolvExpr/Cost.h (modified) (2 diffs)
• tests/pybin/tools.py (modified) (2 diffs)
• tests/test.py (modified) (2 diffs)

src/ResolvExpr/Cost.h

@@ -10 +10 @@
 // Created On       : Sun May 17 09:39:50 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jun 21 11:39:13 2019
-// Update Count     : 63
+// Last Modified On : Fri May  3 17:15:41 2024
+// Update Count     : 64
 //
 
@@ -19 +19 @@
 #include <cassert>
 #include <climits>
+#include <cstdint>
 
 namespace ResolvExpr {

tests/pybin/tools.py

@@ -120 +120 @@
                 return (False, "'file EXPECT' failed with code {} '{}'".format(code, err))
 
-        match = re.search(".*: (.*)", out)
+        match = re.search(r".*: (.*)", out)
 
         if not match:
@@ -306 +306 @@
                 sys.exit(1)
 
-        re_jobs = re.search("--jobserver-(auth|fds)", out)
+        re_jobs = re.search(r"--jobserver-(auth|fds)", out)
         if not re_jobs:
                 print("ERROR: cannot find Makefile jobserver version", file=sys.stderr)

tests/test.py

@@ -23 +23 @@
 
         def match_test(path):
-                match = re.search("^%s\/([\w\/\-_]*).expect\/([\w\-_\+]+)(\.[\w\-_]+)?\.txt$" % settings.SRCDIR, path)
+                match = re.search(r'^%s\/([\w\/\-_]*).expect\/([\w\-_\+]+)(\.[\w\-_]+)?\.txt$' % settings.SRCDIR, path)
                 if match :
                         test = Test()
@@ -359 +359 @@
                                 sys.exit(1)
 
-                        print(' '.join(re.findall('([^\s]+\.cfa)', out)), end=' ')
+                        print(' '.join(re.findall(r'([^\s]+\.cfa)', out)), end=' ')
 
                 print('')