Attachment #81631 for bug #116885

View | Details | Raw Unified | Return to bug 116885
Collapse All | Expand All

Lines 19-24 Link Here

(-)Makefile (-1 / +6 lines)
19	USE_PYTHON= 2.3+	19	USE_PYTHON= 2.3+
20	USE_PYDISTUTILS= yes	20	USE_PYDISTUTILS= yes
21		21
		22	.include <bsd.port.pre.mk>
		23	.if ${PYTHON_REL} >= 250
		24	EXTRA_PATCHES+= ${FILESDIR}/25-patch-src__lib__svnmailer__notifier___base.py
		25	.endif
		26
22	PORTDOCS= index.html perlig.css perlig.jpg perlig_docs.css \	27	PORTDOCS= index.html perlig.css perlig.jpg perlig_docs.css \
23	perlig_offline.css right.gif up.gif	28	perlig_offline.css right.gif up.gif
24		29
Lines 32-35 Link Here
32	cd ${WRKSRC}/docs; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}	37	cd ${WRKSRC}/docs; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
33	.endif	38	.endif
34		39
35	.include <bsd.port.mk>	40	.include <bsd.port.post.mk>




--- ./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):

Return to bug 116885

Added Link Here

(-)files/25-patch-src__lib__svnmailer__notifier___base.py (+45 lines)
1	--- ./src/lib/svnmailer/notifier/_base.py.orig 2006-04-17 06:29:06.000000000 -0400
2	+++ ./src/lib/svnmailer/notifier/_base.py 2007-10-03 23:39:56.000000000 -0400
3	@@ -345,7 +345,6 @@
4	@return: The two encodings
5	@rtype: C{tuple} of C{str}
6	"""
7	- from encodings import exceptions
8
9	enc1 = enc2 = default
10	if not change.wasAdded() or change.wasCopied():
11	@@ -353,7 +352,7 @@
12	enc1 = self._getContentEncoding(
13	change.getBasePath(), change.getBaseRevision()
14	)
15	- except exceptions.LookupError:
16	+ except LookupError:
17	# fall back
18	pass
19
20	@@ -364,7 +363,7 @@
21	enc2 = self._getContentEncoding(
22	change.path, change.revision
23	)
24	- except exceptions.LookupError:
25	+ except LookupError:
26	# fall back
27	pass
28
29	@@ -389,7 +388,6 @@
30	@exception encodings.exception.LookupError: The specified encoding
31	is not implemented or no encoding was specified
32	"""
33	- from encodings import exceptions
34
35	# first try the svn:mime-type
36	enc = self.getEncodingFromMimeType(path, revision)
37	@@ -427,7 +425,7 @@
38	codecs.lookup(enc)
39	return enc
40
41	- raise exceptions.LookupError("No Encoding configured")
42	+ raise LookupError("No Encoding configured")
43
44
45	def getEncodingFromMimeType(self, path, revision):