hexio 0.0.2__tar.gz → 0.0.4__tar.gz

{hexio-0.0.2 → hexio-0.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hexio
-Version: 0.0.2
+Version: 0.0.4
 Summary: Utility package to handle I/O of hex-compatible data.
 License-Expression: GPL-3.0-or-later
 Project-URL: Homepage, https://github.com/valbucci/hexio

{hexio-0.0.2 → hexio-0.0.4}/hexio/__init__.py

@@ -141,14 +141,6 @@ class HexStr(str):
             logger.error(f"Tried to create {cls.__name__} from object: {value!r}")
             raise TypeError(f"Unsupported type: {type(value)}")
 
-    def __len__(self) -> int:
-        return len(str(self))
-
-    def __str__(self) -> str:
-        return super().__str__().upper()
-
-    def __int__(self) -> int:
-        return int(self, 16)
 
     def __xor__(self, other: HexValue) -> Self:
         if len(self) != len(HexStr(other)):
@@ -165,16 +157,30 @@ class HexStr(str):
             logger.debug(f"HexStr length mismatch: {len(self)} != {len(HexStr(other))}")
         return self.__class__(int(self) | int(HexStr(other)))
 
+
+    def __str__(self) -> str:
+            return super().__str__().upper()
+
+    def __repr__(self) -> str:
+        return f"{self.__class__.__name__}('{super().__str__()}')"
+
+    def __int__(self) -> int:
+        return int(self, 16)
+    
     def __bytes__(self) -> bytes:
         if len(self) % 2 == 1:
             return bytes.fromhex(f"0{self}")
         return bytes.fromhex(self)
+    
+    def __len__(self) -> int:
+            return len(self.__str__())
 
     def __index__(self) -> int:
         return self.__int__()
+    
+    def __hash__(self) -> int:
+        return hash(self.__str__())
 
-    def __repr__(self) -> str:
-        return f"{self.__class__.__name__}('{super().__str__()}')"
 
     def __eq__(self, other: object) -> bool:
         if isinstance(other, HexStr):
@@ -219,9 +225,17 @@ class HexStr(str):
 
     def __ge__(self, other: object) -> bool:
         return not self.__lt__(other)
+    
+    
+    def __getitem__(self, key) -> Self:
+        return self.__class__(self.__str__()[key])
+
+    def __setitem__(self, key, value) -> None:
+        raise TypeError("'HexStr' object does not support item assignment")
+    
+    def __delitem__(self, key) -> None:
+        raise TypeError("'HexStr' object does not support item deletion")
 
-    def __hash__(self) -> int:
-        return hash(self.__str__())
 
     @classmethod
     def from_bytes(cls, value: bytes) -> Self:
@@ -295,7 +309,16 @@ class HexInt(int):
         return hash(self.__int__())
 
     def __bytes__(self) -> bytes:
-        return self.to_bytes()
+        bit_length = self.bit_length()
+        byte_length = bit_length // 8
+        if bit_length % 8 != 0:
+            byte_length = byte_length + 1
+
+        return self.to_bytes(
+            length=byte_length,
+            byteorder="big",
+            signed=False
+        )
 
     def __str__(self) -> str:
         return f"0x{self:x}"
@@ -337,6 +360,13 @@ class HexInt(int):
     def __sub__(self, other: HexValue) -> Self:
         other = hexvalue_to_int(other)
         return self.__class__(int(self) - other)
+    
+    def __mul__(self, other: HexValue) -> Self:
+        other = hexvalue_to_int(other)
+        return self.__class__(int(self) * other)
+    
+    def __rmul__(self, other: HexValue) -> Self:
+        return self.__mul__(other)
 
     def __xor__(self, other: HexValue) -> Self:
         other = hexvalue_to_int(other)

{hexio-0.0.2 → hexio-0.0.4}/hexio.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hexio
-Version: 0.0.2
+Version: 0.0.4
 Summary: Utility package to handle I/O of hex-compatible data.
 License-Expression: GPL-3.0-or-later
 Project-URL: Homepage, https://github.com/valbucci/hexio

{hexio-0.0.2 → hexio-0.0.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "hexio"
-version = "0.0.2"
+version = "0.0.4"
 description = "Utility package to handle I/O of hex-compatible data."
 requires-python = ">=3.9"
 dependencies = [

{hexio-0.0.2 → hexio-0.0.4}/tests/test_hex.py

@@ -131,6 +131,11 @@ class TestHexStr:
         assert HexStr("0x1234") | HexStr("01234") == HexStr("0x1234")
 
         assert HexStr("0xffffff") | 0xAA0011 == HexStr("0xffffff")
+        
+    def test_slice(self):
+        example = HexStr("1234")
+        assert example[2:] == "34"
+        assert example[2:] == HexStr("34")
 
 
 class TestNibble:
@@ -178,6 +183,23 @@ class TestNibble:
 
 
 class TestHexInt:
+    
+    def test_bytes(self):
+        big_int = HexInt(0xffffffffff)
+        big_bytes = bytes(big_int)
+        big_hex = hex(HexInt(big_bytes))
+        assert big_hex == "0xffffffffff"
+        
+        # Make sure alignment works
+        big_int2 = big_int * 2 # this should add one bit
+        assert isinstance(big_int2, HexInt)
+        assert big_int2.bit_length() == big_int.bit_length() + 1
+        assert big_int2.bit_length() % 8 == 1
+        big_bytes2 = bytes(big_int2)
+        big_hex2 = hex(HexInt(big_bytes2))
+        assert big_hex2 == "0x1fffffffffe"
+        assert len(big_bytes2) == len(big_bytes) + 1
+    
     def test_xor(self):
         assert HexInt("0x1234") ^ HexInt("0x1235") == HexInt("0x0001")
         assert HexInt("0x1234") ^ HexInt("0x1233") == HexInt("0x0007")
@@ -204,7 +226,7 @@ class TestHexOffset:
         assert HexOffset("1234") == HexOffset(HexStr("0x00000000000001234"))
         assert HexOffset("1234") == HexOffset(b"\x12\x34")
 
-        with pytest.raises(ValueError):
+        with pytest.raises(TypeError):
             _ = HexOffset(None)  # type: ignore
         with pytest.raises(ValueError):
             _ = HexOffset("g")