Package: python-repoze.what-plugins
Version: 20090531-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch



*** /tmp/tmpgfoe_M/bug_body
In Ubuntu, the attached patch was applied to achieve the following:

  * deal with sqlalchemy.exceptions -> sqlalchemy.exc name change
    in sqlalchemy 0.7

Ideally this should go to upstream as well :)

Thanks for considering the patch.

Cheers,
 Michael

-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 
'precise-proposed'), (500, 'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-18-generic (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u python-repoze.what-plugins-20090531/debian/changelog python-repoze.what-plugins-20090531/debian/changelog
diff -u python-repoze.what-plugins-20090531/debian/control python-repoze.what-plugins-20090531/debian/control
--- python-repoze.what-plugins-20090531/debian/control
+++ python-repoze.what-plugins-20090531/debian/control
@@ -1,7 +1,8 @@
 Source: python-repoze.what-plugins
 Section: python
 Priority: optional
-Maintainer: Debian Python Modules Team <python-modules-t...@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-t...@lists.alioth.debian.org>
 Uploaders:
  Stefano Zacchiroli <z...@debian.org>,
  Piotr Ożarowski <pi...@debian.org>
only in patch2:
unchanged:
--- python-repoze.what-plugins-20090531.orig/repoze.what.plugins.sql-1.0rc1/repoze/what/plugins/sql/adapters.py
+++ python-repoze.what-plugins-20090531/repoze.what.plugins.sql-1.0rc1/repoze/what/plugins/sql/adapters.py
@@ -60,7 +60,10 @@
 
 """
 
-from sqlalchemy.exceptions import SQLAlchemyError
+try:
+    from sqlalchemy.exceptions import SQLAlchemyError
+except ImportError:
+    from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm.exc import NoResultFound
 
 from repoze.what.adapters import BaseSourceAdapter, SourceError

Reply via email to