[40072] trunk/dports/python/py-managesieve

[gboyce at macports.org]

Revision: 40072
          http://trac.macports.org/changeset/40072
Author:   gboyce at macports.org
Date:     2008-09-19 13:12:12 -0700 (Fri, 19 Sep 2008)
Log Message:
-----------
16376
Correct error handling for py-managesieve
Handle servers which support STARTTLS (does not implement TLS support yet)

Modified Paths:
--------------
    trunk/dports/python/py-managesieve/Portfile

Added Paths:
-----------
    trunk/dports/python/py-managesieve/files/02-python-managesieve-debug_fix.patch
    trunk/dports/python/py-managesieve/files/03-python-managesieve-starttls_fixup.patch

Removed Paths:
-------------
    trunk/dports/python/py-managesieve/files/patch-managesieve.py

Modified: trunk/dports/python/py-managesieve/Portfile
===================================================================
--- trunk/dports/python/py-managesieve/Portfile	2008-09-19 19:51:32 UTC (rev 40071)
+++ trunk/dports/python/py-managesieve/Portfile	2008-09-19 20:12:12 UTC (rev 40072)
@@ -5,10 +5,10 @@
 
 name			py-managesieve
 version			0.3
-revision		2
+revision		3
 categories		python mail
 platforms		darwin freebsd
-maintainers		nomaintainer
+maintainers		gboyce at macports.org
 description		Protocol for remotely managing Sieve scripts
 long_description	A Protocol for remotely managing Sieve Scripts. A \
 				MANGAGESIEVE client library for remotely managing \
@@ -18,9 +18,10 @@
 master_sites	http://www.crazy-compilers.com/py-lib/
 distname		python-managesieve-${version}
 checksums		md5 b2a28b90b7a4e9a8789235f4cc6e32c0
-patchfiles		patch-managesieve.py
+patchfiles		02-python-managesieve-debug_fix.patch \
+			03-python-managesieve-starttls_fixup.patch
 
-depends_lib-append	port:py-optik
+depends_lib-append     port:py-optik
 
 post-destroot	{
 	xinstall -m 644 -W ${worksrcpath} draft-martin-managesieve-04.txt \

Added: trunk/dports/python/py-managesieve/files/02-python-managesieve-debug_fix.patch
===================================================================
--- trunk/dports/python/py-managesieve/files/02-python-managesieve-debug_fix.patch	                        (rev 0)
+++ trunk/dports/python/py-managesieve/files/02-python-managesieve-debug_fix.patch	2008-09-19 20:12:12 UTC (rev 40072)
@@ -0,0 +1,20 @@
+==== //sandbox/gboyce/sieve/python-managesieve-0.3/managesieve.py#9 - /Users/gboyce/perforce/sandbox/sieve/python-managesieve-0.3/managesieve.py ====
+--- managesieve.py      Sat May 24 13:45:40 2003
++++ managesieve.py.new  Mon Aug 25 13:58:52 2008
+@@ -13,7 +13,15 @@
+ 
+ __all__ = [ 'MANAGESIEVE', 'SIEVE_PORT', 'OK', 'NO', 'BYE', 'Debug']
+ 
+-from imaplib import _log, _mesg
++# XXX darky -- these are now in an IMAP4 class, and I don't think we
++# should be using them.
++#from imaplib import _log, _mesg
++
++import logging
++log = logging.getLogger("managesieve")
++def _log(message):
++    log.debug(message)
++_mesg = _log
+ 
+ Debug = 0
+ CRLF = '\r\n'

Added: trunk/dports/python/py-managesieve/files/03-python-managesieve-starttls_fixup.patch
===================================================================
--- trunk/dports/python/py-managesieve/files/03-python-managesieve-starttls_fixup.patch	                        (rev 0)
+++ trunk/dports/python/py-managesieve/files/03-python-managesieve-starttls_fixup.patch	2008-09-19 20:12:12 UTC (rev 40072)
@@ -0,0 +1,17 @@
+==== //sandbox/gboyce/sieve/python-managesieve-0.3/managesieve.py#9 - /Users/gboyce/perforce/sandbox/sieve/python-managesieve-0.3/managesieve.py ====
+--- managesieve.py      Sat May 24 13:45:40 2003
++++ managesieve.py.new  Mon Aug 25 13:58:52 2008
+@@ -135,6 +135,13 @@
+ 
+ 
+     def _parse_capabilities(self, lines):
++        # XXX darky: seeing the STARTTLS cap makes managesieve barf
++        # because 'data' (in the below unpack) has nothing to unpack.
++        # Fix up lines for this.
++        for pair in lines:
++            if len(pair) == 1:
++                pair.append("")
++            assert len(pair) == 2
+         for typ, data in lines:
+             if __debug__:
+                 if self.debug >= 3:

Deleted: trunk/dports/python/py-managesieve/files/patch-managesieve.py
===================================================================
--- trunk/dports/python/py-managesieve/files/patch-managesieve.py	2008-09-19 19:51:32 UTC (rev 40071)
+++ trunk/dports/python/py-managesieve/files/patch-managesieve.py	2008-09-19 20:12:12 UTC (rev 40072)
@@ -1,11 +0,0 @@
---- managesieve.py	Sat May 24 13:45:40 2003
-+++ managesieve.py.new	Mon Feb 28 13:58:52 2005
-@@ -13,7 +13,7 @@
- 
- __all__ = [ 'MANAGESIEVE', 'SIEVE_PORT', 'OK', 'NO', 'BYE', 'Debug']
- 
--from imaplib import _log, _mesg
-+#from imaplib import _log, _mesg
- 
- Debug = 0
- CRLF = '\r\n'
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080919/88a6d31f/attachment.html