libasterix 0.36.0__tar.gz → 0.36.2__tar.gz

{libasterix-0.36.0 → libasterix-0.36.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: libasterix
-Version: 0.36.0
+Version: 0.36.2
 Summary: Asterix data processing library
 Author-email: Zoran Bošnjak <zoran.bosnjak@via.si>
 License-Expression: MIT

{libasterix-0.36.0 → libasterix-0.36.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "libasterix"
-version = "0.36.0"
+version = "0.36.2"
 authors = [
   { name="Zoran Bošnjak", email="zoran.bosnjak@via.si" },
 ]

{libasterix-0.36.0 → libasterix-0.36.2}/src/asterix/base.py

@@ -567,7 +567,7 @@ class Spare(ItemBase):
     def _parse(cls, bs: Bits) -> Union[ValueError, Tuple['Spare', Bits]]:
         n = cls.cv_bit_size
         if len(bs) < n:
-            return ValueError('overflow')
+            return ValueError('insufficient data, spare')
         a, b = bs.split_at(n)
         return (cls(a), b)
 
@@ -576,7 +576,9 @@ class Spare(ItemBase):
         return cls._parse(bs)
 
     @classmethod
-    def create(cls, arg: int) -> 'Spare':
+    def create(cls, arg: Union['Spare', int]) -> 'Spare':
+        if isinstance(arg, Spare):
+            return arg
         bs = Bits.from_uinteger(arg, cls.cv_bit_offset8, cls.cv_bit_size)
         return cls(bs)
 
@@ -660,7 +662,7 @@ class Element(Variation):
     def _parse(cls, bs: Bits) -> Union[ValueError, Tuple['Element', Bits]]:
         n = cls.cv_bit_size
         if len(bs) < n:
-            return ValueError('overflow')
+            return ValueError('insufficient data, element')
         a, b = bs.split_at(n)
         return (cls(a), b)
 
@@ -779,7 +781,7 @@ class Extended(Variation):
                 items1.append(items2.copy())
                 items2 = []
                 if len(remaining) < 1:
-                    return ValueError('overflow')
+                    return ValueError('insufficient data, extended')
                 fx, remaining = remaining.head_tail()
                 if not fx:
                     break
@@ -904,7 +906,7 @@ class Repetitive(Variation):
                     return result
                 obj, remaining = result
                 if len(remaining) < 1:
-                    return ValueError('overflow')
+                    return ValueError('insufficient data, repetitive')
                 fx, remaining = remaining.head_tail()
                 items.append(obj)
                 if not fx:
@@ -913,7 +915,7 @@ class Repetitive(Variation):
         else:
             rbs = rbs * 8
             if len(remaining) < rbs:
-                return ValueError('overflow')
+                return ValueError('insufficient data, repetitive')
             (cnt, remaining) = remaining.split_at(rbs)
             for i in range(cnt.to_uinteger()):
                 result = cls.cv_variation._parse(remaining)
@@ -959,12 +961,12 @@ class Explicit(Variation):
     @classmethod
     def _parse(cls, bs: Bits) -> Union[ValueError, Tuple['Explicit', Bits]]:
         if len(bs) < 8:
-            return ValueError('overflow')
+            return ValueError('insufficient data, explicit size')
         cnt = bs.take(8).to_uinteger() * 8
         if cnt == 0:
             return ValueError("Unexpected size of explicit item")
         if len(bs) < cnt:
-            return ValueError('overflow')
+            return ValueError('insufficient data, explicit data')
         a, b = bs.split_at(cnt)
         return (cls(a), b)
 
@@ -1015,7 +1017,7 @@ class Fspec:
             return ValueError('fspec too big')
         # 'i' contains the last byte, which must have FX=0
         if (i & 0x01):
-            return ValueError('overflow')
+            return ValueError('insufficient data, fspec')
         (a, b) = s.split_at(n * 8)
         return (cls(a), b)
 
@@ -1299,7 +1301,7 @@ class Record:
                 items3: List[Tuple[str, NonSpare]] = []
                 if len(remaining) < 8:
                     if pm == ParsingMode.StrictParsing:
-                        return ValueError('overflow')
+                        return ValueError('insufficient data, rfs')
                     else:
                         break
                 a, remaining = remaining.split_at(8)
@@ -1307,7 +1309,7 @@ class Record:
                 for j in range(n):
                     if len(remaining) < 8:
                         if pm == ParsingMode.StrictParsing:
-                            return ValueError('overflow')
+                            return ValueError('insufficient data, rfs')
                         else:
                             break
                     b, remaining = remaining.split_at(8)
@@ -1575,7 +1577,7 @@ class Expansion:
         if a == FspecFixed:
             n = b * 8
             if len(bs) < n:
-                return ValueError('overflow')
+                return ValueError('insufficient data, expansion')
             flags_bits, remaining = bs.split_at(n)
             flags = list(flags_bits)
         elif a == FspecFx:

{libasterix-0.36.0 → libasterix-0.36.2}/src/libasterix.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: libasterix
-Version: 0.36.0
+Version: 0.36.2
 Summary: Asterix data processing library
 Author-email: Zoran Bošnjak <zoran.bosnjak@via.si>
 License-Expression: MIT

{libasterix-0.36.0 → libasterix-0.36.2}/tests/test_asterix.py

@@ -7,6 +7,7 @@ from typing import *
 import pytest
 
 from . generated import *
+from . import sample_records
 
 
 def test_create() -> None:
@@ -1163,6 +1164,30 @@ def test_empty() -> None:
     rec2 = Cat_000_1_0.cv_record.create({})
     assert rec2.is_empty()
 
+def _test_roundtrip(num_records: int) -> None:
+    """For each specification and edition, create a few records,
+    encode, decode, expect the same result."""
+
+    def check(Spec: AstCat, r: Record) -> None:
+        records = list([r]*num_records)
+        bs = b''.join([r.unparse().to_bytes() for r in records])
+        if m_name is None:
+            result = Spec.cv_uap.parse(Bits.from_bytes(bs)) # type: ignore
+        else:
+            result = Spec.cv_uap.parse(m_name, Bits.from_bytes(bs)) # type: ignore
+        assert not isinstance(result, ValueError)
+        bs2 = b''.join([r.unparse().to_bytes() for r in result])
+        assert bs2 == bs
+
+    for lst in manifest['CATS'].values(): # type: ignore
+        for Spec in lst:
+            for (m_name, r1, r2) in sample_records(Spec):
+                check(Spec, r1)
+                check(Spec, r2)
+
+def test_roundtrip() -> None:
+    _test_roundtrip(5)
+
 # python specific tests