diff options
author | William Deegan <bill@baddogconsulting.com> | 2018-10-11 02:29:12 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-11 02:29:12 (GMT) |
commit | 35d9ef6435ea2646b5fa7e5960abb674e15eb51d (patch) | |
tree | fa4ef9449e0a892573b25a730d395405c789b11d /src/engine/SCons/Node/Python.py | |
parent | a2092766fec67e3bea5edf962db2e6fbcd898bcc (diff) | |
parent | 91b9ad6de7da6c06ed4d964060065530d0419c90 (diff) | |
download | SCons-35d9ef6435ea2646b5fa7e5960abb674e15eb51d.zip SCons-35d9ef6435ea2646b5fa7e5960abb674e15eb51d.tar.gz SCons-35d9ef6435ea2646b5fa7e5960abb674e15eb51d.tar.bz2 |
Merge pull request #3213 from bdbaddog/fix_3212_TryCompile_With_Py3_CacheDir
Fix Issue # 3212 try compile with py3 cache dir
Diffstat (limited to 'src/engine/SCons/Node/Python.py')
-rw-r--r-- | src/engine/SCons/Node/Python.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/engine/SCons/Node/Python.py b/src/engine/SCons/Node/Python.py index 8c47c97..4a62f04 100644 --- a/src/engine/SCons/Node/Python.py +++ b/src/engine/SCons/Node/Python.py @@ -137,6 +137,10 @@ class Value(SCons.Node.Node): return contents def get_contents(self): + """ + Get contents for signature calculations. + :return: bytes + """ text_contents = self.get_text_contents() try: return text_contents.encode() @@ -155,12 +159,17 @@ class Value(SCons.Node.Node): def get_csig(self, calc=None): """Because we're a Python value node and don't have a real timestamp, we get to ignore the calculator and just use the - value contents.""" + value contents. + + Returns string. Ideally string of hex digits. (Not bytes) + """ try: return self.ninfo.csig except AttributeError: pass - contents = self.get_contents() + + contents = self.get_text_contents() + self.get_ninfo().csig = contents return contents |