summaryrefslogtreecommitdiff
path: root/src/engine/SCons/Node/FSTests.py
diff options
context:
space:
mode:
authorRussel Winder <russel@winder.org.uk>2017-08-26 14:46:54 +0100
committerRussel Winder <russel@winder.org.uk>2017-08-26 14:46:54 +0100
commit9d71d5d5611c4ff00b29df529e6bc3bb5bafbe01 (patch)
tree20878e20d6085ca1a0910fc401cc0c7275f64bf1 /src/engine/SCons/Node/FSTests.py
parent5c05b2bdc19a672a0707b3630cb57c26b1a55af5 (diff)
parenta0a0d8c6e521866d1ada7c1774f74f09e8da70c3 (diff)
downloadscons-9d71d5d5611c4ff00b29df529e6bc3bb5bafbe01.tar.gz
Merge in mainline.
Diffstat (limited to 'src/engine/SCons/Node/FSTests.py')
-rw-r--r--src/engine/SCons/Node/FSTests.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/engine/SCons/Node/FSTests.py b/src/engine/SCons/Node/FSTests.py
index 399ac06a..273f8097 100644
--- a/src/engine/SCons/Node/FSTests.py
+++ b/src/engine/SCons/Node/FSTests.py
@@ -1315,6 +1315,14 @@ class FSTestCase(_tempdirTestCase):
assert eval('f1.get_text_contents() == u"Foo\x1aBar"'), \
f1.get_text_contents()
+ # Check for string which doesn't have BOM and isn't valid
+ # ASCII
+ test_string = b'Gan\xdfauge'
+ test.write('latin1_file', test_string)
+ f1 = fs.File(test.workpath("latin1_file"))
+ assert f1.get_text_contents() == test_string.decode('latin-1'), \
+ f1.get_text_contents()
+
def nonexistent(method, s):
try:
x = method(s, create = 0)