Move sys.version test out of x/b2x/etc. functions

Author: petertodd

bitcoin/core/__init__.py

@@ -11,10 +11,11 @@
 
 from __future__ import absolute_import, division, print_function, unicode_literals
 
-import struct
-import socket
 import binascii
 import hashlib
+import socket
+import struct
+import sys
 
 from .script import CScript
 
@@ -35,43 +36,65 @@
 def MoneyRange(nValue):
         return 0 <= nValue <= MAX_MONEY
 
+def py2_x(h):
+    """Convert a hex string to bytes"""
+    return binascii.unhexlify(h)
+
 def x(h):
     """Convert a hex string to bytes"""
-    import sys
-    if sys.version > '3':
-        return binascii.unhexlify(h.encode('utf8'))
-    else:
-        return binascii.unhexlify(h)
+    return binascii.unhexlify(h.encode('utf8'))
+
+def py2_b2x(b):
+    """Convert bytes to a hex string"""
+    return binascii.hexlify(b)
 
 def b2x(b):
     """Convert bytes to a hex string"""
-    if sys.version > '3':
-        return binascii.hexlify(b).decode('utf8')
-    else:
-        return binascii.hexlify(b)
+    return binascii.hexlify(b).decode('utf8')
+
+def py2_lx(h):
+    """Convert a little-endian hex string to bytes
+
+    Lets you write uint256's and uint160's the way the Satoshi codebase shows
+    them.
+    """
+    return binascii.unhexlify(h)[::-1]
 
 def lx(h):
     """Convert a little-endian hex string to bytes
 
     Lets you write uint256's and uint160's the way the Satoshi codebase shows
     them.
     """
-    import sys
-    if sys.version > '3':
-        return binascii.unhexlify(h.encode('utf8'))[::-1]
-    else:
-        return binascii.unhexlify(h)[::-1]
+    return binascii.unhexlify(h.encode('utf8'))[::-1]
+
+def py2_b2lx(b):
+    """Convert bytes to a little-endian hex string
+
+    Lets you show uint256's and uint160's the way the Satoshi codebase shows
+    them.
+    """
+    return binascii.hexlify(b[::-1])
 
 def b2lx(b):
     """Convert bytes to a little-endian hex string
 
     Lets you show uint256's and uint160's the way the Satoshi codebase shows
     them.
     """
-    if sys.version > '3':
-        return binascii.hexlify(b[::-1]).decode('utf8')
-    else:
-        return binascii.hexlify(b[::-1])
+    return binascii.hexlify(b[::-1]).decode('utf8')
+
+if not (sys.version > '3'):
+    x = py2_x
+    b2x = py2_b2x
+    lx = py2_lx
+    b2lx = py2_b2lx
+
+del py2_x
+del py2_b2x
+del py2_lx
+del py2_b2lx
+
 
 def str_money_value(value):
     """Convert an integer money value to a fixed point string"""