Catch the SQLa correct error (pypi#4567)

Author: dstufft

requirements/main.txt

@@ -217,7 +217,19 @@ google-resumable-media==0.3.1 \
 googleapis-common-protos==1.5.3 \
     --hash=sha256:c075eddaa2628ab519e01b7d75b76e66c40eaa50fc52758d8225f84708950ef2
 hiredis==0.2.0 \
-    --hash=sha256:ca958e13128e49674aa4a96f02746f5de5973f39b57297b84d59fd44d314d5b5
+    --hash=sha256:013c4e31be95bd5d9e45a0f830743458249012dc1691b45b1710976c280074a0 \
+    --hash=sha256:0805bd9e98551bc904e487388c871c039878e5bf8fefed26b504dfe505ac91b4 \
+    --hash=sha256:09025bdda2a17294be015bccab7c1039ed41c95cdbef8915f27006c5204e656c \
+    --hash=sha256:3f8b334c59c474e2b92580d7f4fb6503a08c013ae8a877ffc5c252f899d90ac6 \
+    --hash=sha256:45887ded08a2e819123124b5cec4ec1c7e272a8c453d35fecb6d36e5b8c54717 \
+    --hash=sha256:587f56d987cfa9397362d2f772b34ea69e61637fc0093807525e94cb919aa027 \
+    --hash=sha256:71303245ea72cd85e72705ad237eb9d3847cdeff45f4ec81b0fa08ef4941610f \
+    --hash=sha256:7fd22790038ea983a5ecf8e77697906f59e9f781873cc8c9d6618bebeed7fb0c \
+    --hash=sha256:824e223a0e5a3a7b81025aa35075b4be5eec7251cebb3d305b092bc6f0beacaa \
+    --hash=sha256:bb2744c6026fa4dc4fb6b58d7b36d62ce3f669bb785956d1e3705b7bdbc23e3c \
+    --hash=sha256:c8a2d8d874b1cf6fb104a777846cfa22224f44ce3bef451ec4ae5160082825f7 \
+    --hash=sha256:ca958e13128e49674aa4a96f02746f5de5973f39b57297b84d59fd44d314d5b5 \
+    --hash=sha256:f69bffe7c1ad38be95bbb2c3e5c3f6f4eecb28b2f431a3c3e1532509eea89c92
 html5lib==1.0.1 \
     --hash=sha256:20b159aa3badc9d5ee8f5c647e5efd02ed2a66ab8d354930bd9ff139fc1dc0a3 \
     --hash=sha256:66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736

tests/unit/test_db.py

@@ -21,6 +21,7 @@
 import zope.sqlalchemy
 
 from sqlalchemy import event
+from sqlalchemy.exc import OperationalError
 
 from warehouse import db
 from warehouse.db import (
@@ -148,7 +149,7 @@ def test_creates_engine(monkeypatch):
 
 def test_raises_db_available_error(pyramid_services, metrics):
     def raiser():
-        raise psycopg2.OperationalError()
+        raise OperationalError("foo", {}, psycopg2.OperationalError())
 
     engine = pretend.stub(connect=raiser)
     request = pretend.stub(

warehouse/db.py

@@ -23,7 +23,7 @@
 
 from sqlalchemy import event, inspect
 from sqlalchemy.dialects.postgresql import UUID
-from sqlalchemy.exc import IntegrityError
+from sqlalchemy.exc import IntegrityError, OperationalError
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker
 
@@ -168,7 +168,7 @@ def _create_session(request):
     # connections
     try:
         connection = request.registry["sqlalchemy.engine"].connect()
-    except psycopg2.OperationalError:
+    except OperationalError:
         # When we tried to connection to PostgreSQL, our database was not available for
         # some reason. We're going to log it here and then raise our error. Most likely
         # this is a transient error that will go away.