summaryrefslogtreecommitdiff
path: root/src/engine/SCons/CacheDirTests.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine/SCons/CacheDirTests.py')
-rw-r--r--src/engine/SCons/CacheDirTests.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/engine/SCons/CacheDirTests.py b/src/engine/SCons/CacheDirTests.py
index 2daa177..e7db18c 100644
--- a/src/engine/SCons/CacheDirTests.py
+++ b/src/engine/SCons/CacheDirTests.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001 - 2016 The SCons Foundation
+# Copyright (c) 2001 - 2017 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -21,7 +21,7 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/CacheDirTests.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog"
+__revision__ = "src/engine/SCons/CacheDirTests.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog"
import os.path
import shutil
@@ -44,7 +44,7 @@ class Action(object):
def genstring(self, target, source, env):
return str(self)
def get_contents(self, target, source, env):
- return ''
+ return bytearray('','utf-8')
class Builder(object):
def __init__(self, environment, action):
@@ -249,7 +249,7 @@ class FileTestCase(BaseTestCase):
warn_caught = 0
try:
f7.push_to_cache()
- except SCons.Errors.BuildError, e:
+ except SCons.Errors.BuildError as e:
assert e.exc_info[0] == SCons.Warnings.CacheWriteErrorWarning
warn_caught = 1
assert warn_caught