Use instances for initial values

diff --git a/src/pgwui_core/core.py b/src/pgwui_core/core.py
index 3f8dd835817fe7eb0c4f08c38d074dc706b331ca..e6696396e7aca67147e2328a40ab67f3820d1b05 100644 (file)
--- a/src/pgwui_core/core.py
+++ b/src/pgwui_core/core.py
@@ -79,43 +79,30 @@ class UserInitialPost():
     def __init__(self, settings={}):
         super().__init__()
         self.db = settings['pgwui'].get('default_db', '')
+        self.user = ''
+        self.password = ''
 
-    user = ''
-    password = ''
 
-
-class AuthInitialPost():
-    def __init__(self, settings={}):
-        super().__init__()
-
-    db = ''
-    user = ''
-    password = ''
-
-
-class UploadFileInitialPost(AuthInitialPost):
+class UploadFileInitialPost(UserInitialPost):
     def __init__(self, settings={}):
         super().__init__(settings)
-
-    upload_fmt = CSV
-    datafile = ''
-    trim_upload = True
-    literal_col_headings = False
+        self.upload_fmt = CSV
+        self.trim_upload = True
+        self.literal_col_headings = False
+        self.datafile = ''
 
 
 class UploadNullFileInitialPost(UploadFileInitialPost):
     def __init__(self, settings={}):
         super().__init__(settings)
-
-    upload_null = True
-    null_rep = ''
+        self.upload_null = True
+        self.null_rep = ''
 
 
 class UploadTableInitialPost(UploadNullFileInitialPost):
     def __init__(self, settings={}):
         super().__init__(settings)
-
-    table = ''
+        self.table = ''
 
 
 # The wtforms that suck data out of the html.
@@ -138,7 +125,7 @@ class AuthWTForm(UserWTForm):
     # just to keep my hand in.
     db = StringField('Database:')
 
-    ivals = AuthInitialPost
+    ivals = UserInitialPost
 
 
 class UploadFileWTForm(AuthWTForm):