Skip to content
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

fix_147 #158

Merged
merged 2 commits into from
Feb 9, 2024
Merged

fix_147 #158

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
e4c7f7f
Fixed the compile bug with Python 3.12. The code compiles and all tes…
chryswoods Feb 8, 2024
1506f86
Merge branch 'devel' into feature_python_312
chryswoods Feb 9, 2024
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
2 changes: 2 additions & 0 deletions doc/source/changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ organisation on `GitHub <https://github.com/openbiosim/sire>`__.

* Preserve user atom names when writing to PDB format.

* Fixed compile error using Python 3.12. This fixes issue #147.

* Please add an item to this changelog when you create your PR

`2023.5.1 <https://github.com/openbiosim/sire/compare/2023.5.0...2023.5.1>`__ - January 2024
Expand Down
74 changes: 43 additions & 31 deletions wrapper/Qt/autoconvert_QChar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@
using namespace boost::python;

/** This function converts a QChar to a python (8 bit) str object
*/
*/
struct qchar_to_python_string
{
static PyObject* convert(const QChar &cpp_string)
static PyObject *convert(const QChar &cpp_string)
{
//get Qt to encode the string as UTF8, which python can then decode
// - this is probably not as efficient as it could be, but Sire
// is not a text processing app ;-)
// get Qt to encode the string as UTF8, which python can then decode
// - this is probably not as efficient as it could be, but Sire
// is not a text processing app ;-)
QByteArray utf8 = QString(cpp_string).toUtf8();

if (utf8.isEmpty())
Expand All @@ -59,11 +59,11 @@ struct qchar_to_python_string
};

/** This function convert a python string or unicode to a QChar */
void QChar_from_python_str_or_unicode( PyObject* obj_ptr,
converter::rvalue_from_python_stage1_data* data )
void QChar_from_python_str_or_unicode(PyObject *obj_ptr,
converter::rvalue_from_python_stage1_data *data)
{
// First, convert the object to a python unicode object
PyObject* unicode_object;
PyObject *unicode_object;

if (PyUnicode_Check(obj_ptr))
{
Expand All @@ -85,14 +85,14 @@ void QChar_from_python_str_or_unicode( PyObject* obj_ptr,
}
else
{
//we should never get here!!!
// we should never get here!!!
return;
}

//now convert the Python unicode string to UTF-8
PyObject *utf8 = PyUnicode_AsUTF8String( unicode_object );
// now convert the Python unicode string to UTF-8
PyObject *utf8 = PyUnicode_AsUTF8String(unicode_object);

//we now don't need to the unicode string anymore
// we now don't need to the unicode string anymore
Py_DECREF(unicode_object);

if (utf8 == 0)
Expand All @@ -102,7 +102,7 @@ void QChar_from_python_str_or_unicode( PyObject* obj_ptr,
boost::python::throw_error_already_set();
}

//get the raw buffer from the string
// get the raw buffer from the string
char *utf8_string;
Py_ssize_t utf8_nchars;
int ok = PyBytes_AsStringAndSize(utf8, &utf8_string, &utf8_nchars);
Expand All @@ -115,7 +115,7 @@ void QChar_from_python_str_or_unicode( PyObject* obj_ptr,
boost::python::throw_error_already_set();
}

//use Qt to convert the UTF8 string to QString unicode
// use Qt to convert the UTF8 string to QString unicode
QString unicode_qstring;

if (utf8_nchars > 0)
Expand All @@ -126,9 +126,9 @@ void QChar_from_python_str_or_unicode( PyObject* obj_ptr,
QChar unicode_qchar;

if (unicode_qstring.count() > 0)
unicode_qchar = unicode_qstring[0];
unicode_qchar = unicode_qstring[0];

void* storage = ((converter::rvalue_from_python_storage<QChar>*) data)->storage.bytes;
void *storage = ((converter::rvalue_from_python_storage<QChar> *)data)->storage.bytes;
new (storage) QChar(unicode_qchar);
data->convertible = storage;
}
Expand All @@ -138,42 +138,54 @@ struct QChar_from_python
{
QChar_from_python()
{
converter::registry::push_back( &convertible,
&construct,
type_id<QChar>() );
converter::registry::push_back(&convertible,
&construct,
type_id<QChar>());
}

/** Can the python object pointed to by 'obj_ptr' be converted
to a QChar?
*/
static void* convertible(PyObject* obj_ptr)
static void *convertible(PyObject *obj_ptr)
{
if ( PyBytes_Check(obj_ptr) )
if (PyBytes_Check(obj_ptr))
{
if (PyBytes_GET_SIZE(obj_ptr) == 1){ return obj_ptr; }
else{ return 0; }
if (PyBytes_GET_SIZE(obj_ptr) == 1)
{
return obj_ptr;
}
else
{
return 0;
}
}
else if ( PyUnicode_Check(obj_ptr) )
else if (PyUnicode_Check(obj_ptr))
{
if (PyUnicode_GET_SIZE(obj_ptr) == 1){ return obj_ptr; }
else{ return 0; }
if (PyUnicode_GET_LENGTH(obj_ptr) == 1)
{
return obj_ptr;
}
else
{
return 0;
}
}
else
return 0;
}

/** Perform the actual conversion */
static void construct( PyObject* obj_ptr,
converter::rvalue_from_python_stage1_data* data)
static void construct(PyObject *obj_ptr,
converter::rvalue_from_python_stage1_data *data)
{
//use python-qt conversion function
// use python-qt conversion function
QChar_from_python_str_or_unicode(obj_ptr, data);
}
};

void autoconvert_QChar()
{
//code to get a QString from a python object
// code to get a QString from a python object
QChar_from_python();
to_python_converter< QChar, qchar_to_python_string >();
to_python_converter<QChar, qchar_to_python_string>();
}
Loading