diff options
| author | Mats Wichmann <mats@linux.com> | 2018-07-31 22:57:26 (GMT) |
|---|---|---|
| committer | Mats Wichmann <mats@linux.com> | 2018-07-31 22:57:26 (GMT) |
| commit | 0cf044543fb089bcd997b3ad2d877b71026ce5bf (patch) | |
| tree | 758b4878d18514a4797af6480984428aaa74e2b1 /test/Docbook | |
| parent | d15065cdcfccf8943fa3ede7b225b698f3aec707 (diff) | |
| download | SCons-0cf044543fb089bcd997b3ad2d877b71026ce5bf.zip SCons-0cf044543fb089bcd997b3ad2d877b71026ce5bf.tar.gz SCons-0cf044543fb089bcd997b3ad2d877b71026ce5bf.tar.bz2 | |
Try a more scons-y file conversion for Py3 file reads
Instead of custom conversion as in the previous iteration,
use the to_bytes function.
The two known tests which incorrectly let the text-mode xml file
be opened in binary mode are adjusted to supply mode='r'
Signed-off-by: Mats Wichmann <mats@linux.com>
Diffstat (limited to 'test/Docbook')
| -rw-r--r-- | test/Docbook/basic/xinclude/xinclude.py | 2 | ||||
| -rw-r--r-- | test/Docbook/dependencies/xinclude/xinclude.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/Docbook/basic/xinclude/xinclude.py b/test/Docbook/basic/xinclude/xinclude.py index 302c777..9b22c13 100644 --- a/test/Docbook/basic/xinclude/xinclude.py +++ b/test/Docbook/basic/xinclude/xinclude.py @@ -44,7 +44,7 @@ test.dir_fixture('image') # Normal invocation test.run() test.must_exist(test.workpath('manual_xi.xml')) -test.must_contain(test.workpath('manual_xi.xml'),'<para>This is an included text.') +test.must_contain(test.workpath('manual_xi.xml'),'<para>This is an included text.', mode='r') # Cleanup diff --git a/test/Docbook/dependencies/xinclude/xinclude.py b/test/Docbook/dependencies/xinclude/xinclude.py index 115163c..c3d9e25 100644 --- a/test/Docbook/dependencies/xinclude/xinclude.py +++ b/test/Docbook/dependencies/xinclude/xinclude.py @@ -44,7 +44,7 @@ test.dir_fixture('image') # Normal invocation test.run() test.must_exist(test.workpath('manual_xi.xml')) -test.must_contain(test.workpath('manual_xi.xml'),'<para>This is an included text.') +test.must_contain(test.workpath('manual_xi.xml'),'<para>This is an included text.', mode='r') # Change included file test.write('include.txt', 'This is another text.') |