diff options
| author |   Hanno Böck <hanno@gentoo.org> | 2008-04-06 13:41:21 +0000 |
|---|---|---|
| committer | Hanno Böck <hanno@gentoo.org> | 2008-04-06 13:41:21 +0000 |
| commit | 87a23abb1e3494b7e9e48779283ac2c76c0c6385 (patch) | |
| tree | b20ccbb9003ba31947927a9c24a1ec3a85e80605 /dev-util/svnmailer/files | |
| parent | version bump for bug #214627, bug #161930 and bug #214550 (diff) | |
| download | gentoo-2-87a23abb1e3494b7e9e48779283ac2c76c0c6385.tar.gz gentoo-2-87a23abb1e3494b7e9e48779283ac2c76c0c6385.tar.bz2 gentoo-2-87a23abb1e3494b7e9e48779283ac2c76c0c6385.zip | |
svnmailer python 2.5 support
(Portage version: 2.1.5_rc2)
Diffstat (limited to 'dev-util/svnmailer/files')
| -rw-r--r-- | dev-util/svnmailer/files/svnmailer-1.0.8-python2.5.diff | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/dev-util/svnmailer/files/svnmailer-1.0.8-python2.5.diff b/dev-util/svnmailer/files/svnmailer-1.0.8-python2.5.diff new file mode 100644 index 000000000000..348f26f36a0a --- /dev/null +++ b/dev-util/svnmailer/files/svnmailer-1.0.8-python2.5.diff @@ -0,0 +1,47 @@ +Index: src/lib/svnmailer/notifier/_base.py +=================================================================== +--- src/lib/svnmailer/notifier/_base.py ++++ src/lib/svnmailer/notifier/_base.py 2007-05-01 00:54:23.000000000 +0200 +@@ -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): |