3 files changed, 3 insertions, 7 deletions

diff --git a/src/mailman/database/postgresql.py b/src/mailman/database/postgresql.py
index 879594459..6362f999c 100644
--- a/src/mailman/database/postgresql.py
+++ b/src/mailman/database/postgresql.py
@@ -25,8 +25,6 @@ __all__ = [
     ]
 
 
-import psycopg2
-
 from operator import attrgetter
 from urlparse import urlsplit, urlunsplit
 
@@ -51,7 +49,6 @@ class PostgreSQLDatabase(StormBaseDatabase):
     """Database class for PostgreSQL."""
 
     TAG = 'postgres'
-    Error = psycopg2.ProgrammingError
 
     def _database_exists(self, store):
         """See `BaseDatabase`."""
diff --git a/src/mailman/database/sqlite.py b/src/mailman/database/sqlite.py
index 39e7e8113..4e5df55a5 100644
--- a/src/mailman/database/sqlite.py
+++ b/src/mailman/database/sqlite.py
@@ -27,7 +27,6 @@ __all__ = [
 
 import os
 import shutil
-import sqlite3
 import tempfile
 
 from urlparse import urlparse
@@ -50,7 +49,6 @@ class SQLiteDatabase(StormBaseDatabase):
     """Database class for SQLite."""
 
     TAG = 'sqlite'
-    Error = sqlite3.OperationalError
 
     def _database_exists(self, store):
         """See `BaseDatabase`."""
diff --git a/src/mailman/database/tests/test_migrations.py b/src/mailman/database/tests/test_migrations.py
index 90f2a9dfe..777e84fac 100644
--- a/src/mailman/database/tests/test_migrations.py
+++ b/src/mailman/database/tests/test_migrations.py
@@ -30,6 +30,7 @@ __all__ = [
 import unittest
 
 from pkg_resources import resource_string
+from storm.exceptions import DatabaseError
 from zope.component import getUtility
 
 from mailman.config import config
@@ -78,7 +79,7 @@ class TestMigration20120407Schema(unittest.TestCase):
         # Verify that the database has not yet been migrated.
         for missing in ('archive_policy',
                         'nntp_prefix_subject_too'):
-            self.assertRaises(self._database.Error,
+            self.assertRaises(DatabaseError,
                               self._database.store.execute,
                               'select {0} from mailinglist;'.format(missing))
             # Avoid PostgreSQL complaint: InternalError: current transaction
@@ -115,7 +116,7 @@ class TestMigration20120407Schema(unittest.TestCase):
                         'news_moderation',
                         'news_prefix_subject_too',
                         'nntp_host'):
-            self.assertRaises(self._database.Error,
+            self.assertRaises(DatabaseError,
                               self._database.store.execute,
                               'select {0} from mailinglist;'.format(missing))
             # Avoid PostgreSQL complaint: InternalError: current transaction