Bug#633843: sqlobject: diff for NMU version 0.12.4-2.1

tags 633843 + pending
thanks

Dear maintainer,

I've prepared an NMU for sqlobject (versioned as 0.12.4-2.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

.''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
: :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/
`. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
`-


diff -Nru sqlobject-0.12.4/debian/changelog sqlobject-0.12.4/debian/changelog
sqlobject-0.12.4/debian/changelog 2010-07-10 22:46:55.000000000 +0200
+++ sqlobject-0.12.4/debian/changelog 2012-01-14 15:12:15.000000000 +0100
@@ -1,3 +1,12 @@
+sqlobject (0.12.4-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix "autocommit issue with psycopg2":
+ new patch psycopg2-autocommit from upstream.
+ (Closes: #633843)
+
+ -- gregor herrmann <gregoa@debian.org> Sat, 14 Jan 2012 15:11:56 +0100
+
sqlobject (0.12.4-2) unstable; urgency=low

* Remove dh_auto ovverrides to ensure setup.py is used to build the package.
diff -Nru sqlobject-0.12.4/debian/patches/psycopg2-autocommit sqlobject-0.12.4/debian/patches/psycopg2-autocommit
sqlobject-0.12.4/debian/patches/psycopg2-autocommit 1970-01-01 01:00:00.000000000 +0100
+++ sqlobject-0.12.4/debian/patches/psycopg2-autocommit 2012-01-14 15:11:43.000000000 +0100
@@ -0,0 +1,32 @@
+Description: A bug caused by psycopg2 recently added a new boolean not callable autocommit attribute was fixed.
+Origin: upstream, http://sourceforge.net/mailarchive/...d=27799824
+Bug-Debian: http://bugs.debian.org/633843
+Author: phd
+Last-Update: 2012-01-14
+
+ a/sqlobject/postgres/pgconnection.py
++++ b/sqlobject/postgres/pgconnection.py
+@@ -117,7 +117,10 @@
+ def _setAutoCommit(self, conn, auto):
+ # psycopg2 does not have an autocommit method.
+ if hasattr(conn, 'autocommit'):
+- conn.autocommit(auto)
++ try:
++ conn.autocommit(auto)
++ except TypeError:
++ conn.autocommit = auto
+
+ def makeConnection(self):
+ try:
+@@ -127,10 +130,7 @@
+ conn = self.module.connect(**self.dsn_dict)
+ except self.module.OperationalError, e:
+ raise self.module.OperationalError("%s; used connection string %r" % (e, self.dsn))
+- if self.autoCommit:
+- # psycopg2 does not have an autocommit method.
+- if hasattr(conn, 'autocommit'):
+- conn.autocommit(1)
++ if self.autoCommit: self._setAutoCommit(conn, 1)
+ c = conn.cursor()
+ if self.schema:
+ c.execute("SET search_path TO " + self.schema)
diff -Nru sqlobject-0.12.4/debian/patches/series sqlobject-0.12.4/debian/patches/series
sqlobject-0.12.4/debian/patches/series 2010-07-10 22:46:25.000000000 +0200
+++ sqlobject-0.12.4/debian/patches/series 2012-01-14 15:05:43.000000000 +0100
@@ -1 +1,2 @@
get_rid_of_setuptools
+psycopg2-autocommit







To UNSUBSCRIBE, email to debian-bugs-rc-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org