Properly encode bytes for printing

Author: icook

bitcoin/messages.py

@@ -15,7 +15,7 @@
 import time
 import random
 import sys
-from binascii import hexlify
+
 if sys.version > '3':
     import io
 else:
@@ -71,7 +71,7 @@ def stream_deserialize(cls, f, params=MainParams(), protover=PROTO_VERSION):
         # check magic
         if recvbuf[:4] != params.MESSAGE_START:
             raise ValueError("Invalid message start '%s', expected '%s'" %
-                             (recvbuf[:4], params.MESSAGE_START))
+                             (b2x(recvbuf[:4]), b2x(params.MESSAGE_START)))
 
         # remaining header fields: command, msg length, checksum
         command = recvbuf[4:4+12].split(b"\x00", 1)[0]
@@ -271,7 +271,7 @@ def msg_ser(self, f):
         f.write(self.hashstop)
 
     def __repr__(self):
-        return "msg_getblocks(locator=%s hashstop=%s)" % (repr(self.locator), hexlify(self.hashstop))
+        return "msg_getblocks(locator=%s hashstop=%s)" % (repr(self.locator), b2x(self.hashstop))
 
 
 class msg_getheaders(MsgSerializable):
@@ -294,7 +294,7 @@ def msg_ser(self, f):
         f.write(self.hashstop)
 
     def __repr__(self):
-        return "msg_getheaders(locator=%s hashstop=%s)" % (repr(self.locator), hexlify(self.hashstop))
+        return "msg_getheaders(locator=%s hashstop=%s)" % (repr(self.locator), b2x(self.hashstop))
 
 
 class msg_headers(MsgSerializable):