3 files changed, 14 insertions, 12 deletions
diff --git a/python/intex/intex_scenarios.py b/python/intex/intex_scenarios.py
index eece4876..0b15d64a 100644
--- a/python/intex/intex_scenarios.py
+++ b/python/intex/intex_scenarios.py
@@ -25,7 +25,7 @@ pattern9 = re.compile("(?P<a>SEVERITY\[\w+,\d+\]=)mkt\(70\)")
 global_reinvfloatpercentage = 84
 global_reinvfixedpercentage = 16
 
-@with_connection
+@with_connection('etdb')
 def dealname_from_cusip(conn, cusips):
     with conn.cursor() as c:
         c.callproc("dealname_from_cusip", params = cusip)
diff --git a/python/intex/load_indicative.py b/python/intex/load_indicative.py
index 0686ca92..145325df 100644
--- a/python/intex/load_indicative.py
+++ b/python/intex/load_indicative.py
@@ -5,7 +5,8 @@ from datetime import date
 import csv, sys, re
 import pdb
 from common import root, sanitize_float
-from db import conn
+from db import dbconn
+from contextlib import closing
 import logging
 
 logger = logging.getLogger(__name__)
@@ -184,10 +185,10 @@ if __name__=="__main__":
     cusip_files = [f for f in files if "TrInfo" in f]
     deal_files = [f for f in files if "TrInfo" not in f]
 
-    #first load deal data
-    for deal in deal_files:
-        upload_deal_data(conn, deal)
-    #then load tranche data
-    for cusip in cusip_files:
-        upload_cusip_data(conn, cusip)
-    conn.close()
+    with closing(dbconn('etdb')) as etdb:
+        #first load deal data
+        for deal in deal_files:
+            upload_deal_data(etdb, deal)
+            #then load tranche data
+        for cusip in cusip_files:
+            upload_cusip_data(etdb, cusip)
diff --git a/python/intex/load_intex_collateral.py b/python/intex/load_intex_collateral.py
index cde12587..add1e127 100644
--- a/python/intex/load_intex_collateral.py
+++ b/python/intex/load_intex_collateral.py
@@ -2,11 +2,12 @@ import psycopg2
 import os, csv, datetime
 import pdb
 from common import root, sanitize_float
-from db import conn
+from db import dbconn
 import sys
 import uuid
 from intex.load_indicative import upload_cusip_data, upload_deal_data
 import logging
+from contextlib import closing
 
 logger = logging.getLogger(__name__)
 
@@ -146,6 +147,6 @@ if __name__ == "__main__":
         workdate = sys.argv[1]
     else:
         workdate = str(datetime.date.today())
-    intex_data(conn, workdate)
-    conn.close()
+    with dbconn('etdb') as etdb:
+        intex_data(etdb, workdate)
     print("done")