From 11b46b15bcb2ec816232ff9d2efff8a3afc398c2 Mon Sep 17 00:00:00 2001 From: Jacob Wasserman Date: Tue, 8 Oct 2013 20:29:20 -0400 Subject: [PATCH] Open database connection within a context manager --- tests/test_geodataframe.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/tests/test_geodataframe.py b/tests/test_geodataframe.py index 0724c87..6e71b56 100644 --- a/tests/test_geodataframe.py +++ b/tests/test_geodataframe.py @@ -142,19 +142,21 @@ class TestDataFrame(unittest.TestCase): if not self.run_db_test: raise unittest.case.SkipTest() - con = psycopg2.connect(dbname='test_geopandas') - sql = "SELECT * FROM nybb;" - df = GeoDataFrame.read_postgis(sql, con) + with psycopg2.connect(dbname='test_geopandas') as con: + sql = "SELECT * FROM nybb;" + df = GeoDataFrame.read_postgis(sql, con) + self._validate_sql(df) def test_read_postgis_custom_geom_col(self): if not self.run_db_test: raise unittest.case.SkipTest() - con = psycopg2.connect(dbname='test_geopandas') - sql = """SELECT - borocode, boroname, shape_leng, shape_area, - geom AS __geometry__ - FROM nybb;""" - df = GeoDataFrame.read_postgis(sql, con, geom_col='__geometry__') + with psycopg2.connect(dbname='test_geopandas') as con: + sql = """SELECT + borocode, boroname, shape_leng, shape_area, + geom AS __geometry__ + FROM nybb;""" + df = GeoDataFrame.read_postgis(sql, con, geom_col='__geometry__') + self._validate_sql(df)