[Python-apps-commits] r10086 - in packages/svnmailer/trunk/debian (3 files)

[anbe at users.alioth.debian.org]

    Date: Wednesday, October 16, 2013 @ 08:21:40
  Author: anbe
Revision: 10086

drop 01_restore_pristine_code.patch

Modified:
  packages/svnmailer/trunk/debian/changelog
  packages/svnmailer/trunk/debian/patches/series
Deleted:
  packages/svnmailer/trunk/debian/patches/01_restore_pristine_code.patch

Modified: packages/svnmailer/trunk/debian/changelog
===================================================================
--- packages/svnmailer/trunk/debian/changelog	2013-10-16 08:17:12 UTC (rev 10085)
+++ packages/svnmailer/trunk/debian/changelog	2013-10-16 08:21:40 UTC (rev 10086)
@@ -8,6 +8,7 @@
       LookupError is no longer imported explicitly
     - Work around the double-quoted-printable issue by defaulting to 8bit.
       (Closes: #385246)
+  * Drop patch restore_pristine_code, fixed upstream.
   * Revert SVN_STREAM_CHUNK_SIZE int vs. long workaround, this has been fixed
     in python-subversion (see #683188).
   * Switch from dpatch to source format 3.0 (quilt).

Deleted: packages/svnmailer/trunk/debian/patches/01_restore_pristine_code.patch
===================================================================
--- packages/svnmailer/trunk/debian/patches/01_restore_pristine_code.patch	2013-10-16 08:17:12 UTC (rev 10085)
+++ packages/svnmailer/trunk/debian/patches/01_restore_pristine_code.patch	2013-10-16 08:21:40 UTC (rev 10086)
@@ -1,47 +0,0 @@
-Author: Sandro Tosi <morph at debian.org>
-Description: New patch generated from svnmailer 1.0.8-10 diff.gz
---- a/src/lib/svnmailer/notifier/_base.py
-+++ b/src/lib/svnmailer/notifier/_base.py
-@@ -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):

Modified: packages/svnmailer/trunk/debian/patches/series
===================================================================
--- packages/svnmailer/trunk/debian/patches/series	2013-10-16 08:17:12 UTC (rev 10085)
+++ packages/svnmailer/trunk/debian/patches/series	2013-10-16 08:21:40 UTC (rev 10086)
@@ -1 +0,0 @@
-01_restore_pristine_code.patch