From 0a4a13fe572c38c3eaedee972fb4ec2bc5f37f53 Mon Sep 17 00:00:00 2001 From: Logan Hanks Date: Tue, 17 Jan 2012 14:34:16 -0800 Subject: [PATCH] Replace SQLError (which no longer exists) with DBAPIError. --- r2/r2/lib/db/tdb_sql.py | 4 ++-- r2/r2/models/mail_queue.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/r2/r2/lib/db/tdb_sql.py b/r2/r2/lib/db/tdb_sql.py index 5f3fab4f9..0d3e55dc4 100644 --- a/r2/r2/lib/db/tdb_sql.py +++ b/r2/r2/lib/db/tdb_sql.py @@ -369,7 +369,7 @@ def make_thing(type_id, ups, downs, date, deleted, spam, id=None): id = do_insert(table) params['thing_id'] = id return id - except sa.exc.SQLError, e: + except sa.exc.DBAPIError, e: if not 'IntegrityError' in e.message: raise # wrap the error to prevent db layer bleeding out @@ -417,7 +417,7 @@ def make_relation(rel_type_id, thing1_id, thing2_id, name, date=None): name = name, date = date) return r.last_inserted_ids()[0] - except sa.exc.SQLError, e: + except sa.exc.DBAPIError, e: if not 'IntegrityError' in e.message: raise # wrap the error to prevent db layer bleeding out diff --git a/r2/r2/models/mail_queue.py b/r2/r2/models/mail_queue.py index ea5f654a7..0170fe00c 100644 --- a/r2/r2/models/mail_queue.py +++ b/r2/r2/models/mail_queue.py @@ -175,7 +175,7 @@ class EmailHandler(object): has_opted_out(email, _update = True) opt_count(_update = True) return (email, True) - except sa.exc.SQLError: + except sa.exc.DBAPIError: return (email, False) return (None, False)