[SCM] GNU Mailutils branch, master, updated. release-2.2-436-g243dee2

[Wojciech Polak]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=243dee23f08cb06311bfb3dbc77a45985cc51ca6

The branch, master has been updated
       via  243dee23f08cb06311bfb3dbc77a45985cc51ca6 (commit)
      from  47c18140b870504d9ce4d4c386530c1a73dccfe2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 243dee23f08cb06311bfb3dbc77a45985cc51ca6
Author: Wojciech Polak <address@hidden>
Date:   Thu Nov 10 00:54:31 2011 +0100

    Update Python interface.
    
    * python/libmu_py/filter.c: Bugfix.
    * python/libmu_py/url.c (api_url_parse): Remove.
    * python/mailutils/error.py: Update MU_ERR_* values.
    * python/mailutils/url.py (Url): Remove parse() method.
    * examples/python/iconv.py: Remove open/close method calls.
    * examples/python/mailcap.py: Likewise.
    * examples/python/url-parse.py: Remove parse() call.

-----------------------------------------------------------------------

Summary of changes:
 examples/python/iconv.py     |   11 +----
 examples/python/mailcap.py   |    2 -
 examples/python/url-parse.py |    1 -
 python/libmu_py/filter.c     |    4 +-
 python/libmu_py/url.c        |   15 ------
 python/mailutils/error.py    |  102 +++++++++++++++++++++++++----------------
 python/mailutils/url.py      |    8 ---
 7 files changed, 65 insertions(+), 78 deletions(-)

diff --git a/examples/python/iconv.py b/examples/python/iconv.py
index b5c7e83..4fb32b0 100644
--- a/examples/python/iconv.py
+++ b/examples/python/iconv.py
@@ -23,22 +23,13 @@ if len (sys.argv) != 3:
     sys.exit (0)
 
 sti = stream.StdioStream (stream.MU_STDIN_FD)
-sti.open ()
-
 cvt = filter.FilterIconvStream (sti, sys.argv[1], sys.argv[2])
-cvt.open ()
-
 out = stream.StdioStream (stream.MU_STDOUT_FD, 0)
-out.open ()
 
 total = 0
 while True:
-    buf = cvt.read (total)
+    buf = cvt.read ()
     out.write (buf)
     total += cvt.read_count
     if not cvt.read_count:
         break
-
-out.flush ()
-out.close ()
-sti.close ()
diff --git a/examples/python/mailcap.py b/examples/python/mailcap.py
index 6b72531..c0abaa3 100644
--- a/examples/python/mailcap.py
+++ b/examples/python/mailcap.py
@@ -17,8 +17,6 @@
 from mailutils import stream, mailcap
 
 stm = stream.FileStream ("/etc/mailcap")
-stm.open ()
-
 mc = mailcap.Mailcap (stm)
 
 for i, entry in enumerate (mc):
diff --git a/examples/python/url-parse.py b/examples/python/url-parse.py
index 593d22d..ed4c5fd 100644
--- a/examples/python/url-parse.py
+++ b/examples/python/url-parse.py
@@ -21,7 +21,6 @@ from mailutils.error import *
 def parse (str):
     try:
        u = url.Url (str)
-       u.parse ()
         print "URL: %s" % u
 
        print "\tscheme <%s>" % u.get_scheme ()
diff --git a/python/libmu_py/filter.c b/python/libmu_py/filter.c
index 6e3ce3e..4cc58ed 100644
--- a/python/libmu_py/filter.c
+++ b/python/libmu_py/filter.c
@@ -66,8 +66,8 @@ api_filter_iconv_create (PyObject *self, PyObject *args)
 
   argv[1] = fromcode;
   argv[2] = tocode;
-  mu_filter_create_args (&py_stm->stm, py_transport->stm, argv[0], 3, argv,
-                        MU_FILTER_DECODE, flags);
+  status = mu_filter_create_args (&py_stm->stm, py_transport->stm, argv[0], 3,
+                                 argv, MU_FILTER_DECODE, flags);
   return _ro (PyInt_FromLong (status));
 }
 
diff --git a/python/libmu_py/url.c b/python/libmu_py/url.c
index d42bc35..02af1af 100644
--- a/python/libmu_py/url.c
+++ b/python/libmu_py/url.c
@@ -102,18 +102,6 @@ api_url_destroy (PyObject *self, PyObject *args)
   return _ro (Py_None);
 }
 
-/* FIXME: Remove */
-static PyObject *
-api_url_parse (PyObject *self, PyObject *args)
-{
-  PyUrl *py_url;
-
-  if (!PyArg_ParseTuple (args, "O!", &PyUrlType, &py_url))
-    return NULL;
-
-  return _ro (0);
-}
-
 static PyObject *
 api_url_get_port (PyObject *self, PyObject *args)
 {
@@ -255,9 +243,6 @@ static PyMethodDef methods[] = {
   { "destroy", (PyCFunction) api_url_destroy, METH_VARARGS,
     "Destroy the url and free its resources." },
 
-  { "parse", (PyCFunction) api_url_parse, METH_VARARGS,
-    "Parse the url, after calling this the get functions can be called." },
-
   { "to_string", (PyCFunction) api_url_to_string, METH_VARARGS,
     "" },
 
diff --git a/python/mailutils/error.py b/python/mailutils/error.py
index 9eb8492..0e79fa8 100644
--- a/python/mailutils/error.py
+++ b/python/mailutils/error.py
@@ -48,11 +48,11 @@ MU_ERR_BASE = 0x1000
 
 MU_ERR_FAILURE = (MU_ERR_BASE+0)
 MU_ERR_CANCELED = (MU_ERR_BASE+1)
-MU_ERR_NO_HANDLER = (MU_ERR_BASE+2)
-MU_ERR_EMPTY_VFN = (MU_ERR_BASE+3)
-MU_ERR_OUT_NULL = (MU_ERR_BASE+4)
-MU_ERR_OUT_PTR_NULL = (MU_ERR_BASE+5)
-MU_ERR_MBX_NULL = (MU_ERR_BASE+6)
+MU_ERR_EMPTY_VFN = (MU_ERR_BASE+2)
+MU_ERR_OUT_PTR_NULL = (MU_ERR_BASE+3)
+MU_ERR_MBX_REMOVED = (MU_ERR_BASE+4)
+MU_ERR_NOT_OPEN = (MU_ERR_BASE+5)
+MU_ERR_OPEN = (MU_ERR_BASE+6)
 MU_ERR_INVALID_EMAIL = (MU_ERR_BASE+7)
 MU_ERR_EMPTY_ADDRESS = (MU_ERR_BASE+8)
 MU_ERR_LOCKER_NULL = (MU_ERR_BASE+9)
@@ -65,38 +65,60 @@ MU_ERR_LOCK_EXT_ERR = (MU_ERR_BASE+15)
 MU_ERR_LOCK_EXT_KILLED = (MU_ERR_BASE+16)
 MU_ERR_NO_SUCH_USER = (MU_ERR_BASE+17)
 MU_ERR_GETHOSTBYNAME = (MU_ERR_BASE+18)
-MU_ERR_BAD_RESUMPTION = (MU_ERR_BASE+19)
-MU_ERR_MAILER_BAD_FROM = (MU_ERR_BASE+20)
-MU_ERR_MAILER_BAD_TO = (MU_ERR_BASE+21)
-MU_ERR_MAILER_NO_RCPT_TO = (MU_ERR_BASE+22)
-MU_ERR_MAILER_BAD_URL = (MU_ERR_BASE+23)
-MU_ERR_SMTP_RCPT_FAILED = (MU_ERR_BASE+24)
-MU_ERR_TCP_NO_HOST = (MU_ERR_BASE+25)
-MU_ERR_TCP_NO_PORT = (MU_ERR_BASE+26)
-MU_ERR_BAD_2047_INPUT = (MU_ERR_BASE+27)
-MU_ERR_BAD_2047_ENCODING = (MU_ERR_BASE+28)
-MU_ERR_NOUSERNAME = (MU_ERR_BASE+29)
-MU_ERR_NOPASSWORD = (MU_ERR_BASE+30)
-MU_ERR_UNSAFE_PERMS = (MU_ERR_BASE+31)
-MU_ERR_BAD_AUTH_SCHEME = (MU_ERR_BASE+32)
-MU_ERR_AUTH_FAILURE = (MU_ERR_BASE+33)
-MU_ERR_PROCESS_NOEXEC = (MU_ERR_BASE+34)
-MU_ERR_PROCESS_EXITED = (MU_ERR_BASE+35)
-MU_ERR_PROCESS_SIGNALED = (MU_ERR_BASE+36)
-MU_ERR_PROCESS_UNKNOWN_FAILURE = (MU_ERR_BASE+37)
-MU_ERR_CONN_CLOSED = (MU_ERR_BASE+38)
-MU_ERR_PARSE = (MU_ERR_BASE+39)
-MU_ERR_NOENT = (MU_ERR_BASE+40)
-MU_ERR_EXISTS = (MU_ERR_BASE+41)
-MU_ERR_BUFSPACE = (MU_ERR_BASE+42)
-MU_ERR_SQL = (MU_ERR_BASE+43)
-MU_ERR_DB_ALREADY_CONNECTED = (MU_ERR_BASE+44)
-MU_ERR_DB_NOT_CONNECTED = (MU_ERR_BASE+45)
-MU_ERR_RESULT_NOT_RELEASED = (MU_ERR_BASE+46)
-MU_ERR_NO_QUERY = (MU_ERR_BASE+47)
-MU_ERR_BAD_COLUMN = (MU_ERR_BASE+48)
-MU_ERR_NO_RESULT = (MU_ERR_BASE+49)
-MU_ERR_NO_INTERFACE = (MU_ERR_BASE+50)
-MU_ERR_BADOP = (MU_ERR_BASE+51)
-MU_ERR_BAD_FILENAME = (MU_ERR_BASE+52)
-MU_ERR_READ = (MU_ERR_BASE+53)
+MU_ERR_MAILER_BAD_FROM = (MU_ERR_BASE+19)
+MU_ERR_MAILER_BAD_TO = (MU_ERR_BASE+20)
+MU_ERR_MAILER_NO_RCPT_TO = (MU_ERR_BASE+21)
+MU_ERR_MAILER_BAD_URL = (MU_ERR_BASE+22)
+MU_ERR_SMTP_RCPT_FAILED = (MU_ERR_BASE+23)
+MU_ERR_TCP_NO_HOST = (MU_ERR_BASE+24)
+MU_ERR_TCP_NO_PORT = (MU_ERR_BASE+25)
+MU_ERR_BAD_2047_INPUT = (MU_ERR_BASE+26)
+MU_ERR_BAD_2047_ENCODING = (MU_ERR_BASE+27)
+MU_ERR_NOUSERNAME = (MU_ERR_BASE+28)
+MU_ERR_NOPASSWORD = (MU_ERR_BASE+29)
+MU_ERR_BADREPLY = (MU_ERR_BASE+30)
+MU_ERR_SEQ = (MU_ERR_BASE+31)
+MU_ERR_REPLY = (MU_ERR_BASE+32)
+MU_ERR_BAD_AUTH_SCHEME = (MU_ERR_BASE+33)
+MU_ERR_AUTH_FAILURE = (MU_ERR_BASE+34)
+MU_ERR_PROCESS_NOEXEC = (MU_ERR_BASE+35)
+MU_ERR_PROCESS_EXITED = (MU_ERR_BASE+36)
+MU_ERR_PROCESS_SIGNALED = (MU_ERR_BASE+37)
+MU_ERR_PROCESS_UNKNOWN_FAILURE = (MU_ERR_BASE+38)
+MU_ERR_CONN_CLOSED = (MU_ERR_BASE+39)
+MU_ERR_PARSE = (MU_ERR_BASE+40)
+MU_ERR_NOENT = (MU_ERR_BASE+41)
+MU_ERR_EXISTS = (MU_ERR_BASE+42)
+MU_ERR_BUFSPACE = (MU_ERR_BASE+43)
+MU_ERR_SQL = (MU_ERR_BASE+44)
+MU_ERR_DB_ALREADY_CONNECTED = (MU_ERR_BASE+45)
+MU_ERR_DB_NOT_CONNECTED = (MU_ERR_BASE+46)
+MU_ERR_RESULT_NOT_RELEASED = (MU_ERR_BASE+47)
+MU_ERR_NO_QUERY = (MU_ERR_BASE+48)
+MU_ERR_BAD_COLUMN = (MU_ERR_BASE+49)
+MU_ERR_NO_RESULT = (MU_ERR_BASE+50)
+MU_ERR_NO_INTERFACE = (MU_ERR_BASE+51)
+MU_ERR_BADOP = (MU_ERR_BASE+52)
+MU_ERR_BAD_FILENAME = (MU_ERR_BASE+53)
+MU_ERR_READ = (MU_ERR_BASE+54)
+MU_ERR_NO_TRANSPORT = (MU_ERR_BASE+55)
+MU_ERR_AUTH_NO_CRED = (MU_ERR_BASE+56)
+MU_ERR_URL_MISS_PARTS = (MU_ERR_BASE+57)
+MU_ERR_URL_EXTRA_PARTS = (MU_ERR_BASE+58)
+MU_ERR_URL_INVALID_PARAMETER = (MU_ERR_BASE+59)
+MU_ERR_INFO_UNAVAILABLE = (MU_ERR_BASE+60)
+MU_ERR_NONAME = (MU_ERR_BASE+61)
+MU_ERR_BADFLAGS = (MU_ERR_BASE+62)
+MU_ERR_SOCKTYPE = (MU_ERR_BASE+63)
+MU_ERR_FAMILY = (MU_ERR_BASE+64)
+MU_ERR_SERVICE = (MU_ERR_BASE+65)
+MU_ERR_PERM_OWNER_MISMATCH = (MU_ERR_BASE+66)
+MU_ERR_PERM_GROUP_WRITABLE = (MU_ERR_BASE+67)
+MU_ERR_PERM_WORLD_WRITABLE = (MU_ERR_BASE+68)
+MU_ERR_PERM_GROUP_READABLE = (MU_ERR_BASE+69)
+MU_ERR_PERM_WORLD_READABLE = (MU_ERR_BASE+70)
+MU_ERR_PERM_LINKED_WRDIR = (MU_ERR_BASE+71)
+MU_ERR_PERM_DIR_IWGRP = (MU_ERR_BASE+72)
+MU_ERR_PERM_DIR_IWOTH = (MU_ERR_BASE+73)
+MU_ERR_DISABLED = (MU_ERR_BASE+74)
+MU_ERR_LAST = (MU_ERR_BASE+75)
diff --git a/python/mailutils/url.py b/python/mailutils/url.py
index 5c19eec..c9025e5 100644
--- a/python/mailutils/url.py
+++ b/python/mailutils/url.py
@@ -40,14 +40,6 @@ class Url:
     def __str__ (self):
         return url.to_string (self.url)
 
-    def parse (self):
-        """Parses the url, after calling this the get functions
-        can be called."""
-        if self.__owner:
-            status = url.parse (self.url)
-            if status:
-                raise UrlError (status)
-
     def get_port (self):
         status, port = url.get_port (self.url)
         if status:


hooks/post-receive
-- 
GNU Mailutils