summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2017-03-19 23:25:26 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2017-03-19 23:25:26 (GMT)
commit5bbd875bfc5b47f0df7af5378ccb0978eddaddee (patch)
tree1a60a3163a2f14d80c10804296a3b8179f8bc0e7
parentb2d2d74745f53efc06310369787c311a7a5ffe3a (diff)
parent47b6a4d1c7da1e93bbfc7ec283746c72ff3d920e (diff)
downloadSCons-5bbd875bfc5b47f0df7af5378ccb0978eddaddee.zip
SCons-5bbd875bfc5b47f0df7af5378ccb0978eddaddee.tar.gz
SCons-5bbd875bfc5b47f0df7af5378ccb0978eddaddee.tar.bz2
merge
-rw-r--r--src/engine/SCons/Node/FS.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index c3841eb..7172c50 100644
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -2672,11 +2672,11 @@ class File(Base):
# them, but has a 'utf-8-sig' which does; 'utf-16' seems to
# strip them; etc.) Just sidestep all the complication by
# explicitly stripping the BOM before we decode().
- if contents.startswith(codecs.BOM_UTF8):
+ if contents[:len(codecs.BOM_UTF8)] == codecs.BOM_UTF8:
return contents[len(codecs.BOM_UTF8):].decode('utf-8')
- if contents.startswith(codecs.BOM_UTF16_LE):
+ if contents[:len(codecs.BOM_UTF16_LE)] == codecs.BOM_UTF16_LE:
return contents[len(codecs.BOM_UTF16_LE):].decode('utf-16-le')
- if contents.startswith(codecs.BOM_UTF16_BE):
+ if contents[:len(codecs.BOM_UTF16_BE)] == codecs.BOM_UTF16_BE:
return contents[len(codecs.BOM_UTF16_BE):].decode('utf-16-be')
try:
return contents.decode()