diff options
| author | Joseph Brill <48932340+jcbrill@users.noreply.github.com> | 2024-03-23 14:40:48 (GMT) |
|---|---|---|
| committer | Joseph Brill <48932340+jcbrill@users.noreply.github.com> | 2024-03-23 14:40:48 (GMT) |
| commit | 756c32716cd5116ee62819380aeb65b1cc75a43c (patch) | |
| tree | 0cba78ba48712c5ba656b816c2f3d928cf30abef /testing | |
| parent | 3b95dd6919dec1a13e26e7bef62a02157108c350 (diff) | |
| parent | 2f57d9d13015c399d60371fd3ad99ce65b43a2f6 (diff) | |
| download | SCons-756c32716cd5116ee62819380aeb65b1cc75a43c.zip SCons-756c32716cd5116ee62819380aeb65b1cc75a43c.tar.gz SCons-756c32716cd5116ee62819380aeb65b1cc75a43c.tar.bz2 | |
Merge branch 'master' into jbrill-msvc-detect
Manually resolved:
* CHANGES.txt
* RELEASE.txt
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/framework/TestSCons.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/testing/framework/TestSCons.py b/testing/framework/TestSCons.py index b6e3490..db702c6 100644 --- a/testing/framework/TestSCons.py +++ b/testing/framework/TestSCons.py @@ -55,7 +55,7 @@ from TestCmd import PIPE # here provides some independent verification that what we packaged # conforms to what we expect. -default_version = '4.7.0ayyyymmdd' +default_version = '4.7.1ayyyymmdd' # TODO: these need to be hand-edited when there are changes python_version_unsupported = (3, 6, 0) @@ -668,14 +668,14 @@ class TestSCons(TestCommon): 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:[^)]*\)', |