rda-python-common 1.0.14__tar.gz → 1.0.16__tar.gz

{rda_python_common-1.0.14 → rda_python_common-1.0.16}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: rda_python_common
-Version: 1.0.14
+Version: 1.0.16
 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
@@ -11,6 +11,7 @@ Classifier: Development Status :: 5 - Production/Stable
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: license-file
 
 # rda-python-common
 Python common library codes to be shared by other RDA python utility programs.

{rda_python_common-1.0.14 → rda_python_common-1.0.16}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rda_python_common"
-version = "1.0.14"
+version = "1.0.16"
 authors = [
   { name="Zaihua Ji", email="zji@ucar.edu" },
 ]

{rda_python_common-1.0.14 → rda_python_common-1.0.16}/src/rda_python_common/PgDBI.py

@@ -236,7 +236,6 @@ def set_dbname(scname = None, lnname = None, pwname = None, dbhost = None, dbpor
 #
 def set_scname(dbname = None, scname = None, lnname = None, pwname = None, dbhost = None, dbport = None, socket = None):
 
-   global pgdb
    changed = 0
 
    if dbname and dbname != PGDBI['DBNAME']:
@@ -274,7 +273,6 @@ def set_scname(dbname = None, scname = None, lnname = None, pwname = None, dbhos
 def starttran():
 
    global curtran
-   global pgdb
 
    if curtran == 1: endtran()   # try to end previous transaction
    if not pgdb:
@@ -296,7 +294,6 @@ def starttran():
 def endtran(autocommit = True):
 
    global curtran
-   global pgdb
    if curtran and pgdb:
       if not pgdb.closed: pgdb.commit()
       pgdb.autocommit = autocommit
@@ -308,7 +305,6 @@ def endtran(autocommit = True):
 def aborttran(autocommit = True):
 
    global curtran
-   global pgdb
    if curtran and pgdb:
       if not pgdb.closed: pgdb.rollback()
       pgdb.autocommit = autocommit
@@ -535,7 +531,6 @@ def pgconnect(reconnect = 0, pgcnt = 0, autocommit = True):
 #
 def pgcursor():
 
-   global pgdb
    pgcur = None
 
    if not pgdb:

{rda_python_common-1.0.14 → rda_python_common-1.0.16}/src/rda_python_common/PgLOG.py

@@ -109,6 +109,7 @@ PGLOG = {   # more defined in untaint_suid() with environment variables
    'DSIDCHRS' : "d",
    'DOSHELL' : False,
    'NEWDSID' : True,
+   'PUSGDIR' : None,
    'BCHHOSTS' : "PBS",
    'HOSTTYPE' : 'dav',    # default HOSTTYPE
    'EMLMAX' : 256,       # up limit of email line count 
@@ -479,6 +480,13 @@ def get_call_trace(cut = 1):
 
    return str + "\n" if str else ""
 
+#
+# get caller file name
+#
+def get_caller_file(cidx = 0):
+
+   return traceback.extract_stack()[cidx][0]
+
 #
 # log message, msg, for degugging processes according to the debug level 
 #
@@ -556,6 +564,7 @@ def set_help_path(progfile):
 #
 def show_usage(progname, opts = None):
 
+   if PGLOG['PUSGDIR'] is None: set_help_path(get_caller_file(1))
    usgname = join_paths(PGLOG['PUSGDIR'], progname + '.usg')
 
    if opts:
@@ -1284,7 +1293,6 @@ def set_common_pglog():
    SETPGLOG("DRDATAEP", "rda-quasar-drdata")            # DRDATA Globus Endpoint on Quasar
    SETPGLOG("DBGFILE", "pgdss.dbg")                     # debug file name
    SETPGLOG("CNFPATH", PGLOG['DSSHOME']+"/config")      # path to configuration files
-   SETPGLOG("PUSGDIR", PGLOG['DSSDBHM']+"/prog_usage")  # path to program usage files
    SETPGLOG("DSSURL",  "https://rda.ucar.edu")          # current dss web URL
    SETPGLOG("RQSTURL", "/datasets/request")              # request URL path
    SETPGLOG("WEBSERVERS", "rda-web-prod01.ucar.edu:rda-web-test01.ucar.edu")                 # webserver names for Web server

{rda_python_common-1.0.14 → rda_python_common-1.0.16}/src/rda_python_common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: rda_python_common
-Version: 1.0.14
+Version: 1.0.16
 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
@@ -11,6 +11,7 @@ Classifier: Development Status :: 5 - Production/Stable
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: license-file
 
 # rda-python-common
 Python common library codes to be shared by other RDA python utility programs.