Skip to content

Commit d882cce

Browse files
committed
fix
1 parent 817675a commit d882cce

2 files changed

Lines changed: 12 additions & 14 deletions

File tree

src/snappy/snappy_formats.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ def guess_format_by_header(fin):
9696

9797
def get_decompress_function(specified_format, fin):
9898
if specified_format == "auto":
99-
decompress_func, read_chunk = guess_format_by_header(fin)
100-
return decompress_func, read_chunk
101-
return _DECOMPRESS_METHODS[specified_format], None
99+
format, decompress_func = guess_format_by_header(fin)
100+
return decompress_func
101+
return _DECOMPRESS_METHODS[specified_format]
102102

103103

104104
def get_compress_function(specified_format):

test_formats.py

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@
33
from unittest import TestCase
44

55
from snappy import snappy_formats as formats
6-
from snappy.snappy import _CHUNK_MAX, UncompressError
76

87

98
class TestFormatBase(TestCase):
10-
compress_format = formats.FORMAT_AUTO
11-
decompress_format = formats.FORMAT_AUTO
9+
compress_format = "auto"
10+
decompress_format = "auto"
1211
success = True
1312

1413
def runTest(self):
@@ -18,34 +17,33 @@ def runTest(self):
1817
compressed_stream = io.BytesIO()
1918
compress_func(instream, compressed_stream)
2019
compressed_stream.seek(0)
21-
decompress_func, read_chunk = formats.get_decompress_function(
20+
decompress_func = formats.get_decompress_function(
2221
self.decompress_format, compressed_stream
2322
)
2423
decompressed_stream = io.BytesIO()
2524
decompress_func(
2625
compressed_stream,
2726
decompressed_stream,
28-
start_chunk=read_chunk
2927
)
3028
decompressed_stream.seek(0)
3129
self.assertEqual(data, decompressed_stream.read())
3230

3331

3432
class TestFormatFramingFraming(TestFormatBase):
35-
compress_format = formats.FRAMING_FORMAT
36-
decompress_format = formats.FRAMING_FORMAT
33+
compress_format = "framing"
34+
decompress_format = "framing"
3735
success = True
3836

3937

4038
class TestFormatFramingAuto(TestFormatBase):
41-
compress_format = formats.FRAMING_FORMAT
42-
decompress_format = formats.FORMAT_AUTO
39+
compress_format = "framing"
40+
decompress_format = "auto"
4341
success = True
4442

4543

4644
class TestFormatAutoFraming(TestFormatBase):
47-
compress_format = formats.FORMAT_AUTO
48-
decompress_format = formats.FRAMING_FORMAT
45+
compress_format = "auto"
46+
decompress_format = "framing"
4947
success = True
5048

5149

0 commit comments

Comments
 (0)