From a9effc0a0fb9f72b50ddd33c6f9d4d906192fd12 Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Sun, 15 Nov 2020 17:11:08 -0600 Subject: [PATCH] Move pgwui settings into its own dict --- src/pgwui_core/core.py | 8 ++++---- tests/test_core.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pgwui_core/core.py b/src/pgwui_core/core.py index 79f76d6..f4cc3f9 100644 --- a/src/pgwui_core/core.py +++ b/src/pgwui_core/core.py @@ -77,7 +77,7 @@ from pgwui_core.constants import ( class UserInitialPost(): def __init__(self, settings={}): super().__init__() - self.db = settings.get('pgwui.default_db', '') + self.db = settings['pgwui'].get('default_db', '') user = '' password = '' @@ -1467,8 +1467,8 @@ class DBConnector(object): database=self.db, user=self.user, password=self.password, - host=registry.settings.get('pgwui.pg_host'), - port=registry.settings.get('pgwui.pg_port')) + host=registry.settings['pgwui'].get('pg_host'), + port=registry.settings['pgwui'].get('pg_port')) except psycopg2.OperationalError: errors = [self.authfailerror_factory()] havecreds = False @@ -1658,7 +1658,7 @@ class UnsafeUploadEngine(DBConnector): conn.rollback() else: if ast.literal_eval( - self.uh.request.registry.settings['pgwui.dry_run']): + self.uh.request.registry.settings['pgwui']['dry_run']): conn.rollback() errors.append(self.dryrunerror_factory()) else: diff --git a/tests/test_core.py b/tests/test_core.py index 82a522c..0c2f889 100644 --- a/tests/test_core.py +++ b/tests/test_core.py @@ -24,7 +24,7 @@ from pgwui_core import core def test_userinitialpost_init(): default_db = 'defaultdb' - settings = {'pgwui.default_db': default_db} + settings = {'pgwui': {'default_db': default_db}} uip = core.UserInitialPost(settings) assert uip.db == default_db assert uip.user == '' -- 2.34.1