From 7b4646db705005681babee2287130cf983e38120 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Apr 20 2017 19:01:40 +0000 Subject: Remove not needed close statements It is not needed to close the connection after creating a database. Signed-off-by: Patrick Uiterwijk Reviewed-by: Randy Barlow Reviewed-by: Howard Johnson --- diff --git a/ipsilon/providers/openid/store.py b/ipsilon/providers/openid/store.py index 4b8d679..5ae3ea5 100644 --- a/ipsilon/providers/openid/store.py +++ b/ipsilon/providers/openid/store.py @@ -79,7 +79,6 @@ class OpenIDStore(Store, OpenIDStoreInterface): q = self._query(self._db, 'association', UNIQUE_DATA_TABLE, trans=False) q.create() - q._con.close() # pylint: disable=protected-access def _upgrade_schema(self, old_version): if old_version == 1: diff --git a/ipsilon/providers/openidc/store.py b/ipsilon/providers/openidc/store.py index 75cec4b..671cbfa 100644 --- a/ipsilon/providers/openidc/store.py +++ b/ipsilon/providers/openidc/store.py @@ -21,7 +21,6 @@ class OpenIDCStaticStore(Store): q = self._query(self._db, 'client', OPTIONS_TABLE, trans=False) q.create() - q._con.close() # pylint: disable=protected-access def _upgrade_schema(self, old_version): raise NotImplementedError() @@ -404,15 +403,12 @@ class OpenIDCStore(Store): q = self._query(self._db, 'client', UNIQUE_DATA_TABLE, trans=False) q.create() - q._con.close() # pylint: disable=protected-access q = self._query(self._db, 'token', UNIQUE_DATA_TABLE, trans=False) q.create() - q._con.close() # pylint: disable=protected-access q = self._query(self._db, 'userinfo', UNIQUE_DATA_TABLE, trans=False) q.create() - q._con.close() # pylint: disable=protected-access def _upgrade_schema(self, old_version): raise NotImplementedError() diff --git a/ipsilon/util/data.py b/ipsilon/util/data.py index 9486459..265b18d 100644 --- a/ipsilon/util/data.py +++ b/ipsilon/util/data.py @@ -797,7 +797,6 @@ class Store(Log): # the main codebase, and even in the same database. q = self._query(self._db, 'dbinfo', OPTIONS_TABLE, trans=False) q.create() - q._con.close() # pylint: disable=protected-access cls_name = self.__class__.__name__ current_version = self.load_options('dbinfo').get('%s_schema' % cls_name, {}) @@ -1106,7 +1105,6 @@ class AdminStore(Store): 'authz_config']: q = self._query(self._db, table, OPTIONS_TABLE, trans=False) q.create() - q._con.close() # pylint: disable=protected-access def _upgrade_schema(self, old_version): if old_version == 1: @@ -1127,7 +1125,6 @@ class AdminStore(Store): q = self._query(self._db, 'authz_config', OPTIONS_TABLE, trans=False) q.create() - q._con.close() # pylint: disable=protected-access self.save_options('authz_config', 'global', {'enabled': 'allow'}) return 3 else: @@ -1139,7 +1136,6 @@ class AdminStore(Store): q = self._query(self._db, table, UNIQUE_DATA_TABLE, trans=False) q.create() - q._con.close() # pylint: disable=protected-access class UserStore(Store): @@ -1226,7 +1222,6 @@ class UserStore(Store): def _initialize_table(self, tablename): q = self._query(self._db, tablename, OPTIONS_TABLE, trans=False) q.create() - q._con.close() # pylint: disable=protected-access def _initialize_schema(self): self._initialize_table('users') @@ -1266,7 +1261,6 @@ class TranStore(Store): q = self._query(self._db, self.table, UNIQUE_DATA_TABLE, trans=False) q.create() - q._con.close() # pylint: disable=protected-access def _upgrade_schema(self, old_version): if old_version == 1: @@ -1365,7 +1359,6 @@ class SAML2SessionStore(Store): q = self._query(self._db, self.table, UNIQUE_DATA_TABLE, trans=False) q.create() - q._con.close() # pylint: disable=protected-access def _upgrade_schema(self, old_version): if old_version == 1: diff --git a/ipsilon/util/sessions.py b/ipsilon/util/sessions.py index 74b6b7e..244a06e 100644 --- a/ipsilon/util/sessions.py +++ b/ipsilon/util/sessions.py @@ -27,7 +27,6 @@ class SessionStore(Store): q = self._query(self._db, 'sessions', SESSION_TABLE, trans=False) q.create() - q._con.close() # pylint: disable=protected-access def _upgrade_schema(self, old_version): if old_version == 1: