Attachment 81631 Details for Bug 116885 – svnmailer.diff

[patch] svnmailer.diff

svnmailer.diff (text/plain), 2.46 KB, created by Philip M. Gollucci on 2007-10-04 05:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Philip M. Gollucci

Created: 2007-10-04 05:20:01 UTC

Size: 2.46 KB

patch

obsolete

>? files/25-patch-src__lib__svnmailer__notifier___base.py
>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/mail/svnmailer/Makefile,v
>retrieving revision 1.7
>diff -u -r1.7 Makefile
>--- Makefile	19 Dec 2006 21:19:04 -0000	1.7
>+++ Makefile	4 Oct 2007 03:57:54 -0000
>@@ -19,6 +19,11 @@
> USE_PYTHON=		2.3+
> USE_PYDISTUTILS=	yes
> 
>+.include <bsd.port.pre.mk>
>+.if ${PYTHON_REL} >= 250
>+EXTRA_PATCHES+=	${FILESDIR}/25-patch-src__lib__svnmailer__notifier___base.py
>+.endif
>+
> PORTDOCS=	index.html perlig.css perlig.jpg perlig_docs.css \
> 		perlig_offline.css right.gif up.gif
> 
>@@ -32,4 +37,4 @@
> 	cd ${WRKSRC}/docs; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
> .endif
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>--- /dev/null	2007-10-03 23:57:27.000000000 -0400
>+++ files/25-patch-src__lib__svnmailer__notifier___base.py	2007-10-03 23:40:08.000000000 -0400
>@@ -0,0 +1,45 @@
>+--- ./src/lib/svnmailer/notifier/_base.py.orig	2006-04-17 06:29:06.000000000 -0400
>++++ ./src/lib/svnmailer/notifier/_base.py	2007-10-03 23:39:56.000000000 -0400
>+@@ -345,7 +345,6 @@
>+             @return: The two encodings
>+             @rtype: C{tuple} of C{str}
>+         """
>+-        from encodings import exceptions
>+ 
>+         enc1 = enc2 = default
>+         if not change.wasAdded() or change.wasCopied():
>+@@ -353,7 +352,7 @@
>+                 enc1 = self._getContentEncoding(
>+                     change.getBasePath(), change.getBaseRevision()
>+                 )
>+-            except exceptions.LookupError:
>++            except LookupError:
>+                 # fall back
>+                 pass
>+ 
>+@@ -364,7 +363,7 @@
>+                 enc2 = self._getContentEncoding(
>+                     change.path, change.revision
>+                 )
>+-            except exceptions.LookupError:
>++            except LookupError:
>+                 # fall back
>+                 pass
>+ 
>+@@ -389,7 +388,6 @@
>+             @exception encodings.exception.LookupError: The specified encoding
>+                 is not implemented or no encoding was specified
>+         """
>+-        from encodings import exceptions
>+ 
>+         # first try the svn:mime-type
>+         enc = self.getEncodingFromMimeType(path, revision)
>+@@ -427,7 +425,7 @@
>+             codecs.lookup(enc)
>+             return enc
>+ 
>+-        raise exceptions.LookupError("No Encoding configured")
>++        raise LookupError("No Encoding configured")
>+ 
>+ 
>+     def getEncodingFromMimeType(self, path, revision):

Actions: View | Diff

Attachments on bug 116885: 81631