Add python2 support to bech32

Author: Martino Salvetti

bitcoin/segwit_addr.py

@@ -20,6 +20,13 @@
 
 """Reference implementation for Bech32 and segwit addresses."""
 
+import sys
+_bchr = chr
+_bord = lambda x: ord(x) if isinstance(x, str) else x
+if sys.version > '3':
+    long = int
+    _bchr = lambda x: bytes([x])
+    _bord = lambda x: x
 
 CHARSET = "qpzry9x8gf2tvdw0s3jn54khce6mua7l"
 
@@ -85,6 +92,7 @@ def convertbits(data, frombits, tobits, pad=True):
     maxv = (1 << tobits) - 1
     max_acc = (1 << (frombits + tobits - 1)) - 1
     for value in data:
+        value = _bord(value)
         if value < 0 or (value >> frombits):
             return None
         acc = ((acc << frombits) | value) & max_acc

bitcoin/tests/test_bech32.py

@@ -14,6 +14,16 @@
 import json
 import os
 import unittest
+import array
+import sys
+_bchr = chr
+_bord = ord
+_tobytes = lambda x: array.array('B', x).tostring()
+if sys.version > '3':
+    long = int
+    _bchr = lambda x: bytes([x])
+    _bord = lambda x: x
+    _tobytes = bytes
 
 from binascii import unhexlify
 
@@ -28,7 +38,7 @@ def load_test_vectors(name):
 
 def to_scriptPubKey(witver, witprog):
     """Decoded bech32 address to script"""
-    return CScript([witver]) + CScript(bytes(witprog))
+    return CScript([witver]) + CScript(_tobytes(witprog))
 
 class Test_bech32(unittest.TestCase):
 
@@ -42,15 +52,15 @@ def op_decode(self, witver):
 
     def test_encode_decode(self):
         for exp_bin, exp_bech32 in load_test_vectors('bech32_encode_decode.json'):
-            exp_bin = unhexlify(exp_bin.encode('utf8'))
+            exp_bin = [_bord(y) for y in unhexlify(exp_bin.encode('utf8'))]
             witver = self.op_decode(exp_bin[0])
             hrp = exp_bech32[:exp_bech32.rindex('1')].lower()
             self.assertEqual(exp_bin[1], len(exp_bin[2:]))
             act_bech32 = encode(hrp, witver, exp_bin[2:])
             act_bin = decode(hrp, exp_bech32)
 
             self.assertEqual(act_bech32.lower(), exp_bech32.lower())
-            self.assertEqual(to_scriptPubKey(*act_bin), exp_bin)
+            self.assertEqual(to_scriptPubKey(*act_bin), _tobytes(exp_bin))
 
 class Test_CBech32Data(unittest.TestCase):
     def test_from_data(self):