Skip to content
Open
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
13 changes: 10 additions & 3 deletions c-ext/compressionreader.c
Original file line number Diff line number Diff line change
Expand Up @@ -112,15 +112,22 @@ static PyObject *compressionreader_flush(PyObject *self) {
}

static PyObject *compressionreader_close(ZstdCompressionReader *self) {
int hasClose;

if (self->closed) {
Py_RETURN_NONE;
}

self->closed = 1;

if (self->closefd && self->reader != NULL &&
PyObject_HasAttrString(self->reader, "close")) {
return PyObject_CallMethod(self->reader, "close", NULL);
if (self->closefd && self->reader != NULL) {
hasClose = PyObject_HasAttrStringWithError(self->reader, "close");
if (hasClose < 0) {
return NULL;
}
if (hasClose) {
return PyObject_CallMethod(self->reader, "close", NULL);
}
}

Py_RETURN_NONE;
Expand Down
27 changes: 21 additions & 6 deletions c-ext/compressionwriter.c
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,8 @@ static PyObject *ZstdCompressionWriter_flush(ZstdCompressionWriter *self,
PyObject *args, PyObject *kwargs) {
static char *kwlist[] = {"flush_mode", NULL};

int hasFlush;

size_t zresult;
ZSTD_inBuffer input;
PyObject *res;
Expand Down Expand Up @@ -197,18 +199,25 @@ static PyObject *ZstdCompressionWriter_flush(ZstdCompressionWriter *self,
}
}

if (!self->closing && PyObject_HasAttrString(self->writer, "flush")) {
res = PyObject_CallMethod(self->writer, "flush", NULL);
if (NULL == res) {
if (!self->closing) {
hasFlush = PyObject_HasAttrStringWithError(self->writer, "flush");
if (hasFlush < 0) {
return NULL;
}
Py_XDECREF(res);
if (hasFlush) {
res = PyObject_CallMethod(self->writer, "flush", NULL);
if (NULL == res) {
return NULL;
}
Py_XDECREF(res);
}
}

return PyLong_FromSsize_t(totalWrite);
}

static PyObject *ZstdCompressionWriter_close(ZstdCompressionWriter *self) {
int hasClose;
PyObject *result;

if (self->closed) {
Expand All @@ -225,8 +234,14 @@ static PyObject *ZstdCompressionWriter_close(ZstdCompressionWriter *self) {
}

/* Call close on underlying stream as well. */
if (self->closefd && PyObject_HasAttrString(self->writer, "close")) {
return PyObject_CallMethod(self->writer, "close", NULL);
if (self->closefd) {
hasClose = PyObject_HasAttrStringWithError(self->writer, "close");
if (hasClose < 0) {
return NULL;
}
if (hasClose) {
return PyObject_CallMethod(self->writer, "close", NULL);
}
}

Py_RETURN_NONE;
Expand Down
13 changes: 10 additions & 3 deletions c-ext/decompressionreader.c
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,22 @@ static PyObject *decompressionreader_seekable(PyObject *self) {
}

static PyObject *decompressionreader_close(ZstdDecompressionReader *self) {
int hasClose;

if (self->closed) {
Py_RETURN_NONE;
}

self->closed = 1;

if (self->closefd && self->reader != NULL &&
PyObject_HasAttrString(self->reader, "close")) {
return PyObject_CallMethod(self->reader, "close", NULL);
if (self->closefd && self->reader != NULL) {
hasClose = PyObject_HasAttrStringWithError(self->reader, "close");
if (hasClose < 0) {
return NULL;
}
if (hasClose) {
return PyObject_CallMethod(self->reader, "close", NULL);
}
}

Py_RETURN_NONE;
Expand Down
28 changes: 21 additions & 7 deletions c-ext/decompressionwriter.c
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ static PyObject *ZstdDecompressionWriter_write(ZstdDecompressionWriter *self,
}

static PyObject *ZstdDecompressionWriter_close(ZstdDecompressionWriter *self) {
int hasClose;
PyObject *result;

if (self->closed) {
Expand All @@ -140,8 +141,14 @@ static PyObject *ZstdDecompressionWriter_close(ZstdDecompressionWriter *self) {
}

/* Call close on underlying stream as well. */
if (self->closefd && PyObject_HasAttrString(self->writer, "close")) {
return PyObject_CallMethod(self->writer, "close", NULL);
if (self->closefd) {
hasClose = PyObject_HasAttrStringWithError(self->writer, "close");
if (hasClose < 0) {
return NULL;
}
if (hasClose) {
return PyObject_CallMethod(self->writer, "close", NULL);
}
}

Py_RETURN_NONE;
Expand All @@ -159,17 +166,24 @@ static PyObject *ZstdDecompressionWriter_fileno(ZstdDecompressionWriter *self) {
}

static PyObject *ZstdDecompressionWriter_flush(ZstdDecompressionWriter *self) {
int hasFlush;

if (self->closed) {
PyErr_SetString(PyExc_ValueError, "stream is closed");
return NULL;
}

if (!self->closing && PyObject_HasAttrString(self->writer, "flush")) {
return PyObject_CallMethod(self->writer, "flush", NULL);
}
else {
Py_RETURN_NONE;
if (!self->closing) {
hasFlush = PyObject_HasAttrStringWithError(self->writer, "flush");
if (hasFlush < 0) {
return NULL;
}
if (hasFlush) {
return PyObject_CallMethod(self->writer, "flush", NULL);
}
}

Py_RETURN_NONE;
}

static PyObject *ZstdDecompressionWriter_iter(PyObject *self) {
Expand Down
33 changes: 33 additions & 0 deletions tests/test_compressor_stream_reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,39 @@


class TestCompressor_stream_reader(unittest.TestCase):
def test_close_attribute_lookup_error(self):
class Stream:
def read(self, size):
return b""

def write(self, data):
return len(data)

def __getattr__(self, name):
if name == "close":
raise exception("close lookup failed")
raise AttributeError(name)

for exception in (MemoryError, KeyboardInterrupt):
with self.subTest(exception=exception):
stream = zstd.ZstdCompressor().stream_reader(Stream())
with self.assertRaisesRegex(exception, "close lookup failed"):
stream.close()
self.assertTrue(stream.closed)
stream.close()

def test_close_attribute_absent(self):
class Stream:
def read(self, size):
return b""

def write(self, data):
return len(data)

stream = zstd.ZstdCompressor().stream_reader(Stream())
stream.close()
self.assertTrue(stream.closed)

def test_context_manager(self):
cctx = zstd.ZstdCompressor()

Expand Down
59 changes: 59 additions & 0 deletions tests/test_compressor_stream_writer.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,65 @@


class TestCompressor_stream_writer(unittest.TestCase):
def test_close_attribute_lookup_error(self):
class Stream:
def read(self, size):
return b""

def write(self, data):
return len(data)

def __getattr__(self, name):
if name == "close":
raise exception("close lookup failed")
raise AttributeError(name)

for exception in (MemoryError, KeyboardInterrupt):
with self.subTest(exception=exception):
stream = zstd.ZstdCompressor().stream_writer(Stream())
with self.assertRaisesRegex(exception, "close lookup failed"):
stream.close()
self.assertTrue(stream.closed)
stream.close()

def test_close_attribute_absent(self):
class Stream:
def read(self, size):
return b""

def write(self, data):
return len(data)

stream = zstd.ZstdCompressor().stream_writer(Stream())
stream.close()
self.assertTrue(stream.closed)

def test_flush_attribute_lookup_error(self):
class Stream:
def write(self, data):
return len(data)

def __getattr__(self, name):
if name == "flush":
raise exception("flush lookup failed")
raise AttributeError(name)

for exception in (MemoryError, KeyboardInterrupt):
with self.subTest(exception=exception):
stream = zstd.ZstdCompressor().stream_writer(Stream())
with self.assertRaisesRegex(exception, "flush lookup failed"):
stream.flush()
self.assertFalse(stream.closed)

def test_flush_attribute_absent(self):
class Stream:
def write(self, data):
return len(data)

stream = zstd.ZstdCompressor().stream_writer(Stream())
stream.flush()
self.assertFalse(stream.closed)

def test_io_api(self):
buffer = io.BytesIO()
cctx = zstd.ZstdCompressor()
Expand Down
33 changes: 33 additions & 0 deletions tests/test_decompressor_stream_reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,39 @@


class TestDecompressor_stream_reader(unittest.TestCase):
def test_close_attribute_lookup_error(self):
class Stream:
def read(self, size):
return b""

def write(self, data):
return len(data)

def __getattr__(self, name):
if name == "close":
raise exception("close lookup failed")
raise AttributeError(name)

for exception in (MemoryError, KeyboardInterrupt):
with self.subTest(exception=exception):
stream = zstd.ZstdDecompressor().stream_reader(Stream())
with self.assertRaisesRegex(exception, "close lookup failed"):
stream.close()
self.assertTrue(stream.closed)
stream.close()

def test_close_attribute_absent(self):
class Stream:
def read(self, size):
return b""

def write(self, data):
return len(data)

stream = zstd.ZstdDecompressor().stream_reader(Stream())
stream.close()
self.assertTrue(stream.closed)

def test_context_manager(self):
dctx = zstd.ZstdDecompressor()

Expand Down
59 changes: 59 additions & 0 deletions tests/test_decompressor_stream_writer.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,65 @@ def decompress_via_writer(data):


class TestDecompressor_stream_writer(unittest.TestCase):
def test_close_attribute_lookup_error(self):
class Stream:
def read(self, size):
return b""

def write(self, data):
return len(data)

def __getattr__(self, name):
if name == "close":
raise exception("close lookup failed")
raise AttributeError(name)

for exception in (MemoryError, KeyboardInterrupt):
with self.subTest(exception=exception):
stream = zstd.ZstdDecompressor().stream_writer(Stream())
with self.assertRaisesRegex(exception, "close lookup failed"):
stream.close()
self.assertTrue(stream.closed)
stream.close()

def test_close_attribute_absent(self):
class Stream:
def read(self, size):
return b""

def write(self, data):
return len(data)

stream = zstd.ZstdDecompressor().stream_writer(Stream())
stream.close()
self.assertTrue(stream.closed)

def test_flush_attribute_lookup_error(self):
class Stream:
def write(self, data):
return len(data)

def __getattr__(self, name):
if name == "flush":
raise exception("flush lookup failed")
raise AttributeError(name)

for exception in (MemoryError, KeyboardInterrupt):
with self.subTest(exception=exception):
stream = zstd.ZstdDecompressor().stream_writer(Stream())
with self.assertRaisesRegex(exception, "flush lookup failed"):
stream.flush()
self.assertFalse(stream.closed)

def test_flush_attribute_absent(self):
class Stream:
def write(self, data):
return len(data)

stream = zstd.ZstdDecompressor().stream_writer(Stream())
stream.flush()
self.assertFalse(stream.closed)

def test_io_api(self):
buffer = io.BytesIO()
dctx = zstd.ZstdDecompressor()
Expand Down