summaryrefslogtreecommitdiffstats
path: root/test/srcchange.py
diff options
context:
space:
mode:
authorMats Wichmann <mats@linux.com>2019-03-31 13:01:00 (GMT)
committerMats Wichmann <mats@linux.com>2019-04-25 15:37:04 (GMT)
commitf61d3bcd112285644c1a6ce253b267ef690a7e06 (patch)
tree2e489e238c11697f602cb9a7cbeb43afed088734 /test/srcchange.py
parentb0c3385604ebc1d7d552472f1cc6d0910aafa32a (diff)
downloadSCons-f61d3bcd112285644c1a6ce253b267ef690a7e06.zip
SCons-f61d3bcd112285644c1a6ce253b267ef690a7e06.tar.gz
SCons-f61d3bcd112285644c1a6ce253b267ef690a7e06.tar.bz2
[PY 3.8] test fixes for file closings, rawstrings
On a linux host (missing some things that may be on the Travis CI setup), Py3.8a3 now shows 19 fails, 1048 pass, with 84 Warning: messages. Signed-off-by: Mats Wichmann <mats@linux.com>
Diffstat (limited to 'test/srcchange.py')
-rw-r--r--test/srcchange.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/test/srcchange.py b/test/srcchange.py
index 6916d50..e396fb8 100644
--- a/test/srcchange.py
+++ b/test/srcchange.py
@@ -44,7 +44,8 @@ test = TestSCons.TestSCons()
test.write('getrevision', """
from __future__ import print_function
-print(open('revnum.in','r').read().strip(), end='')
+with open('revnum.in','r') as f:
+ print(f.read().strip(), end='')
""")
test.write('SConstruct', """
@@ -52,12 +53,11 @@ import re
def subrevision(target, source ,env):
orig = target[0].get_text_contents()
- new = re.sub('\$REV.*?\$',
+ new = re.sub(r'\$REV.*?\$',
'$REV: %%s$'%%source[0].get_text_contents().strip(),
target[0].get_text_contents())
- outf = open(str(target[0]),'w')
- outf.write(new)
- outf.close()
+ with open(str(target[0]),'w') as outf:
+ outf.write(new)
SubRevision = Action(subrevision)