Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 7 additions & 18 deletions fsspec/compression.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
"""Helper functions for a standard streaming compression API"""

import sys
from zipfile import ZipFile

import fsspec.utils
Expand Down Expand Up @@ -155,26 +156,14 @@ def _fetch_range(self, start, end):
pass

try:
# zstd in the standard library for python >= 3.14
from compression.zstd import ZstdFile

register_compression("zstd", ZstdFile, "zst")
if sys.version_info >= (3, 14):
from compression import zstd
else:
from backports import zstd

register_compression("zstd", zstd.ZstdFile, "zst")
except ImportError:
try:
import zstandard as zstd

def zstandard_file(infile, mode="rb"):
if "r" in mode:
cctx = zstd.ZstdDecompressor()
return cctx.stream_reader(infile)
else:
cctx = zstd.ZstdCompressor(level=10)
return cctx.stream_writer(infile)

register_compression("zstd", zstandard_file, "zst")
except ImportError:
pass
pass


def available_compressions():
Expand Down
8 changes: 4 additions & 4 deletions fsspec/tests/test_compression.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import pathlib
import sys

import pytest

Expand Down Expand Up @@ -95,11 +96,10 @@ def test_zstd_compression(tmpdir):
"""Infer zstd compression for .zst files if zstandard is available."""
tmp_path = pathlib.Path(str(tmpdir))

try:
# zstd in the standard library for python >= 3.14
if sys.version_info >= (3, 14):
from compression import zstd
except ImportError:
zstd = pytest.importorskip("zstandard")
else:
zstd = pytest.importorskip("backports.zstd")

tmp_path.mkdir(exist_ok=True)

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ test_full = [
'tqdm',
'urllib3',
'zarr',
'zstandard; python_version < "3.14"',
'backports.zstd; python_version < "3.14"',
]
test_downstream = [
"dask[dataframe,test]",
Expand Down
Loading