Skip to content

Fix #65: support new buffer API #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
martindurant merged 2 commits into from
Jul 2, 2018
Merged

Fix #65: support new buffer API #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29847ae
Fix #65: support new buffer API
pitrou Jun 29, 2018
6e5d441
Skip tests on PyPy
pitrou Jun 29, 2018
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
43 changes: 26 additions & 17 deletions snappy/snappymodule.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,29 +91,30 @@ snappy_strerror(snappy_status status)
static PyObject *
snappy__compress(PyObject *self, PyObject *args)
{
const char * input;
int input_size;
Py_buffer input;
size_t compressed_size, actual_size;
PyObject * result;
snappy_status status;

#if PY_MAJOR_VERSION >= 3
if (!PyArg_ParseTuple(args, "y#", &input, &input_size))
if (!PyArg_ParseTuple(args, "y*", &input))
#else
if (!PyArg_ParseTuple(args, "s#", &input, &input_size))
if (!PyArg_ParseTuple(args, "s*", &input))
#endif
return NULL;

// Ask for the max size of the compressed object.
compressed_size = snappy_max_compressed_length(input_size);
compressed_size = snappy_max_compressed_length(input.len);

// Make snappy compression
result = PyBytes_FromStringAndSize(NULL, compressed_size);
if (result) {
actual_size = compressed_size;
Py_BEGIN_ALLOW_THREADS
status = snappy_compress(input, input_size, PyBytes_AS_STRING(result), &actual_size);
status = snappy_compress((const char *) input.buf, input.len,
PyBytes_AS_STRING(result), &actual_size);
Py_END_ALLOW_THREADS
PyBuffer_Release(&input);
if (status == SNAPPY_OK) {
return maybe_resize(result, compressed_size, actual_size);
}
Expand All @@ -123,30 +124,33 @@ snappy__compress(PyObject *self, PyObject *args)
PyErr_Format(SnappyCompressError,
"Error while compressing: %s", snappy_strerror(status));
}

PyErr_Format(SnappyCompressError,
"Error while compressing: unable to acquire output string");
else {
PyBuffer_Release(&input);
PyErr_Format(SnappyCompressError,
"Error while compressing: unable to acquire output string");
}
return NULL;
}

static PyObject *
snappy__uncompress(PyObject *self, PyObject *args)
{
const char * compressed;
int comp_size;
Py_buffer compressed;
size_t uncomp_size, actual_size;
PyObject * result;
snappy_status status;

#if PY_MAJOR_VERSION >=3
if (!PyArg_ParseTuple(args, "y#", &compressed, &comp_size))
if (!PyArg_ParseTuple(args, "y*", &compressed))
#else
if (!PyArg_ParseTuple(args, "s#", &compressed, &comp_size))
if (!PyArg_ParseTuple(args, "s*", &compressed))
#endif
return NULL;

status = snappy_uncompressed_length(compressed, comp_size, &uncomp_size);
status = snappy_uncompressed_length((const char *) compressed.buf, compressed.len,
&uncomp_size);
if (status != SNAPPY_OK) {
PyBuffer_Release(&compressed);
PyErr_SetString(SnappyCompressedLengthError,
"Can not calculate uncompressed length");
return NULL;
Expand All @@ -156,17 +160,22 @@ snappy__uncompress(PyObject *self, PyObject *args)
if (result) {
actual_size = uncomp_size;
Py_BEGIN_ALLOW_THREADS
status = snappy_uncompress(compressed, comp_size, PyBytes_AS_STRING(result), &actual_size);
status = snappy_uncompress((const char *) compressed.buf, compressed.len,
PyBytes_AS_STRING(result), &actual_size);
Py_END_ALLOW_THREADS
PyBuffer_Release(&compressed);
if (SNAPPY_OK == status) {
return maybe_resize(result, uncomp_size, actual_size);
}
else {
Py_DECREF(result);
PyErr_Format(SnappyUncompressError,
"Error while decompressing: %s", snappy_strerror(status));
}
}
PyErr_Format(SnappyUncompressError,
"Error while decompressing: %s", snappy_strerror(status));
else {
PyBuffer_Release(&compressed);
}
return NULL;
}

Expand Down
15 changes: 15 additions & 0 deletions test_snappy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#

import os
import platform
import sys
import random
import snappy
Expand Down Expand Up @@ -77,6 +78,20 @@ def test_big_string(self):
compressed = snappy.compress(text)
self.assertEqual(text, snappy.decompress(compressed))

if platform.python_implementation() == 'CPython':
def test_compress_memoryview(self):
data = b"hello world!"
expected = snappy.compress(data)
actual = snappy.compress(memoryview(data))
self.assertEqual(actual, expected)

def test_decompress_memoryview(self):
data = b"hello world!"
compressed = snappy.compress(data)
expected = snappy.uncompress(compressed)
actual = snappy.uncompress(memoryview(compressed))
self.assertEqual(actual, expected)


class SnappyValidBufferTest(TestCase):

Expand Down