remove trailing whitespaces

This commit is contained in:
wmayer
2018-10-27 18:12:36 +02:00
parent 550d62bb6a
commit 0048778f80
4 changed files with 57 additions and 55 deletions

View File

@@ -43,8 +43,8 @@ std::string PersistencePy::representation(void) const
Py::String PersistencePy::getContent(void) const
{
Base::StringWriter writer;
// force all objects to write pure XML without files
writer.setForceXML(true);
// force all objects to write pure XML without files
writer.setForceXML(true);
getPersistencePtr()->Save(writer);
return Py::String (writer.getString());
@@ -55,38 +55,39 @@ Py::Int PersistencePy::getMemSize(void) const
return Py::Int((long)getPersistencePtr()->getMemSize());
}
PyObject* PersistencePy::dumpContent(PyObject *args, PyObject *kwds) {
PyObject* PersistencePy::dumpContent(PyObject *args, PyObject *kwds)
{
int compression = 3;
static char* kwds_def[] = {"Compression",NULL};
PyErr_Clear();
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|i", kwds_def, &compression)) {
return NULL;
}
//setup the stream. the in flag is needed to make "read" work
std::stringstream stream(std::stringstream::out | std::stringstream::in | std::stringstream::binary);
try {
getPersistencePtr()->dumpToStream(stream, compression);
getPersistencePtr()->dumpToStream(stream, compression);
}
catch(...) {
catch (...) {
PyErr_SetString(PyExc_IOError, "Unable parse content into binary representation");
return NULL;
return NULL;
}
//build the byte array with correct size
if(!stream.seekp(0, stream.end)) {
PyErr_SetString(PyExc_IOError, "Unable to find end of stream");
return NULL;
}
}
std::stringstream::pos_type offset = stream.tellp();
if(!stream.seekg(0, stream.beg)) {
if (!stream.seekg(0, stream.beg)) {
PyErr_SetString(PyExc_IOError, "Unable to find begin of stream");
return NULL;
}
PyObject* ba = PyByteArray_FromStringAndSize(NULL, offset);
//use the buffer protocol to access the underlying array and write into it
Py_buffer buf = Py_buffer();
PyObject_GetBuffer(ba, &buf, PyBUF_WRITABLE);
@@ -102,12 +103,12 @@ PyObject* PersistencePy::dumpContent(PyObject *args, PyObject *kwds) {
PyErr_SetString(PyExc_IOError, "Error copying data into byte array");
return NULL;
}
return ba;
return ba;
}
PyObject* PersistencePy::restoreContent(PyObject *args) {
PyObject* PersistencePy::restoreContent(PyObject *args)
{
PyObject* buffer;
if( !PyArg_ParseTuple(args, "O", &buffer) )
return NULL;
@@ -117,23 +118,23 @@ PyObject* PersistencePy::restoreContent(PyObject *args) {
PyErr_SetString(PyExc_TypeError, "Must be a buffer object");
return NULL;
}
Py_buffer buf;
if(PyObject_GetBuffer(buffer, &buf, PyBUF_SIMPLE) < 0)
return NULL;
if(!PyBuffer_IsContiguous(&buf, 'C')) {
PyErr_SetString(PyExc_TypeError, "Buffer must be contiguous");
return NULL;
}
//check if it really is a buffer
try {
typedef boost::iostreams::basic_array_source<char> Device;
boost::iostreams::stream<Device> stream((char*)buf.buf, buf.len);
getPersistencePtr()->restoreFromStream(stream);
getPersistencePtr()->restoreFromStream(stream);
}
catch(...) {
catch (...) {
PyErr_SetString(PyExc_IOError, "Unable to restore content");
return NULL;
}