Use compression.zstd (PEP-784)

Author: Rogdham

kombu/compression.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import sys
 import zlib
 
 from kombu.utils.encoding import ensure_bytes
@@ -104,18 +105,13 @@ def decompress(body, content_type):
              'application/x-lzma', aliases=['lzma', 'xz'])
 
 try:
-    import zstandard as zstd
+    if sys.version_info >= (3, 14):
+        from compression import zstd
+    else:
+        from backports import zstd
 except ImportError:  # pragma: no cover
-    pass
+    pass  # no zstd support
 else:
-    def zstd_compress(body):
-        c = zstd.ZstdCompressor()
-        return c.compress(body)
-
-    def zstd_decompress(body):
-        d = zstd.ZstdDecompressor()
-        return d.decompress(body)
-
-    register(zstd_compress,
-             zstd_decompress,
+    register(zstd.compress,
+             zstd.decompress,
              'application/zstd', aliases=['zstd', 'zstandard'])

requirements/extras/zstd.txt

@@ -1 +1 @@
-zstandard==0.25.0
+backports.zstd==1.0.0; python_version<'3.14'

t/unit/test_compression.py

@@ -6,6 +6,16 @@
 
 from kombu import compression
 
+try:
+    if sys.version_info >= (3, 14):
+        from compression import zstd
+    else:
+        from backports import zstd
+except ImportError:
+    _HAS_ZSTD = False
+else:
+    _HAS_ZSTD = True
+
 
 class test_compression:
 
@@ -26,9 +36,8 @@ def test_encoders__lzma(self):
 
         assert 'application/x-lzma' in compression.encoders()
 
+    @pytest.mark.skipif(not _HAS_ZSTD, reason="requires zstd support")
     def test_encoders__zstd(self):
-        pytest.importorskip('zstandard')
-
         assert 'application/zstd' in compression.encoders()
 
     def test_compress__decompress__zlib(self):
@@ -63,9 +72,8 @@ def test_compress__decompress__lzma(self):
         d = compression.decompress(c, ctype)
         assert d == text
 
+    @pytest.mark.skipif(not _HAS_ZSTD, reason="requires zstd support")
     def test_compress__decompress__zstd(self):
-        pytest.importorskip('zstandard')
-
         text = b'The Brown Quick Fox Over The Lazy Dog Jumps'
         c, ctype = compression.compress(text, 'zstd')
         assert text != c