dissect.btrfs 1.9.dev1__tar.gz → 1.9.dev2__tar.gz

{dissect_btrfs-1.9.dev1 → dissect_btrfs-1.9.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.btrfs
-Version: 1.9.dev1
+Version: 1.9.dev2
 Summary: A Dissect module implementing a parser for the Btrfs file system, a commonly used Linux filesystem.
 Author-email: Dissect Team <dissect@fox-it.com>
 License-Expression: AGPL-3.0-or-later
@@ -22,15 +22,13 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: COPYRIGHT
 Requires-Dist: dissect.cstruct<5,>=4
-Requires-Dist: dissect.util<4,>=3.22.dev
+Requires-Dist: dissect.util<4,>=3.23.dev
 Provides-Extra: full
 Requires-Dist: zstandard; extra == "full"
-Provides-Extra: gcrc32
-Requires-Dist: google-crc32c; extra == "gcrc32"
 Provides-Extra: dev
 Requires-Dist: dissect.btrfs[full]; extra == "dev"
 Requires-Dist: dissect.cstruct<5.0.dev,>=4.0.dev; extra == "dev"
-Requires-Dist: dissect.util<4.0.dev,>=3.22.dev; extra == "dev"
+Requires-Dist: dissect.util<4.0.dev,>=3.23.dev; extra == "dev"
 Dynamic: license-file
 
 # dissect.btrfs

{dissect_btrfs-1.9.dev1 → dissect_btrfs-1.9.dev2}/dissect/btrfs/btrfs.py

@@ -12,18 +12,9 @@ from typing import TYPE_CHECKING, BinaryIO
 from uuid import UUID
 
 from dissect.util import ts
+from dissect.util.hash import crc32c
 from dissect.util.stream import BufferedStream
 
-try:
-    import warnings
-
-    # If the C extension is not available, google-crc32c will display a warning
-    with warnings.catch_warnings():
-        warnings.simplefilter("ignore")
-        from google_crc32c import extend as crc32c
-except ImportError:
-    from dissect.util.hash.crc32c import update as crc32c
-
 from dissect.btrfs.c_btrfs import FT_MAP, c_btrfs
 from dissect.btrfs.exceptions import (
     Error,
@@ -272,7 +263,7 @@ class Subvolume:
             # Btrfs uses an initial CRC of `(u32)~1`, which is effectively the same as 1 XOR 0xFFFFFFFF
             # We still need to invert the XOR of the result though
             # https://stackoverflow.com/a/40433980
-            part_hash = (crc32c(1, part) ^ 0xFFFFFFFF) & 0xFFFFFFFF
+            part_hash = (crc32c.update(1, part) ^ 0xFFFFFFFF) & 0xFFFFFFFF
             try:
                 _, data = subvolume.tree.find(node.inum, c_btrfs.BTRFS_DIR_ITEM_KEY, part_hash)
             except KeyError:

{dissect_btrfs-1.9.dev1 → dissect_btrfs-1.9.dev2}/dissect.btrfs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.btrfs
-Version: 1.9.dev1
+Version: 1.9.dev2
 Summary: A Dissect module implementing a parser for the Btrfs file system, a commonly used Linux filesystem.
 Author-email: Dissect Team <dissect@fox-it.com>
 License-Expression: AGPL-3.0-or-later
@@ -22,15 +22,13 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: COPYRIGHT
 Requires-Dist: dissect.cstruct<5,>=4
-Requires-Dist: dissect.util<4,>=3.22.dev
+Requires-Dist: dissect.util<4,>=3.23.dev
 Provides-Extra: full
 Requires-Dist: zstandard; extra == "full"
-Provides-Extra: gcrc32
-Requires-Dist: google-crc32c; extra == "gcrc32"
 Provides-Extra: dev
 Requires-Dist: dissect.btrfs[full]; extra == "dev"
 Requires-Dist: dissect.cstruct<5.0.dev,>=4.0.dev; extra == "dev"
-Requires-Dist: dissect.util<4.0.dev,>=3.22.dev; extra == "dev"
+Requires-Dist: dissect.util<4.0.dev,>=3.23.dev; extra == "dev"
 Dynamic: license-file
 
 # dissect.btrfs

{dissect_btrfs-1.9.dev1 → dissect_btrfs-1.9.dev2}/dissect.btrfs.egg-info/requires.txt

@@ -1,13 +1,10 @@
 dissect.cstruct<5,>=4
-dissect.util<4,>=3.22.dev
+dissect.util<4,>=3.23.dev
 
 [dev]
 dissect.btrfs[full]
 dissect.cstruct<5.0.dev,>=4.0.dev
-dissect.util<4.0.dev,>=3.22.dev
+dissect.util<4.0.dev,>=3.23.dev
 
 [full]
 zstandard
-
-[gcrc32]
-google-crc32c

{dissect_btrfs-1.9.dev1 → dissect_btrfs-1.9.dev2}/pyproject.toml

@@ -26,7 +26,7 @@ classifiers = [
 ]
 dependencies = [
     "dissect.cstruct>=4,<5",
-    "dissect.util>=3.22.dev,<4", #TODO: Remove once we release a new dissect version
+    "dissect.util>=3.23.dev,<4", #TODO: Remove once we release a new dissect version
 ]
 dynamic = ["version"]
 
@@ -39,13 +39,10 @@ repository = "https://github.com/fox-it/dissect.btrfs"
 full = [
     "zstandard",
 ]
-gcrc32 = [
-    "google-crc32c",
-]
 dev = [
     "dissect.btrfs[full]",
     "dissect.cstruct>=4.0.dev,<5.0.dev",
-    "dissect.util>=3.22.dev,<4.0.dev", #TODO: Remove once we release a new dissect version
+    "dissect.util>=3.23.dev,<4.0.dev", #TODO: Remove once we release a new dissect version
 ]
 
 [dependency-groups]