hexathon

commit 9faa8b3f0103a2ca40dee73a1e47218ce1296009
parent cdafc18fc7b8d09b09573ec82a0f4526bcba577d
Author: lash <dev@holbrook.no>
Date:   Mon, 21 Feb 2022 16:05:36 +0000

Remove circular dep between 0x handlers and compact/even

Diffstat:
M
CHANGELOG
 | 
2
++
M
hexathon/parse.py
 | 
42
++++++++++++++++++++++++++----------------
M
setup.cfg
 | 
2
+-
M
tests/test_basic.py
 | 
2
--

4 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+- 0.1.5
+	* Avoid reciprocal dependency between 0x and compact/even
 - 0.1.4
 	* Add to_int method
 - 0.1.3
diff --git a/hexathon/parse.py b/hexathon/parse.py
@@ -2,21 +2,23 @@ import re
 
 
 __re_valid = '^[0-9a-fA-F]+$'
-def valid(hx):
+def valid(hx, allow_compact=False):
     l = len(hx)
-    if l == 0 or l % 2 != 0:
+    if l == 0:
         raise ValueError('invalid hex (invalid length {})'.format(l))
+    if not allow_compact and l % 2 != 0:
+        raise ValueError('invalid hex (invalid length {}, no compact allowed)'.format(l))
     if not re.match(__re_valid, hx):
         raise ValueError('invalid hex (non-hex character)')
     return hx
 
 
-def even(hx, allow_empty=False):
+def even(hx, allow_empty=False, allow_compact=False):
     if len(hx) % 2 != 0:
         hx = '0' + hx
     if allow_empty and len(hx) == 0:
         return ''
-    return valid(hx)
+    return valid(hx, allow_compact=allow_compact)
 
 
 def uniform(hx):
@@ -26,15 +28,16 @@ def uniform(hx):
 def strip_0x(hx, allow_empty=False, compact_value=False):
     if len(hx) == 0 and not allow_empty:
         raise ValueError('invalid hex')
-    elif len(hx) < 2:
-        raise ValueError('invalid hex')
-    if hx[:2] == '0x':
-        hx = hx[2:]
+    elif len(hx) > 1:
+        if hx[:2] == '0x':
+            hx = hx[2:]
+    if len(hx) > 0:
+        hx = valid(hx, allow_compact=True)
 
     if compact_value:
-        v = compact(hx, allow_empty)
+        v = compact(hx, allow_empty=allow_empty)
     else:
-        v = even(hx, allow_empty)
+        v = even(hx, allow_empty=allow_empty, allow_compact=True)
     return v
 
 
@@ -45,15 +48,19 @@ def add_0x(hx, allow_empty=False, compact_value=False):
         hx = hx[2:]
     v = ''
     if compact_value:
-        v = compact(hx, allow_empty)
+        v = compact(hx, allow_empty=allow_empty)
     else:
-        v = even(hx, allow_empty)
+        v = even(hx, allow_empty=allow_empty, allow_compact=True)
     return '0x' + v
 
 
 def compact(hx, allow_empty=False):
+    if len(hx) == 0:
+        if not allow_empty:
+            raise ValueError('invalid hex (empty)')
+    else:
+        hx = valid(hx, allow_compact=True)
     i = 0
-    hx = strip_0x(hx)
     for i in range(len(hx)):
         if hx[i] != '0':
             break
@@ -64,9 +71,12 @@ def unpad(hx):
     return even(compact(hx))
 
 
-def pad(hx, byte_length):
-    hx = strip_0x(hx)
-    hx = hx.rjust(byte_length * 2, '0')
+def pad(hx, byte_length=0, allow_compact=False):
+    hx = valid(hx, allow_compact=allow_compact)
+    if byte_length == 0:
+       hx = even(hx, allow_compact=allow_compact)
+    else:
+        hx = hx.rjust(byte_length * 2, '0')
     return hx
 
 
diff --git a/setup.cfg b/setup.cfg
@@ -5,6 +5,6 @@
 url=https://gitlab.com/nolash/python-hexathon
 author_email=dev@holbrook.no
 name=hexathon
-version=0.1.4
+version=0.1.5
 description=Common and uncommon hex string operations
 author=Louis Holbrook
diff --git a/tests/test_basic.py b/tests/test_basic.py
@@ -41,9 +41,7 @@ class HexTest(unittest.TestCase):
 
     def test_compact(self):
         self.assertEqual(hexathon.compact('000abc'), 'abc')
-        self.assertEqual(hexathon.compact('0x000abc'), 'abc')
         self.assertEqual(hexathon.compact('abc'), 'abc')
-        self.assertEqual(hexathon.compact('0xabc'), 'abc')
 
 
 if __name__ == '__main__':