2 files changed, 11 insertions, 18 deletions
diff --git a/python/db.py b/python/db.py
index 084a1c44..5a4e10c8 100644
--- a/python/db.py
+++ b/python/db.py
@@ -22,17 +22,11 @@ def with_connection(f):
 
 @with_connection
 def query_db(conn, sqlstr, params=None, one=True):
-    c = conn.cursor()
-    if params:
-        c.execute(sqlstr, params)
-    else:
-        c.execute(sqlstr)
-    conn.commit()
-    if one:
-        r = c.fetchone()
-        c.close()
-        return r
-    else:
-        r = c.fetchall()
-        c.close()
-        return r
+    with conn.cursor() as c:
+        if params:
+            c.execute(sqlstr, params)
+        else:
+            c.execute(sqlstr)
+        conn.commit()
+        r = c.fetchone() if one else c.fetchall()
+    return r
diff --git a/python/intex_scenarios.py b/python/intex_scenarios.py
index ecc53c72..0bf3c044 100644
--- a/python/intex_scenarios.py
+++ b/python/intex_scenarios.py
@@ -27,10 +27,9 @@ global_reinvfixedpercentage = 16
 
 @with_connection
 def dealname_from_cusip(conn, cusips):
-    c = conn.cursor()
-    c.callproc("dealname_from_cusip", params = cusip)
-    dealnames = [d[0] for d in c.fetchall()]
-    c.close()
+    with conn.cursor() as c:
+        c.callproc("dealname_from_cusip", params = cusip)
+        dealnames = [d[0] for d in c.fetchall()]
     return dealnames
 
 def get_reinv_assets(dealname, workdate):