summaryrefslogtreecommitdiffstats
path: root/SConstruct
diff options
context:
space:
mode:
authorStefan Zimmermann <zimmermann.code@gmail.com>2014-03-31 22:37:42 (GMT)
committerStefan Zimmermann <zimmermann.code@gmail.com>2014-03-31 22:37:42 (GMT)
commite7fbae42ed9a4db4be2152c2bccd05ce46226689 (patch)
tree91a57be2fd32f0fd6f7cfc7735686402993d6336 /SConstruct
parent18ecb44af82ac0b95c852ff05eaf4fe3af3fb724 (diff)
downloadSCons-e7fbae42ed9a4db4be2152c2bccd05ce46226689.zip
SCons-e7fbae42ed9a4db4be2152c2bccd05ce46226689.tar.gz
SCons-e7fbae42ed9a4db4be2152c2bccd05ce46226689.tar.bz2
SConstruct: More bytes/str fixes.
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct5
1 files changed, 3 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct
index f1f1fa3..a18de57 100644
--- a/SConstruct
+++ b/SConstruct
@@ -418,7 +418,8 @@ def soelim(target, source, env):
def soscan(node, env, path):
c = node.get_text_contents()
- return re.compile(r"^[\.']so\s+(\S+)", re.M).findall(c)
+ # Node contents are bytes ==> br"..."
+ return re.compile(br"^[\.']so\s+(\S+)", re.M).findall(c)
soelimbuilder = Builder(action = Action(soelim),
source_scanner = Scanner(soscan))
@@ -828,7 +829,7 @@ for p in [ scons ]:
def write_src_files(target, source, **kw):
global src_files
src_files.sort()
- f = open(str(target[0]), 'wb')
+ f = open(str(target[0]), 'w')
for file in src_files:
f.write(file + "\n")
f.close()