Merge pull request #667 from onekey-sec/666-python-312

Add Python 3.12 to test matrix.

Author: vlaci

.github/workflows/run-tests.yml

@@ -52,7 +52,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
     steps:
       - name: Checkout source code
         uses: actions/checkout@v3

poetry.lock

@@ -40,6 +40,7 @@ pyright = "^1.1.307"
 pre-commit = "^2.15.0"
 pytest-cov = "^3.0.0"
 ruff = "^0.0.259"
+pyyaml = "^6.0.1"
 
 [tool.poetry.group.docs]
 optional = true

pyproject.toml

@@ -1,11 +1,11 @@
 #!/usr/bin/env python3
 import atexit
 import sys
+from importlib.metadata import version
 from pathlib import Path
 from typing import Dict, Iterable, List, Optional, Tuple
 
 import click
-import pkg_resources
 from rich.console import Console
 from rich.panel import Panel
 from rich.table import Table
@@ -36,7 +36,7 @@ def restore_cursor():
 
 
 def get_version():
-    return pkg_resources.get_distribution("unblob").version
+    return version("unblob")
 
 
 def show_version(

unblob/cli.py

@@ -1,4 +1,5 @@
 import gzip
+import zlib
 
 from ...file_utils import DEFAULT_BUFSIZE
 
@@ -10,14 +11,19 @@ def read_header(self):
         self._init_read()
         return self._read_gzip_header()
 
+    def _add_read_data(self, data):
+        self._crc = zlib.crc32(data, self._crc)
+        self._stream_size = self._stream_size + len(data)
+
     def read(self):
         uncompress = b""
 
         while True:
             buf = self._fp.read(DEFAULT_BUFSIZE)
 
             uncompress = self._decompressor.decompress(buf, DEFAULT_BUFSIZE)
-            self._fp.prepend(self._decompressor.unconsumed_tail)
+            if hasattr(self._decompressor, "unconsumed_tail"):
+                self._fp.prepend(self._decompressor.unconsumed_tail)
             self._fp.prepend(self._decompressor.unused_data)
 
             if uncompress != b"":