From c6596f948d2aec99c3c2ad45a62bb89bf20ff32a Mon Sep 17 00:00:00 2001 From: Jan Willem Brandenburg Date: Fri, 19 Jul 2024 14:12:39 +0200 Subject: [PATCH] Move the selection between the native and Python implementations of lzo and lz4 to dissect.util --- dissect/btrfs/stream.py | 6 +----- pyproject.toml | 3 --- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/dissect/btrfs/stream.py b/dissect/btrfs/stream.py index 4d3bee2..b2c8998 100644 --- a/dissect/btrfs/stream.py +++ b/dissect/btrfs/stream.py @@ -6,13 +6,9 @@ from typing import TYPE_CHECKING, BinaryIO, NamedTuple from uuid import UUID +from dissect.util import lzo from dissect.util.stream import AlignedStream -try: - import lzo -except ImportError: - from dissect.util.compression import lzo - try: import zstandard diff --git a/pyproject.toml b/pyproject.toml index ae7e002..a3c29de 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,9 +37,6 @@ repository = "https://github.com/fox-it/dissect.btrfs" [project.optional-dependencies] full = [ - # There are no Windows PyPy wheels available for python-lzo - # So we use a pure python fallback for it. - "python-lzo; platform_system != 'Windows' or platform_python_implementation != 'PyPy'", "zstandard", ] gcrc32 = [