aboutsummaryrefslogtreecommitdiff
path: root/qa/rpc-tests/test_framework/script.py
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2016-03-19 20:58:06 +0100
committerMarcoFalke <falke.marco@gmail.com>2016-05-05 15:43:37 +0200
commitfa389d4edc367073e2ccc6d1f0790c4b72ba17f2 (patch)
tree3bc22860769bb62b3679dbd185940cf3df9f890e /qa/rpc-tests/test_framework/script.py
parent3b9a0bf41f2336b09e854522ab1ce6dcfc7a3050 (diff)
downloadbitcoin-fa389d4edc367073e2ccc6d1f0790c4b72ba17f2.tar.xz
[qa] Switch to py3
Diffstat (limited to 'qa/rpc-tests/test_framework/script.py')
-rw-r--r--qa/rpc-tests/test_framework/script.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/qa/rpc-tests/test_framework/script.py b/qa/rpc-tests/test_framework/script.py
index 5fb5758f81..44a894fc8f 100644
--- a/qa/rpc-tests/test_framework/script.py
+++ b/qa/rpc-tests/test_framework/script.py
@@ -1,18 +1,19 @@
+#!/usr/bin/env python3
+# Copyright (c) 2015-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
#
# script.py
#
# This file is modified from python-bitcoinlib.
#
-# Distributed under the MIT/X11 software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#
"""Scripts
Functionality to build scripts, as well as SignatureHash().
"""
-from __future__ import absolute_import, division, print_function, unicode_literals
from .mininode import CTransaction, CTxOut, hash256
from binascii import hexlify
@@ -658,7 +659,7 @@ class CScript(bytes):
other = bchr(CScriptOp(OP_0))
else:
other = CScriptNum.encode(other)
- elif isinstance(other, (int, long)):
+ elif isinstance(other, int):
if 0 <= other <= 16:
other = bytes(bchr(CScriptOp.encode_op_n(other)))
elif other == -1: