# HG changeset patch
# User lamblinp@ip03.m
# Date 1232151050 18000
# Node ID 7261e7d6368d70b774c9ea63df945ed35571c573
# Parent  5a7927691d2c88b377d21b4f9d1cde588f656435# Parent  d0c2c33a620f15d9884b280b6615e676bf6bb94f
merge.

diff -r d0c2c33a620f -r 7261e7d6368d pylearn/dbdict/sql.py
--- a/pylearn/dbdict/sql.py	Fri Jan 16 16:27:44 2009 -0500
+++ b/pylearn/dbdict/sql.py	Fri Jan 16 19:10:50 2009 -0500
@@ -1,5 +1,7 @@
 
-import sys, os, copy
+import sys, os, copy, time
+
+import numpy.random
 
 import sqlalchemy
 from sqlalchemy import create_engine, desc
@@ -102,7 +104,8 @@
                 # no jobs are left
                 keep_trying = False
         except (psycopg2.OperationalError,
-                sqlalchemy.exceptions.ProgrammingError), e:
+                sqlalchemy.exceptions.ProgrammingError,
+                sqlalchemy.exc.DBAPIError), e:
             #either the first() or the commit() raised
             s.rollback() # docs say to do this (or close) after commit raises exception
             if verbose: print 'caught exception', e