Merge pull request SCons#4501 from mwichmann/maint/py313-re

Fix a Python 3.13 problem in re.sub usage

Author: bdbaddog

CHANGES.txt

@@ -12,6 +12,8 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
   From Mats Wichmann:
 
     - Updated Value Node docs and tests.
+    - Python 3.13 compat: re.sub deprecated count, flags as positional args,
+      caused update-release-info test to fail.
     - Dump() with json format selected now recognizes additional compound types
       (UserDict and UserList), which improves the detail of the display.
       json output is also sorted, to match the default display.

bin/update-release-info.py

@@ -218,19 +218,19 @@ def __init__(self, file, orig=None):
 
     def sub(self, pattern, replacement, count=1):
         """ XXX """
-        self.content = re.sub(pattern, replacement, self.content, count)
+        self.content = re.sub(pattern, replacement, self.content, count=count)
 
     def replace_assign(self, name, replacement, count=1):
         """ XXX """
         self.sub('\n' + name + ' = .*', '\n' + name + ' = ' + replacement)
 
     def replace_version(self, count=1):
         """ XXX """
-        self.content = self.match_rel.sub(rel_info.version_string, self.content, count)
+        self.content = self.match_rel.sub(rel_info.version_string, self.content, count=count)
 
     def replace_date(self, count=1):
         """ XXX """
-        self.content = self.match_date.sub(rel_info.new_date, self.content, count)
+        self.content = self.match_date.sub(rel_info.new_date, self.content, count=count)
 
     def __del__(self):
         """ XXX """

testing/framework/TestSCons.py

@@ -668,14 +668,14 @@ def normalize_ps(self, s):
         return s
 
     @staticmethod
-    def to_bytes_re_sub(pattern, repl, str, count: int=0, flags: int=0):
+    def to_bytes_re_sub(pattern, repl, string, count: int=0, flags: int=0):
         """
         Wrapper around re.sub to change pattern and repl to bytes to work with
         both python 2 & 3
         """
         pattern = to_bytes(pattern)
         repl = to_bytes(repl)
-        return re.sub(pattern, repl, str, count, flags)
+        return re.sub(pattern, repl, string, count=count, flags=flags)
 
     def normalize_pdf(self, s):
         s = self.to_bytes_re_sub(r'/(Creation|Mod)Date \(D:[^)]*\)',