summaryrefslogtreecommitdiff
path: root/src/engine/SCons/Node/__init__.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/__init__.py
parent5c05b2bdc19a672a0707b3630cb57c26b1a55af5 (diff)
parenta0a0d8c6e521866d1ada7c1774f74f09e8da70c3 (diff)
downloadscons-9d71d5d5611c4ff00b29df529e6bc3bb5bafbe01.tar.gz
Merge in mainline.
Diffstat (limited to 'src/engine/SCons/Node/__init__.py')
-rw-r--r--src/engine/SCons/Node/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/engine/SCons/Node/__init__.py b/src/engine/SCons/Node/__init__.py
index 0409d3b2..e1867522 100644
--- a/src/engine/SCons/Node/__init__.py
+++ b/src/engine/SCons/Node/__init__.py
@@ -211,7 +211,7 @@ def get_contents_dir(node):
def get_contents_file(node):
if not node.rexists():
- return ''
+ return b''
fname = node.rfile().get_abspath()
try:
with open(fname, "rb") as fp: