Update to kaitaistruct 0.11 (#1518)

Add support for version 0.11 of the kaitaistruct python runtime.  Starting from v0.11, KaitaiStream::size() calls seek() with whence=SEEK_END to determine the amount of remaining data.  This commit rolls back the changes from cd5403c and updates the implementation of BufferKaitaiStruct::IOBytes::seek() to support the whence argument.

Author: dgburr

kaitai/python/kaitai_sbp/parse_utils.py

@@ -6,6 +6,7 @@
 import binascii
 import sys
 import base64
+from io import SEEK_SET, SEEK_CUR, SEEK_END
 
 
 SBP_HEADER_LEN = 6
@@ -28,8 +29,14 @@ def read(self, size=-1):
             self.pos += size
             return buf
 
-        def seek(self, pos):
-            self.pos = pos
+        def seek(self, offset, whence=SEEK_SET):
+            if whence == SEEK_SET:
+                self.pos = offset
+            elif whence == SEEK_CUR:
+                self.pos += offset
+            elif whence == SEEK_END:
+                self.pos = len(self.buf) + offset
+            return self.pos
 
         def tell(self):
             return self.pos

kaitai/python/kaitai_sbp/tests/tox.ini

@@ -6,7 +6,7 @@ envlist = py
 [testenv]
 deps =
   pytest
-  kaitaistruct==0.10.0
+  kaitaistruct
   construct
   python-rapidjson
 changedir = ../../../..

python/Dockerfile.benchmark

@@ -19,8 +19,7 @@ ADD . /work
 
 RUN pip3 install -r /work/setup_requirements.txt
 RUN pip3 install -r /work/requirements.txt
-# keep in sync with above
-RUN pip3 install kaitaistruct==0.10.0
+RUN pip3 install kaitaistruct
 
 RUN pip3 install wheel setuptools
 

test_data/benchmark_main.py

@@ -11,18 +11,18 @@
 
 # How much faster Rust should be than other implementations
 RATIOS_SBP2JSON = {
-    "haskell": 3.2,
-    "python": 23.38,
+    "haskell": 4.02,
+    "python": 18.7,
     "kaitai_python": 5.00,
-    "kaitai_perl": 20,
+    "kaitai_perl": 24.05,
 }
 
 RATIOS_JSON2SBP = {
     "haskell": 2.05,
 }
 
 RATIOS_JSON2JSON = {
-    "haskell": 2.40,
+    "haskell": 3.12,
 }
 
 FAILED = [False]