Move LIVE_DB constant into pgwui.default_db ini file setting

diff --git a/src/pgwui_core/core.py b/src/pgwui_core/core.py
index 38e69dbb34b3f7cec99abf44f2cf0341ac0f2405..9b5779af81273b708c7a3f86067da56b65e0b687 100644 (file)
--- a/src/pgwui_core/core.py
+++ b/src/pgwui_core/core.py
@@ -66,29 +66,44 @@ from pgwui_core import form_constants
 # Setup default values for forms.
 
 class UserInitialPost():
-    db = form_constants.LIVE_DB
+    def __init__(self, settings={}):
+        super().__init__()
+        self.db = settings.get('pgwui.default_db', '')
+
     user = ''
     password = ''
 
 
 class AuthInitialPost():
+    def __init__(self, settings={}):
+        super().__init__()
+
     db = ''
     user = ''
     password = ''
 
 
 class UploadFileInitialPost(AuthInitialPost):
+    def __init__(self, settings={}):
+        super().__init__(settings)
+
     upload_fmt = form_constants.CSV
     datafile = ''
     trim_upload = True
 
 
 class UploadNullFileInitialPost(UploadFileInitialPost):
+    def __init__(self, settings={}):
+        super().__init__(settings)
+
     upload_null = True
     null_rep = ''
 
 
 class UploadTableInitialPost(UploadNullFileInitialPost):
+    def __init__(self, settings={}):
+        super().__init__(settings)
+
     table = ''
 
 
@@ -197,7 +212,8 @@ class LoadedForm(collections.MutableMapping):
 
         In this case we instantiate _form and give it some defaults
         '''
-        self._form = self._fc(self.uh.request.POST, self._fc.ivals)
+        ivals = self._fc.ivals(self.uh.request.registry.settings)
+        self._form = self._fc(self.uh.request.POST, ivals)
 
     def write(self, response, errors):
         '''

diff --git a/src/pgwui_core/form_constants.py b/src/pgwui_core/form_constants.py
index 932c20a593ecd380faa9f9ba1afa89884b8b484c..69799ad960e2a164efbe9ba9c7a4b038a63a8e0d 100644 (file)
--- a/src/pgwui_core/form_constants.py
+++ b/src/pgwui_core/form_constants.py
@@ -22,7 +22,6 @@
 # Constants used by the GMI pyramid programs.
 
 # The various important containers.
-LIVE_DB = 'gombemi'
 TEST_DB = 'gombemi_test'
 DEFAULT_SCHEMA = 'gombemi'
 

diff --git a/tests/test_core.py b/tests/test_core.py
index 4ac6edb5d3a03e4b672f58f6f5c54109e8262e17..a02b383820327a7f28cc3d63ac500dd7bf34430e 100644 (file)
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -20,11 +20,12 @@
 # Karl O. Pinc <kop@meme.com>
 
 from pgwui_core import core
-from pgwui_core import form_constants
 
 
 def test_userinitialpost_init():
-    uip = core.UserInitialPost()
-    assert uip.db == form_constants.LIVE_DB
+    default_db = 'defaultdb'
+    settings = {'pgwui.default_db': default_db}
+    uip = core.UserInitialPost(settings)
+    assert uip.db == default_db
     assert uip.user == ''
     assert uip.password == ''