[SCM] GNU Mailutils branch, master, updated. release-2.2-297-gee74794

[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=ee7479485f6b252eb131533a6a7d1ab20283719e

The branch, master has been updated
       via  ee7479485f6b252eb131533a6a7d1ab20283719e (commit)
      from  2e6b4a7f2251ef9149e9f11216640a129114caa9 (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 ee7479485f6b252eb131533a6a7d1ab20283719e
Author: Wojciech Polak <address@hidden>
Date:   Sun Dec 19 11:12:03 2010 +0100

    Remove more old debug leftovers from the Python interface.

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

Summary of changes:
 maidag/python.c              |    5 +---
 python/libmu_py/libmu_py.c   |    1 -
 python/libmu_py/libmu_py.h   |    1 -
 python/mailutils/Makefile.am |    1 -
 python/mailutils/__init__.py |    1 -
 python/mailutils/debug.py    |   43 ------------------------------------------
 python/mailutils/mailbox.py  |   10 ---------
 python/mailutils/mailer.py   |   13 ------------
 python/mailutils/sieve.py    |   15 --------------
 9 files changed, 1 insertions(+), 89 deletions(-)
 delete mode 100644 python/mailutils/debug.py

diff --git a/maidag/python.c b/maidag/python.c
index 787266f..caa37f1 100644
--- a/maidag/python.c
+++ b/maidag/python.c
@@ -32,10 +32,7 @@ python_check_msg (mu_message_t msg, struct mu_auth_data 
*auth,
 
   if (!log_to_stderr)
     {
-      mu_debug_t debug;
-      mu_diag_get_debug (&debug);
-      mu_py_capture_stderr (debug);
-      mu_py_capture_stdout (debug);
+      /* FIXME */
     }
 
   py_msg = PyMessage_NEW ();
diff --git a/python/libmu_py/libmu_py.c b/python/libmu_py/libmu_py.c
index 1a3b211..317281b 100644
--- a/python/libmu_py/libmu_py.c
+++ b/python/libmu_py/libmu_py.c
@@ -110,7 +110,6 @@ mu_py_attach_modules (void)
   _mu_py_attach_attribute ();
   _mu_py_attach_auth ();
   _mu_py_attach_body ();
-  _mu_py_attach_debug ();
   _mu_py_attach_envelope ();
   _mu_py_attach_header ();
   _mu_py_attach_filter ();
diff --git a/python/libmu_py/libmu_py.h b/python/libmu_py/libmu_py.h
index aa19393..9eccf48 100644
--- a/python/libmu_py/libmu_py.h
+++ b/python/libmu_py/libmu_py.h
@@ -64,7 +64,6 @@ extern void _mu_py_attach_address (void);
 extern void _mu_py_attach_attribute (void);
 extern void _mu_py_attach_auth (void);
 extern void _mu_py_attach_body (void);
-extern void _mu_py_attach_debug (void);
 extern void _mu_py_attach_envelope (void);
 extern void _mu_py_attach_header  (void);
 extern void _mu_py_attach_filter (void);
diff --git a/python/mailutils/Makefile.am b/python/mailutils/Makefile.am
index d994cf3..0e4c734 100644
--- a/python/mailutils/Makefile.am
+++ b/python/mailutils/Makefile.am
@@ -22,7 +22,6 @@ pythonsite_PYTHON=\
  attribute.py \
  auth.py \
  body.py \
- debug.py \
  envelope.py \
  filter.py \
  folder.py \
diff --git a/python/mailutils/__init__.py b/python/mailutils/__init__.py
index eb23f52..4220626 100644
--- a/python/mailutils/__init__.py
+++ b/python/mailutils/__init__.py
@@ -41,7 +41,6 @@ __all__ = (
     "attribute",
     "auth",
     "body",
-    "debug",
     "envelope",
     "filter",
     "folder",
diff --git a/python/mailutils/debug.py b/python/mailutils/debug.py
deleted file mode 100644
index fda7747..0000000
--- a/python/mailutils/debug.py
+++ /dev/null
@@ -1,43 +0,0 @@
-#  GNU Mailutils -- a suite of utilities for electronic mail
-#  Copyright (C) 2009, 2010 Free Software Foundation, Inc.
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 3 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Lesser General Public License for more details.
-#
-#  You should have received a copy of the GNU Lesser General
-#  Public License along with this library.  If not, see 
-#  <http://www.gnu.org/licenses/>.
-
-from mailutils.c_api import debug
-from mailutils.error import DebugError
-
-MU_DEBUG_ERROR  = 0
-MU_DEBUG_TRACE0 = 1
-MU_DEBUG_TRACE  = MU_DEBUG_TRACE0
-MU_DEBUG_TRACE1 = 2
-MU_DEBUG_TRACE2 = 3
-MU_DEBUG_TRACE3 = 4
-MU_DEBUG_TRACE4 = 5
-MU_DEBUG_TRACE5 = 6
-MU_DEBUG_TRACE6 = 7
-MU_DEBUG_TRACE7 = 8
-MU_DEBUG_PROT   = 9
-
-class Debug:
-    def __init__ (self, dbg):
-        self.dbg = dbg
-
-    def __del__ (self):
-        del self.dbg
-
-    def set_level (self, level=MU_DEBUG_PROT):
-        status = debug.set_level (self.dbg, level)
-        if status:
-            raise DebugError (status)
diff --git a/python/mailutils/mailbox.py b/python/mailutils/mailbox.py
index a077015..6ac5dc5 100644
--- a/python/mailutils/mailbox.py
+++ b/python/mailutils/mailbox.py
@@ -20,7 +20,6 @@ from mailutils.c_api import mailbox
 from mailutils import message
 from mailutils import folder
 from mailutils import url
-from mailutils import debug
 from mailutils.error import MailboxError
 
 class MailboxBase:
@@ -150,13 +149,6 @@ class MailboxBase:
             raise MailboxError (status)
         return folder.Folder (fld)
 
-    def get_debug (self):
-        """Get the Debug object."""
-        status, dbg = mailbox.get_debug (self.mbox)
-        if status:
-            raise MailboxError (status)
-        return debug.Debug (dbg)
-
     def get_url (self):
         """Get the Url object."""
         status, u = mailbox.get_url (self.mbox)
@@ -187,8 +179,6 @@ class MailboxBase:
             return self.get_folder ()
         elif name == 'url':
             return self.get_url ()
-        elif name == 'debug':
-            return self.get_debug ()
         else:
             raise AttributeError, name
 
diff --git a/python/mailutils/mailer.py b/python/mailutils/mailer.py
index 445f002..49ca332 100644
--- a/python/mailutils/mailer.py
+++ b/python/mailutils/mailer.py
@@ -17,7 +17,6 @@
 
 from mailutils.c_api import mailer
 from mailutils import address
-from mailutils import debug
 from mailutils.error import MailerError
 
 class Mailer:
@@ -31,12 +30,6 @@ class Mailer:
         mailer.destroy (self.mlr)
         del self.mlr
 
-    def __getattr__ (self, name):
-        if name == 'debug':
-            return self.get_debug ()
-        else:
-            raise AttributeError, name
-
     def open (self, flags=0):
         status = mailer.open (self.mlr, flags)
         if status:
@@ -55,9 +48,3 @@ class Mailer:
         status = mailer.send_message (self.mlr, msg.msg, frm, to)
         if status:
             raise MailerError (status)
-
-    def get_debug (self):
-        status, dbg = mailer.get_debug (self.mlr)
-        if status:
-            raise MailerError (status)
-        return debug.Debug (dbg)
diff --git a/python/mailutils/sieve.py b/python/mailutils/sieve.py
index 36b7e4a..03217b7 100644
--- a/python/mailutils/sieve.py
+++ b/python/mailutils/sieve.py
@@ -29,21 +29,6 @@ class Machine:
         sieve.machine_destroy (self.mach)
         del self.mach
 
-    def set_debug (self, fnc):
-        status = sieve.set_debug (self.mach, fnc)
-        if status:
-            raise SieveMachineError (status)
-
-    def set_error (self, fnc):
-        status = sieve.set_error (self.mach, fnc)
-        if status:
-            raise SieveMachineError (status)
-
-    def set_parse_error (self, fnc):
-        status = sieve.set_parse_error (self.mach, fnc)
-        if status:
-            raise SieveMachineError (status)
-
     def set_logger (self, fnc):
         status = sieve.set_logger (self.mach, fnc)
         if status:


hooks/post-receive
-- 
GNU Mailutils