--- svnmailer-1.0.8.orig/debian/svnmailer.conf
+++ svnmailer-1.0.8/debian/svnmailer.conf
@@ -0,0 +1,25 @@
+[general]
+config_charset = iso-8859-1
+sendmail_command = /usr/sbin/sendmail
+# debug_all_mails_to = acid@naquadah.org
+
+[defaults]
+commit_subject_prefix = [svn] commit:
+propchange_subject_prefix = [svn] revpropchange:
+from_addr = subversion@naquadah.org
+generate_diffs = modify
+
+[iup]
+for_repos = .*iup$
+to_addr = acid@naquadah.org diodo@oute.org
+
+[vhffs]
+for_repos = .*vhffs$
+to_addr = vhffs-dev@vhffs.org
+from_addr = vhffs-dev@vhffs.org 
+
+[home-acid]
+for_repos = /home/staff/acid/svn/home$
+to_addr = acid+svn@naquadah.org
+from_addr = acid+svn@naquadah.org
+generate_diffs = none
--- svnmailer-1.0.8.orig/debian/watch
+++ svnmailer-1.0.8/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://storage.perlig.de/svnmailer/svnmailer-([\d\.]*)\.tar.*
--- svnmailer-1.0.8.orig/debian/changelog
+++ svnmailer-1.0.8/debian/changelog
@@ -0,0 +1,213 @@
+svnmailer (1.0.8-12) unstable; urgency=low
+
+  * debian/control
+    - update section to 'vcs', to match override file
+    - set XS-Python-Version: to 'all', it's compatibile with all the supported
+      version of Python
+    - bump Standards-Version to 3.8.4 (no changes needed)
+    - add ${misc:Depends} to Depends
+
+ -- Sandro Tosi <morph@debian.org>  Sat, 20 Mar 2010 17:25:37 +0100
+
+svnmailer (1.0.8-11) unstable; urgency=low
+
+  [ Julien Lavergne ]
+  * From Ubuntu, prepare for the future python transition:
+   - debian/rules: 
+    + Include /usr/share/python/python.mk
+    + Add $(py_setup_install_args) to setup.py install
+   - debian/control: 
+    + Bump build-depends to python (>= 2.5.4-1~)
+    + Bump build-depends to debhelper (>= 5.0.38)
+
+  [ Sandro Tosi ]
+  * debian/control
+    - bump Standards-Version to 3.8.3 (no changes needed)
+    - set XS-Python-Version to '2.5' not to 'current'
+  * debian/{dirs, pycompat}
+    - removed since not needed
+  * debian/svnmailer.doc-base
+    - added doc-base
+
+ -- Sandro Tosi <morph@debian.org>  Thu, 08 Oct 2009 22:31:40 +0200
+
+svnmailer (1.0.8-10) unstable; urgency=low
+
+  * debian/control
+    - adopting under PAPT team (adding me as uploader); Closes: #506640
+    - added dpatch to build-deps
+    - added Homepage field
+    - bump Standards-Version to 3.8.0
+      + added debian/README.source
+    - added Vcs-{Svn,Browser} fields
+    - moved python (removing python-dev) to Build-Dep instad of
+      Build-Depends-Indep
+    - added X{S,B}-Python-Version fields (removing debian/pyversions)
+    - little improvements on descriptions
+  * debian/rules
+    - added dpatch stuff
+  * debian/patches/01_restore_pristine_code.dpatch
+    - added to remove direct upstream code modifications
+  * debian/watch
+    - added
+  * debian/rules
+    - removed configure target, since not needed
+    - removed un-needed dh_* calls
+    - added setup.py clean call
+  * debian/copyright
+    - removed Apache 2.0 full text and refer to the file on Debian system
+    - added upstream author section
+    - indented license and copyrigth with 4 spaces
+    - added file NOTICE text
+
+ -- Sandro Tosi <morph@debian.org>  Tue, 25 Nov 2008 13:05:16 +0100
+
+svnmailer (1.0.8-9) unstable; urgency=medium
+
+  * Use standard python lookup error (Closes: #482919)
+  * Bump standard version
+  * Switch to dh 5
+  * Fix configuration paths in manpage (Closes: #471075)
+  * Fix documentatin path in manpage (Closes: #422252)
+
+ -- Julien Danjou <acid@debian.org>  Mon, 02 Jun 2008 10:36:45 +0200
+
+svnmailer (1.0.8-8) unstable; urgency=low
+
+  * Add a note in README.Debian that hook script should be +x
+    and how to fix the double encoded problem.
+
+ -- Julien Danjou <acid@debian.org>  Wed, 10 Oct 2007 10:13:17 +0200
+
+svnmailer (1.0.8-7) unstable; urgency=low
+
+  * Improve description (Closes: #404369)
+
+ -- Julien Danjou <acid@debian.org>  Sun, 24 Dec 2006 10:25:36 +0100
+
+svnmailer (1.0.8-6) unstable; urgency=low
+
+  * Fix the new Python bordel (Closes: #382006)
+
+ -- Julien Danjou <acid@debian.org>  Tue,  8 Aug 2006 12:13:46 +0200
+
+svnmailer (1.0.8-5) unstable; urgency=low
+
+  * Switch to new Python policy (Closes: #380967)
+  * Bump standards version
+
+ -- Julien Danjou <acid@debian.org>  Tue,  1 Aug 2006 14:13:36 +0200
+
+svnmailer (1.0.8-4) unstable; urgency=low
+
+  * Fix FTBFS caused by #363368
+  * Fix clean target in debian/rules, remove build/
+  * Build-dep on debhelper instead of build-dep-indep
+
+ -- Julien Danjou <acid@debian.org>  Sat, 22 Apr 2006 16:06:52 +0200
+
+svnmailer (1.0.8-3) unstable; urgency=low
+
+  * Use manpage from upstream instead
+
+ -- Julien Danjou <acid@debian.org>  Fri, 21 Apr 2006 18:30:42 +0200
+
+svnmailer (1.0.8-2) unstable; urgency=low
+
+  * Add a manpage (Closes: #317377)
+
+ -- Julien Danjou <acid@debian.org>  Fri, 21 Apr 2006 10:01:30 +0200
+
+svnmailer (1.0.8-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Julien Danjou <acid@debian.org>  Mon, 17 Apr 2006 13:36:07 +0200
+
+svnmailer (1.0.7-1) unstable; urgency=low
+
+  * New upstream release 
+
+ -- Julien Danjou <acid@debian.org>  Sun, 26 Mar 2006 00:26:04 +0100
+
+svnmailer (1.0.6-1) unstable; urgency=low
+
+  * New upstream release 
+
+ -- Julien Danjou <acid@debian.org>  Mon,  6 Feb 2006 16:15:24 +0100
+
+svnmailer (1.0.5-3) unstable; urgency=low
+
+  * Fix this FTBFS again (Closes: #325678)
+
+ -- Julien Danjou <acid@debian.org>  Sun, 11 Dec 2005 18:54:17 +0100
+
+svnmailer (1.0.5-2) unstable; urgency=low
+
+  * Fix FTBFS (Closes: #325678)
+
+ -- Julien Danjou <acid@debian.org>  Thu, 13 Oct 2005 22:47:40 +0200
+
+svnmailer (1.0.5-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Julien Danjou <acid@debian.org>  Sun, 28 Aug 2005 22:29:09 +0200
+
+svnmailer (1.0.4-1) unstable; urgency=low
+
+  * New upstream release
+    + Adds the possibility to specify content type of diffs (Closes: #325288)
+  * Really add example (Closes: #325297) 
+
+ -- Julien Danjou <acid@debian.org>  Sun, 28 Aug 2005 19:25:51 +0200
+
+svnmailer (1.0.3-2) unstable; urgency=low
+
+  * Update control file 
+
+ -- Julien Danjou <acid@debian.org>  Tue,  2 Aug 2005 19:45:29 +0200
+
+svnmailer (1.0.3-1) unstable; urgency=low
+
+  * New upstream release 
+
+ -- Julien Danjou <acid@debian.org>  Tue,  2 Aug 2005 19:25:21 +0200
+
+svnmailer (1.0.2-2) unstable; urgency=low
+
+  * Add dependency on python2.3-subversion (Closes: #316989)
+
+ -- Julien Danjou <acid@debian.org>  Tue,  5 Jul 2005 17:27:00 +0200
+
+svnmailer (1.0.2-1) unstable; urgency=low
+
+  * New upstream release 
+
+ -- Julien Danjou <acid@debian.org>  Mon, 20 Jun 2005 20:13:54 +0200
+
+svnmailer (1.0.0-2) unstable; urgency=low
+
+  * Add an example configuration file and some notes in README.Debian
+    (Closes: #311009) 
+
+ -- Julien Danjou <acid@debian.org>  Fri, 27 May 2005 21:02:51 +0200
+
+svnmailer (1.0.0-1) unstable; urgency=low
+
+  * New upstream release 
+
+ -- Julien Danjou <acid@debian.org>  Sun, 22 May 2005 21:43:49 +0200
+
+svnmailer (0.9.9-2) unstable; urgency=low
+
+  * Add python-dev to Build-Deps (Closes: #306828)
+
+ -- Julien Danjou <acid@debian.org>  Thu, 28 Apr 2005 20:57:54 +0200
+
+svnmailer (0.9.9-1) unstable; urgency=low
+
+  * Initial Release. (Closes: #306178)
+
+ -- Julien Danjou <acid@debian.org>  Mon, 25 Apr 2005 14:42:27 +0200
+
--- svnmailer-1.0.8.orig/debian/docs
+++ svnmailer-1.0.8/debian/docs
@@ -0,0 +1,2 @@
+README
+docs
--- svnmailer-1.0.8.orig/debian/examples
+++ svnmailer-1.0.8/debian/examples
@@ -0,0 +1 @@
+debian/svnmailer.conf
--- svnmailer-1.0.8.orig/debian/README.source
+++ svnmailer-1.0.8/debian/README.source
@@ -0,0 +1,4 @@
+This package uses dpatch to handle patches against upstream source code; you
+can find additional information about dpatch at
+
+    /usr/share/doc/dpatch/
--- svnmailer-1.0.8.orig/debian/control
+++ svnmailer-1.0.8/debian/control
@@ -0,0 +1,25 @@
+Source: svnmailer
+Section: vcs
+Priority: optional
+Maintainer: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
+Uploaders: Sandro Tosi <morph@debian.org>
+Build-Depends: debhelper (>= 5.0.38), dpatch, python (>= 2.5.4-1~)
+Build-Depends-Indep: python-support (>= 0.3)
+Standards-Version: 3.8.4
+Homepage: http://opensource.perlig.de/svnmailer/
+Vcs-Svn: svn://svn.debian.org/svn/python-apps/packages/svnmailer/trunk/
+Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/svnmailer/trunk/
+XS-Python-Version: all
+
+Package: svnmailer
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}, python-subversion
+XB-Python-Version: ${python:Versions}
+Description: extensible Subversion commit notification tool
+ The svnmailer is a tool, which is usually called by a Subversion hook 
+ to submit commit notifications in various ways (at the moment: mail via 
+ SMTP or a pipe to a sendmail like program, news via NNTP, CIA live 
+ tracker notification via XML-RPC). It is derived from the original 
+ mailer.py distributed with Subversion, but supposed to be much more 
+ consistent, better extensible and to have much more features. Have a 
+ look at the documentation for further details. 
--- svnmailer-1.0.8.orig/debian/compat
+++ svnmailer-1.0.8/debian/compat
@@ -0,0 +1 @@
+5
--- svnmailer-1.0.8.orig/debian/rules
+++ svnmailer-1.0.8/debian/rules
@@ -0,0 +1,58 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+include /usr/share/dpatch/dpatch.make
+include /usr/share/python/python.mk
+
+build: build-stamp
+build-stamp: patch-stamp
+	dh_testdir
+
+	# Add here commands to compile the package.
+	python setup.py build
+
+	touch build-stamp
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+
+	# Add here commands to clean up after the build process.
+	python setup.py clean
+
+	dh_clean build-stamp build
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+
+	# Add here commands to install the package into debian/svnmailer.
+	python setup.py install --root=$(CURDIR)/debian/svnmailer $(py_setup_install_args)
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs CHANGES
+	dh_installman
+	dh_installdocs
+	dh_installexamples
+	dh_compress
+	dh_fixperms
+	dh_pysupport
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+# Build architecture-dependent files here.
+binary-arch: build install
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
--- svnmailer-1.0.8.orig/debian/svn-mailer.1
+++ svnmailer-1.0.8/debian/svn-mailer.1
@@ -0,0 +1,134 @@
+.\"  Copyright 2005-2006 André Malo or his licensors, as applicable
+.\"
+.\"  Licensed under the Apache License, Version 2.0 (the "License");
+.\"  you may not use this file except in compliance with the License.
+.\"  You may obtain a copy of the License at
+.\" 
+.\"      http://www.apache.org/licenses/LICENSE-2.0
+.\"
+.\"  Unless required by applicable law or agreed to in writing, software
+.\"  distributed under the License is distributed on an "AS IS" BASIS,
+.\"  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+.\"  See the License for the specific language governing permissions and
+.\"  limitations under the License.
+.\"
+.TH SVN-MAILER "1" "2006" "svn-mailer 1.0.8" "User Commands"
+.SH NAME
+svn-mailer \- A feature rich subversion commit notification tool
+.SH SYNOPSIS
+.B svn-mailer
+\fB\-\-commit\fR \fB\-d\fR \fIrepos\fR \fB\-r\fR \fIrev\fR [\fB\-f\fR \fIconfig\fR]
+
+.B svn-mailer
+\fB\-\-propchange\fR \fB\-d\fR \fIrepos\fR \fB\-r\fR \fIrev\fR \fB\-a\fR \fIauthor\fR \fB\-n\fR \fIpropname\fR
+    [\fB\-o\fR \fIaction\fR] [\fB\-f\fR \fIconfig\fR]
+
+.B svn-mailer
+\fB\-\-lock\fR \fB\-d\fR \fIrepos\fR \fB\-a\fR \fIauthor\fR [\fB\-f\fR \fIconfig\fR]
+
+.B svn-mailer
+\fB\-\-unlock\fR \fB\-d\fR \fIrepos\fR \fB\-a\fR \fIauthor\fR [\fB\-f\fR \fIconfig\fR]
+.SH DESCRIPTION
+The svnmailer package is a tool to post notifications of subversion events to
+various targets in different ways.  Currently implemented: Mail via SMTP or
+a sendmail pipe, news via NNTP, XML via XMLRPC to a CIA tracker (see
+http://cia.navi.cx/ for details).
+
+The \fBsvn\-mailer\fR command line script is typically invoked via
+subversion's hook mechanism, but you can run it manually as well.  This is
+useful to resend missing messages or for debugging purposes.  Remember
+to start it under the correct user/group id.  Otherwise it may have problems
+to open the repository or the config file.
+
+The svnmailer can be used in most cases as a drop-in replacement for
+\fImailer.py\fR distributed with subversion.  There are some subtle differences
+which are dedicated to more behavior consistency.  (Hopefully) all of them are
+stated in the HTML documentation.
+.SS GENERAL OPTIONS
+.TP
+\fB\-\-version\fR
+show program's version number and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show a help message and exit
+.SS COMMON PARAMETERS
+.TP
+\fB\-\-debug\fR
+Run in debug mode (means basically that all messages are
+sent to STDOUT)
+.TP
+\fB\-dREPOSITORY\fR, \fB\-\-repository\fR=\fIREPOSITORY\fR
+The repository directory
+.TP
+\fB\-fCONFIG\fR, \fB\-\-config\fR=\fICONFIG\fR
+The configuration file
+.TP
+\fB\-ePATH_ENCODING\fR, \fB\-\-path\-encoding\fR=\fIPATH_ENCODING\fR
+Specifies the character encoding to be used for
+filenames. By default the encoding is tried to be
+determined automatically depending on the locale.
+.SS BEHAVIOR OPTIONS
+.PP
+The behavior options are mutually exclusive, i.e. the last one wins.
+.TP
+\fB\-c\fR, \fB\-\-commit\fR
+This is a regular commit of versioned data (post-commit hook). This is default.
+.TP
+\fB\-p\fR, \fB\-\-propchange\fR
+This is a modification of unversioned properties (post-revprop-change hook)
+.TP
+\fB\-l\fR, \fB\-\-lock\fR
+(svn 1.2 and later) This is a locking call (post-lock hook). The locked file
+names are read from STDIN.
+.TP
+\fB\-u\fR, \fB\-\-unlock\fR
+(svn 1.2 and later) This is a unlocking call (post-unlock hook). The unlocked
+file names are read from STDIN.
+.SS SUPPLEMENTAL PARAMETERS
+.TP
+\fB\-rREVISION\fR, \fB\-\-revision\fR=\fIREVISION\fR
+The modified/committed revision number
+.TP
+\fB\-aAUTHOR\fR, \fB\-\-author\fR=\fIAUTHOR\fR
+The author of the modification
+.TP
+\fB\-nPROPNAME\fR, \fB\-\-propname\fR=\fIPROPNAME\fR
+The name of the modified property
+.TP
+\fB\-oACTION\fR, \fB\-\-action\fR=\fIACTION\fR
+(svn 1.2 and later) The property change action. If specified, the old
+property value is read from STDIN.
+.SH "CONFIGURATION FILES"
+If the configuration file is not specified on the command line it is searched
+at default locations. The first one found is loaded. The locations are, in
+order: \fImailer.conf\fR in the \fIconf/\fR directory of the given
+repository, \fImailer.conf\fR in the script directory itself,
+\fI/etc/svn-mailer.conf\fR.
+.SH OLD STYLE COMMAND LINE
+Alternatively you can use the old style compatibility command lines (options
+described above don't apply then):
+
+\fBsvn\-mailer\fR \fBcommit\fR \fIrepos\fR \fIrev\fR [\fIconfig\fR]
+
+\fBsvn\-mailer\fR \fBpropchange\fR \fIrepos\fR \fIrev\fR \fIauthor\fR \fIpropname\fR [\fIconfig\fR]
+
+With svn 1.2 and later:
+.br
+\fBsvn\-mailer\fR \fBpropchange2\fR \fIrepos\fR \fIrev\fR \fIauthor\fR
+\fIpropname\fR \fIaction\fR [\fIconfig\fR]
+
+\fBsvn\-mailer\fR \fBlock\fR \fIrepos\fR \fIauthor\fR [\fIconfig\fR]
+
+\fBsvn\-mailer\fR \fBunlock\fR \fIrepos\fR \fIauthor\fR [\fIconfig\fR]
+.SH "REPORTING BUGS"
+If you've found a bug or have an idea how to improve the svnmailer,
+please send a mail to <\fIsvnmailer\-bugs@perlig.de\fR>.
+.SH "AUTHOR INFORMATION"
+Andr\('e "nd" Malo <nd@perlig.de>, GPG: 0x8103A37E
+.SH "SEE ALSO"
+The full documentation of the svnmailer package is maintained in HTML form.
+You may find it in the \fI/usr/share/doc/svnmailer/\fR directory at your
+site or online at <\fIhttp://opensource.perlig.de/svnmailer/\fR>.
+
+For detailed information about subversion, consult the subversion book at
+<\fIhttp://svnbook.red-bean.com/\fR>.
--- svnmailer-1.0.8.orig/debian/README.Debian
+++ svnmailer-1.0.8/debian/README.Debian
@@ -0,0 +1,21 @@
+svnmailer for Debian
+--------------------
+
+To use svnmailer, create a configuration file (an example is provided in
+/usr/share/doc/svnmailer/examples/) and add to your hooks/post-commit:
+
+REPOS="$1"
+REV="$2"
+/usr/bin/svn-mailer --commit --config <path>/svnmailer.conf --repository $REPOS --revision $REV
+
+Please make sure that your post-commit hook script is executable (chmod +x).
+
+For more complete information, read the full documentation.
+
+If you're mail are double encoded (python >= 2.4.3), you can set:
+
+  mail_transfer_encoding = 8bit
+
+to fix the problem.
+
+ -- Julien Danjou <acid@debian.org>, Fri, 27 May 2005 20:58:11 +0200
--- svnmailer-1.0.8.orig/debian/copyright
+++ svnmailer-1.0.8/debian/copyright
@@ -0,0 +1,26 @@
+This package was debianized by Julien Danjou <acid@debian.org> on
+Mon, 25 Apr 2005 14:42:27 +0200.
+
+It was downloaded from http://opensource.perlig.de/svnmailer/
+
+Upstream Author:
+
+    André Malo <nd@perlig.de>
+
+Copyright:
+
+    Copyright 2004-2006 André Malo
+
+License:
+
+    Apache 2.0
+
+On a Debian system the complete text of the Apache 2.0 License
+can be found in the file `/usr/share/common-licenses/Apache-2.0` .
+
+Information contained in NOTICE:
+    This product includes software developed by
+    CollabNet (http://www.Collab.Net/).
+
+    This product includes software developed by
+    The Apache Software Foundation (http://www.apache.org/).
--- svnmailer-1.0.8.orig/debian/manpages
+++ svnmailer-1.0.8/debian/manpages
@@ -0,0 +1 @@
+debian/svn-mailer.1
--- svnmailer-1.0.8.orig/debian/svnmailer.doc-base
+++ svnmailer-1.0.8/debian/svnmailer.doc-base
@@ -0,0 +1,9 @@
+Document: svnmailer
+Title: Svnmailer Documentation
+Author: André Malo
+Abstract: Documentation for svnmailer, an extensible Subversion commit notification tool whose purpose is to create human readable commit mails and correctly encoded other notifications.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/svnmailer/docs/index.html
+Files: /usr/share/doc/svnmailer/docs/*
--- svnmailer-1.0.8.orig/debian/patches/00list
+++ svnmailer-1.0.8/debian/patches/00list
@@ -0,0 +1 @@
+01_restore_pristine_code
--- svnmailer-1.0.8.orig/debian/patches/01_restore_pristine_code.dpatch
+++ svnmailer-1.0.8/debian/patches/01_restore_pristine_code.dpatch
@@ -0,0 +1,53 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_restore_pristine_code.dpatch by Sandro Tosi <morph@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: New patch generated from svnmailer 1.0.8-10 diff.gz
+
+@DPATCH@
+
+--- svnmailer-1.0.8.orig/src/lib/svnmailer/notifier/_base.py
++++ svnmailer-1.0.8/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):
