[patch] Make svnmailer work under python-2.5, but breaks backwards compatibility.

svnmailer-1.0.8-python2.5.diff (text/plain), 1.57 KB, created by Tais P. Hansen on 2008-02-12 15:32:06 UTC

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