rda-python-common 1.0.5__py3-none-any.whl → 1.0.6__py3-none-any.whl

rda_python_common/PgDBI.py

@@ -37,7 +37,7 @@ CHCODE = 1042
 
 # hard coded db ports for dbnames
 DBPORTS = {
-  'default' : 5432
+  'default' : 0
 }
 
 DBPASS = {}
@@ -517,9 +517,9 @@ def pgconnect(reconnect = 0, pgcnt = 0, autocommit = True):
          config['host'] = PGDBI['DBHOST'] if PGDBI['DBHOST'] else PGDBI['DEFHOST']
          if not PGDBI['DBPORT']: PGDBI['DBPORT'] = get_dbport(PGDBI['DBNAME'])
       if PGDBI['DBPORT']: config['port'] = PGDBI['DBPORT'] 
-      config['password'] = get_pgpass_password()
-
+      config['password'] = '***'
       sqlstr = "psycopg2.connect(**{})".format(config)
+      config['password'] = get_pgpass_password()
       if PgLOG.PGLOG['DBGLEVEL']: PgLOG.pgdbg(1000, sqlstr)
       try:
          PgLOG.PGLOG['PGDBBUF'] = pgdb = PgSQL.connect(**config)
@@ -2221,8 +2221,10 @@ def pgname(str, sign = None):
 def get_pgpass_password():
 
    if PGDBI['PWNAME']: return PGDBI['PWNAME']
-   if not DBPASS: read_pgpass()  
-   return DBPASS.get((PGDBI['DBSHOST'], PGDBI['DBPORT'], PGDBI['DBNAME'], PGDBI['LNNAME']))
+   if not DBPASS: read_pgpass()
+   dbport = str(PGDBI['DBPORT']) if PGDBI['DBPORT'] else '5432'
+   pwname = DBPASS.get((PGDBI['DBSHOST'], dbport, PGDBI['DBNAME'], PGDBI['LNNAME']))
+   if not pwname: pwname = DBPASS.get((PGDBI['DBHOST'], dbport, PGDBI['DBNAME'], PGDBI['LNNAME']))
 
 #
 # Reads the .pgpass file and returns a dictionary of credentials.
@@ -2234,7 +2236,7 @@ def read_pgpass():
          for line in f:
             line = line.strip()
             if not line or line.startswith("#"): continue
-            dbhost, dbport, dbname, usname, pwname = line.split(":")
-            DBPASS[(dbhost, dbport, dbname, usname)] = pwname
+            dbhost, dbport, dbname, lnname, pwname = line.split(":")
+            DBPASS[(dbhost, dbport, dbname, lnname)] = pwname
    except FileNotFoundError:
       pass

{rda_python_common-1.0.5.dist-info → rda_python_common-1.0.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rda_python_common
-Version: 1.0.5
+Version: 1.0.6
 Summary: RDA Python common library codes shared by other RDA python packages
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-common

{rda_python_common-1.0.5.dist-info → rda_python_common-1.0.6.dist-info}/RECORD

@@ -1,5 +1,5 @@
 rda_python_common/PgCMD.py,sha256=dsFL_hiAHRZ-BwncgZhxQ7p9O10ox9lUSXOIePjZ-PQ,20487
-rda_python_common/PgDBI.py,sha256=3fd59xBjYmGxAkzaoLPQJVpPM3SlHIhnyCrGHAzgohI,74085
+rda_python_common/PgDBI.py,sha256=PKomitCuXSg4oyqZXPU4p0b3lMv0gG4MmXbMOuXIpzA,74268
 rda_python_common/PgFile.py,sha256=FuAmumeiCBK1wUrMa7p0X7tpJcJqzlITz11ghEgLce8,96805
 rda_python_common/PgGLBS.py,sha256=3vmCA5tUwpg3Xjq8rgo2WWkadLSGGbVyU9ScNGqucy8,6861
 rda_python_common/PgLOG.py,sha256=dcIu6VTSYL9dvyyQfwuleqp52z6PMc1nEvtko_hSquM,53766
@@ -10,8 +10,8 @@ rda_python_common/PgSIG.py,sha256=oDXcSnnzW6wKm_cSpFxQZWAo2hpPPTcuNDYhPSNQcRc,35
 rda_python_common/PgSplit.py,sha256=QKPbF55m8KCTGmwVwL3uG_nuylCC4FSVfLuXeLjJHbE,8816
 rda_python_common/PgUtil.py,sha256=F1CVuhsNhfuRfZ4mEx9ocrHrspjrCrLIFHX1hQsufVc,48730
 rda_python_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rda_python_common-1.0.5.dist-info/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
-rda_python_common-1.0.5.dist-info/METADATA,sha256=LzNb-3dSJhlCPWnvXM94OkK9CBNNxXTUfzigctqOduI,629
-rda_python_common-1.0.5.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-rda_python_common-1.0.5.dist-info/top_level.txt,sha256=KVQmx7D3DD-jsiheqL8HdTrRE14hpRnZY5_ioMArA5k,18
-rda_python_common-1.0.5.dist-info/RECORD,,
+rda_python_common-1.0.6.dist-info/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
+rda_python_common-1.0.6.dist-info/METADATA,sha256=RVhPfZGmoLdg-kfTFj1gMvgwD0ALsDu6LRXgd542se0,629
+rda_python_common-1.0.6.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+rda_python_common-1.0.6.dist-info/top_level.txt,sha256=KVQmx7D3DD-jsiheqL8HdTrRE14hpRnZY5_ioMArA5k,18
+rda_python_common-1.0.6.dist-info/RECORD,,