summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Node/Python.py
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2018-11-13 18:58:06 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2018-11-13 18:58:06 (GMT)
commitc2aba592affffdb12d2f95e251ccfc566b6dd674 (patch)
tree3f1719afc1ec7408135659f154f4b4072f8b44af /src/engine/SCons/Node/Python.py
parentade84bc59db524fbccd670bfadefa786407c7c0b (diff)
parent648cf42a89845ccad012e02609ca8958e62ce272 (diff)
downloadSCons-c2aba592affffdb12d2f95e251ccfc566b6dd674.zip
SCons-c2aba592affffdb12d2f95e251ccfc566b6dd674.tar.gz
SCons-c2aba592affffdb12d2f95e251ccfc566b6dd674.tar.bz2
Merge remote-tracking branch 'upstream/master' into subst_rewrite
Diffstat (limited to 'src/engine/SCons/Node/Python.py')
-rw-r--r--src/engine/SCons/Node/Python.py13
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