rda-python-common 2.0.19__tar.gz → 2.1.1__tar.gz

{rda_python_common-2.0.19 → rda_python_common-2.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 2.0.19
+Version: 2.1.1
 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-2.0.19 → rda_python_common-2.1.1}/pyproject.toml

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

{rda_python_common-2.0.19 → rda_python_common-2.1.1}/src/rda_python_common/pg_cmd.py

@@ -265,7 +265,7 @@ class PgCMD(PgLock):
       if otype: cmd +=  ' ' + otype
       ret = options = ''
       for loop in range(3):
-         ret = self.pgsystem(cmd, self.LOGWRN, 279)  # 1+2+4+16+256
+         ret = self.pgsystem(cmd, self.LOGWRN, 1299)  # 1+2+16+256+1024
          if loop < 2 and self.PGLOG['SYSERR'] and 'Connection timed out' in self.PGLOG['SYSERR']:
             time.sleep(self.PGSIG['ETIME'])
          else:

{rda_python_common-2.0.19 → rda_python_common-2.1.1}/src/rda_python_common/pg_dbi.py

@@ -20,17 +20,18 @@ from os import path as op
 from .pg_log import PgLOG
 
 class PgDBI(PgLOG):
-   
-   #  PostgreSQL specified query timestamp format
-   fmtyr = lambda fn: "extract(year from {})::int".format(fn)
-   fmtqt = lambda fn: "extract(quarter from {})::int".format(fn)
-   fmtmn = lambda fn: "extract(month from {})::int".format(fn)
-   fmtdt = lambda fn: "date({})".format(fn)
-   fmtym = lambda fn: "to_char({}, 'yyyy-mm')".format(fn)
-   fmthr = lambda fn: "extract(hour from {})::int".format(fn)
 
    def __init__(self):
       super().__init__()  # initialize parent class
+
+      #  PostgreSQL specified query timestamp format
+      self.fmtyr = lambda fn=self: "extract(year from {})::int".format(fn)
+      self.fmtqt = lambda fn=self: "extract(quarter from {})::int".format(fn)
+      self.fmtmn = lambda fn=self: "extract(month from {})::int".format(fn)
+      self.fmtdt = lambda fn=self: "date({})".format(fn)
+      self.fmtym = lambda fn=self: "to_char({}, 'yyyy-mm')".format(fn)
+      self.fmthr = lambda fn=self: "extract(hour from {})::int".format(fn)
+
       self.pgdb = None    # reference to a connected database object
       self.curtran = 0    # 0 - no transaction, 1 - in transaction
       self.NMISSES = []   # array of mising userno

{rda_python_common-2.0.19 → rda_python_common-2.1.1}/src/rda_python_common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 2.0.19
+Version: 2.1.1
 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