From 1a374c8cbea21dabe2f7db123a559576531238db Mon Sep 17 00:00:00 2001 From: Wojciech Polak Date: Thu, 8 Apr 2010 17:34:49 +0200 Subject: Reflect recent RFC compatibility changes in Python/C++. * examples/python/mimetest.py: Update. * include/mailutils/cpp/message.h (get_attachment_name): Overload. * libmu_cpp/message.cc (Message::get_attachment_name): Overload. * python/libmu_py/message.c (api_message_get_attachment_name): Update. * python/mailutils/message.py (Message.get_attachment_name): Add optional charset parameter. Return (name, lang) tuple. --- python/libmu_py/message.c | 20 +++++++++++++------- python/mailutils/message.py | 6 +++--- 2 files changed, 16 insertions(+), 10 deletions(-) (limited to 'python') diff --git a/python/libmu_py/message.c b/python/libmu_py/message.c index fc71cbf0e..58f9c5bae 100644 --- a/python/libmu_py/message.c +++ b/python/libmu_py/message.c @@ -282,14 +282,22 @@ api_message_get_attachment_name (PyObject *self, PyObject *args) { int status; char *name = NULL; + char *charset = NULL; + char *lang = NULL; + PyObject *py_ret; PyMessage *py_msg; - if (!PyArg_ParseTuple (args, "O!", &PyMessageType, &py_msg)) + if (!PyArg_ParseTuple (args, "O!|z", &PyMessageType, &py_msg, &charset)) return NULL; - /* FIXME: CS/Lang info is ignored */ - status = mu_message_aget_attachment_name (py_msg->msg, &name, NULL); - return status_object (status, PyString_FromString (name ? name : "")); + status = mu_message_aget_decoded_attachment_name (py_msg->msg, charset, + &name, &lang); + + py_ret = PyTuple_New (3); + PyTuple_SetItem (py_ret, 0, PyInt_FromLong (status)); + PyTuple_SetItem (py_ret, 1, PyString_FromString (name ? name : "")); + PyTuple_SetItem (py_ret, 2, lang ? PyString_FromString (lang) : Py_None); + return _ro (py_ret); } static PyObject * @@ -314,12 +322,10 @@ static PyObject * api_message_unencapsulate (PyObject *self, PyObject *args) { int status; - char *filename = NULL; PyMessage *py_msg; PyMessage *py_unen = PyMessage_NEW (); - if (!PyArg_ParseTuple (args, "O!|s", &PyMessageType, &py_msg, - &filename)) + if (!PyArg_ParseTuple (args, "O!", &PyMessageType, &py_msg)) return NULL; Py_INCREF (py_unen); diff --git a/python/mailutils/message.py b/python/mailutils/message.py index 0f4744a78..89aa984d4 100644 --- a/python/mailutils/message.py +++ b/python/mailutils/message.py @@ -138,11 +138,11 @@ class Message: raise MessageError (status) return uidl - def get_attachment_name (self): - status, name = message.get_attachment_name (self.msg) + def get_attachment_name (self, charset=None): + status, name, lang = message.get_attachment_name (self.msg, charset) if status: raise MessageError (status) - return name + return name, lang def save_attachment (self, filename = ''): status = message.save_attachment (self.msg, filename) -- cgit v1.2.1