Merge pull request #35 from nedap/main-fix-base64

Fix base64 constructor in TagEncodable class
nedap · Feb 4, 2025 · 4fbb8b0 · 4fbb8b0
2 parents 16b4312 + 79cd731
commit 4fbb8b0
Show file tree

Hide file tree

Showing 4 changed files with 165 additions and 55 deletions.
diff --git a/epcpy/epc_schemes/base_scheme.py b/epcpy/epc_schemes/base_scheme.py
@@ -4,7 +4,7 @@
 from enum import Enum
 from typing import Dict, Optional, Type, TypeVar
 
-from epcpy.utils.common import ConvertException, hex_to_base64, hex_to_binary
+from epcpy.utils.common import ConvertException, base64_to_hex, hex_to_base64, hex_to_binary
 from epcpy.utils.regex import TAG_URI
 
 T_EPCScheme = TypeVar("T_EPCScheme", bound="EPCScheme")
@@ -164,7 +164,7 @@ def from_base64(
         Returns:
             TagEncodable: Instance of TagEncodable class
         """
-        return cls.from_binary(hex_to_base64(tag_base64_string))
+        return cls.from_hex(base64_to_hex(tag_base64_string))
 
     @classmethod
     def from_tag_uri(

diff --git a/poetry.lock b/poetry.lock