Update g2database and g2iniparams submodules to the current version.

g2/python/G2Database.py

@@ -1,14 +1,15 @@
 #! /usr/bin/env python3
 
+import json
 import optparse
 import os
 import sys
-import json
 import textwrap
+import urllib.parse
 from importlib import import_module
-
 from senzing import G2Exception
 
+
 # -----------------------------------------------------------------------------
 # Exceptions
 # -----------------------------------------------------------------------------
@@ -214,12 +215,12 @@ def sqlExec(self, sql, parmList=None, **kwargs):
             # if parmList:
             #    print('PARMS:', type(parmList), parmList)
             raise err
-        else:
-            if exec_cursor:
-                cursorData['OBJECT'] = exec_cursor
-                cursorData['ROWS_AFFECTED'] = exec_cursor.rowcount
-                if exec_cursor.description:
-                    cursorData['COLUMN_HEADERS'] = [columnData[0].upper() for columnData in exec_cursor.description]
+
+        if exec_cursor:
+            cursorData['OBJECT'] = exec_cursor
+            cursorData['ROWS_AFFECTED'] = exec_cursor.rowcount
+            if exec_cursor.description:
+                cursorData['COLUMN_HEADERS'] = [columnData[0].upper() for columnData in exec_cursor.description]
         return cursorData
 
     # ----------------------------------------
@@ -385,8 +386,8 @@ def dburi_parse(self, dbUri):
         self.dsn = uri_dict['DSN'] if 'DSN' in uri_dict else None
         self.host = uri_dict['HOST'] if 'HOST' in uri_dict else None
         self.port = uri_dict['PORT'] if 'PORT' in uri_dict else None
-        self.userId = uri_dict['USERID'] if 'USERID' in uri_dict else None
-        self.password = uri_dict['PASSWORD'] if 'PASSWORD' in uri_dict else None
+        self.userId = urllib.parse.unquote(uri_dict['USERID']) if 'USERID' in uri_dict else None
+        self.password = urllib.parse.unquote(uri_dict['PASSWORD']) if 'PASSWORD' in uri_dict else None
         self.table = uri_dict['TABLE'] if 'TABLE' in uri_dict else None
         self.schema = uri_dict['SCHEMA'] if 'SCHEMA' in uri_dict else None
 

g2/python/G2IniParams.py

@@ -22,7 +22,7 @@ class G2IniParams:
     def getJsonINIParams(self, iniFileName, *args, **kwargs):
         ''' Creates a JSON INI parameter string from an INI file. '''
 
-        iniParser = configparser.ConfigParser(empty_lines_in_values=False)
+        iniParser = configparser.ConfigParser(empty_lines_in_values=False, interpolation=None)
         iniParser.read(iniFileName)
 
         paramDict = {}
@@ -39,7 +39,7 @@ def getJsonINIParams(self, iniFileName, *args, **kwargs):
     def getINIParam(self, iniFileName, requestedGroupName, requestedParamName, *args, **kwargs):
         ''' Gets an INI parameter string from an INI file. '''
 
-        iniParser = configparser.ConfigParser(empty_lines_in_values=False)
+        iniParser = configparser.ConfigParser(empty_lines_in_values=False, interpolation=None)
         iniParser.read(iniFileName)
 
         paramDict = {}
@@ -61,7 +61,7 @@ def getINIParam(self, iniFileName, requestedGroupName, requestedParamName, *args
     def hasINIParam(self, iniFileName, requestedGroupName, requestedParamName, *args, **kwargs):
         ''' Determines whether an INI parameter exists in an INI file. '''
 
-        iniParser = configparser.ConfigParser(empty_lines_in_values=False)
+        iniParser = configparser.ConfigParser(empty_lines_in_values=False, interpolation=None)
         iniParser.read(iniFileName)
 
         paramDict = {}