aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSjors Provoost <[email protected]>2018-12-12 11:08:53 +0100
committerSjors Provoost <[email protected]>2018-12-12 11:09:04 +0100
commit31926ee8cfc73501524dfa0fef2ccbaa786d6a00 (patch)
tree37e0e33ffb3b00d782e12039983815bd9c469b94
parent[test] Travis: enforce Python 3.4 support in functional tests (diff)
downloaddiscoin-31926ee8cfc73501524dfa0fef2ccbaa786d6a00.tar.xz
discoin-31926ee8cfc73501524dfa0fef2ccbaa786d6a00.zip
[test] functional framework: add CScript hex() for Python 3.4
test/functional/wallet_importmulti.py failed with: AttributeError: 'CScript' object has no attribute 'hex'
-rw-r--r--test/functional/test_framework/script.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/test/functional/test_framework/script.py b/test/functional/test_framework/script.py
index 2c5ba24a6..012c80a1b 100644
--- a/test/functional/test_framework/script.py
+++ b/test/functional/test_framework/script.py
@@ -450,6 +450,10 @@ class CScript(bytes):
# join makes no sense for a CScript()
raise NotImplementedError
+ # Python 3.4 compatibility
+ def hex(self):
+ return hexlify(self).decode('ascii')
+
def __new__(cls, value=b''):
if isinstance(value, bytes) or isinstance(value, bytearray):
return super(CScript, cls).__new__(cls, value)