[Python-modules-commits] r13398 - in packages/ldaptor/trunk/debian (4 files)
jandd at users.alioth.debian.org
jandd at users.alioth.debian.org
Sat Jun 12 00:01:23 UTC 2010
Date: Saturday, June 12, 2010 @ 00:00:32
Author: jandd
Revision: 13398
* add debian/patches/04_replace_string_exceptions_585240_585298_.patch
to replace string exceptions by real Exception instances (Closes:
#585240, #585298)
* debian/control:
- bump Standards-Version to 3.8.4 (no changes needed)
- remove unnecessary Build-Depends python-all-dev
- add python (>= 2.5.4-1~) to Build-Depends
Added:
packages/ldaptor/trunk/debian/patches/04_replace_string_exceptions_585240_585298_.patch
Modified:
packages/ldaptor/trunk/debian/changelog
packages/ldaptor/trunk/debian/control
packages/ldaptor/trunk/debian/patches/series
Modified: packages/ldaptor/trunk/debian/changelog
===================================================================
--- packages/ldaptor/trunk/debian/changelog 2010-06-11 21:50:22 UTC (rev 13397)
+++ packages/ldaptor/trunk/debian/changelog 2010-06-12 00:00:32 UTC (rev 13398)
@@ -1,3 +1,15 @@
+ldaptor (0.0.43+debian1-2) unstable; urgency=low
+
+ * add debian/patches/04_replace_string_exceptions_585240_585298_.patch
+ to replace string exceptions by real Exception instances (Closes:
+ #585240, #585298)
+ * debian/control:
+ - bump Standards-Version to 3.8.4 (no changes needed)
+ - remove unnecessary Build-Depends python-all-dev
+ - add python (>= 2.5.4-1~) to Build-Depends
+
+ -- Jan Dittberner <jandd at debian.org> Sat, 12 Jun 2010 01:59:44 +0200
+
ldaptor (0.0.43+debian1-1) unstable; urgency=low
* repack tarball to remove upstream debian directory (fix lintian warnings
Modified: packages/ldaptor/trunk/debian/control
===================================================================
--- packages/ldaptor/trunk/debian/control 2010-06-11 21:50:22 UTC (rev 13397)
+++ packages/ldaptor/trunk/debian/control 2010-06-12 00:00:32 UTC (rev 13398)
@@ -3,13 +3,13 @@
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Jan Dittberner <jandd at debian.org>
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Build-Depends-Indep: docbook-slides (>= 3.2.0), xsltproc,
source-highlight, python-epydoc, dia (>= 0.93-2), python-docutils,
python-twisted-core, python-twisted-names, python-twisted-mail,
python-twisted-web, python-nevow, python-webut, python-pyparsing,
- python-openssl, python-crypto, python-support (>= 0.6)
-Build-Depends: debhelper (>= 7.0.50), python-all-dev
+ python-openssl, python-crypto, python-support (>= 0.6), python (>= 2.5.4-1~)
+Build-Depends: debhelper (>= 7.0.50)
XS-Python-Version: all
Homepage: http://www.inoi.fi/open/trac/ldaptor
Vcs-Svn: svn://svn.debian.org/python-modules/packages/ldaptor/trunk/
Added: packages/ldaptor/trunk/debian/patches/04_replace_string_exceptions_585240_585298_.patch
===================================================================
--- packages/ldaptor/trunk/debian/patches/04_replace_string_exceptions_585240_585298_.patch (rev 0)
+++ packages/ldaptor/trunk/debian/patches/04_replace_string_exceptions_585240_585298_.patch 2010-06-12 00:00:32 UTC (rev 13398)
@@ -0,0 +1,75 @@
+Subject: replace string literal exceptions with real Exceptions
+Author: Jan Dittberner <jandd at debian.org>
+--- a/ldaptor/apps/webui/add.py
++++ b/ldaptor/apps/webui/add.py
+@@ -269,7 +269,7 @@
+ changes = []
+ for k,v in kw.items():
+ if hasattr(self, "nonUserEditableAttributeType_"+k):
+- raise "Can't set attribute %s when adding." % k
++ raise Exception("Can't set attribute %s when adding." % k)
+ elif k[:len("add_")]=="add_":
+ if not v:
+ continue
+--- a/ldaptor/protocols/ldap/ldapclient.py
++++ b/ldaptor/protocols/ldap/ldapclient.py
+@@ -196,7 +196,7 @@
+ ##Unbind
+ def unbind(self):
+ if not self.connected:
+- raise "Not connected (TODO)" #TODO make this a real object
++ raise Exception("Not connected (TODO)") #TODO make this a real object
+ r=pureldap.LDAPUnbindRequest()
+ self.send_noResponse(r)
+ self.transport.loseConnection()
+--- a/ldaptor/protocols/pureldap.py
++++ b/ldaptor/protocols/pureldap.py
+@@ -464,7 +464,7 @@
+ assert final is None
+ any.append(s.asText())
+ else:
+- raise 'TODO'
++ raise NotImplementedError('TODO: Filter type not supported %r' % s)
+
+ if initial is None:
+ initial=''
+--- a/ldaptor/schema.py
++++ b/ldaptor/schema.py
+@@ -143,7 +143,7 @@
+ self.name=self._strings_to_list(text[:end])
+ text=text[end+1:]
+ else:
+- raise "TODO"
++ raise NotImplementedError("TODO")
+
+
+ text = text.lstrip()
+@@ -382,7 +382,7 @@
+ self.name=self._strings_to_list(text[:end])
+ text=text[end+1:]
+ else:
+- raise "TODO"
++ raise NotImplementedError("TODO")
+
+
+ text = text.lstrip()
+@@ -651,7 +651,7 @@
+ self.name=self._strings_to_list(text[:end])
+ text=text[end+1:]
+ else:
+- raise "TODO"
++ raise NotImplementedError("TODO")
+
+ text = text.lstrip()
+
+--- a/ldaptor/test/test_ldapsyntax.py
++++ b/ldaptor/test/test_ldapsyntax.py
+@@ -1215,7 +1215,7 @@
+ return 'This test run should succeed'
+
+ def chainMustErrback(dummy):
+- raise 'Should never get here'
++ raise RuntimeError('Should never get here')
+ d.addCallbacks(callback=chainMustErrback, errback=checkError)
+ d.addCallback(self.assertEquals, 'This test run should succeed')
+ def cb(dummy):
Modified: packages/ldaptor/trunk/debian/patches/series
===================================================================
--- packages/ldaptor/trunk/debian/patches/series 2010-06-11 21:50:22 UTC (rev 13397)
+++ packages/ldaptor/trunk/debian/patches/series 2010-06-12 00:00:32 UTC (rev 13398)
@@ -1,3 +1,4 @@
01_restore_pristine_code.patch
02_fix_526522.patch
03_fix_dia_invocation_545663.patch
+04_replace_string_exceptions_585240_585298_.patch
More information about the Python-modules-commits
mailing list