rda-python-common 3.0.16__tar.gz → 3.0.18__tar.gz

{rda_python_common-3.0.16/src/rda_python_common.egg-info → rda_python_common-3.0.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 3.0.16
+Version: 3.0.18
 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
@@ -189,7 +189,7 @@ PgLOG.pglog("hello", PgLOG.LOGWRN)
 python -c "import rda_python_common; print(rda_python_common.__version__)"
 ```
 
-You should see the installed version (currently `3.0.16`).  If the import
+You should see the installed version (currently `3.0.18`).  If the import
 fails, double-check that the active Python environment is the one where you
 ran `pip install`.
 

{rda_python_common-3.0.16 → rda_python_common-3.0.18}/README.md

@@ -165,7 +165,7 @@ PgLOG.pglog("hello", PgLOG.LOGWRN)
 python -c "import rda_python_common; print(rda_python_common.__version__)"
 ```
 
-You should see the installed version (currently `3.0.16`).  If the import
+You should see the installed version (currently `3.0.18`).  If the import
 fails, double-check that the active Python environment is the one where you
 ran `pip install`.
 

{rda_python_common-3.0.16 → rda_python_common-3.0.18}/pyproject.toml

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

{rda_python_common-3.0.16 → rda_python_common-3.0.18}/src/rda_python_common/__init__.py

@@ -22,7 +22,7 @@ object that existing callers expect.
 
 from . import PgLOG, PgUtil, PgDBI, PgFile, PgLock, PgCMD, PgSIG, PgOPT, PgSplit
 
-__version__ = "3.0.16"
+__version__ = "3.0.18"
 
 __all__ = [
    "PgLOG",

{rda_python_common-3.0.16 → rda_python_common-3.0.18}/src/rda_python_common/pg_file.py

@@ -2357,22 +2357,23 @@ class PgFile(PgUtil, PgSIG):
             if re.match(r'^\[\]', buf): break
             if re.match(r'^\[\{', buf):
                ary = json.loads(buf)
-               hash = ary[0]
+               cnt = len(ary)
+               isdir = (cnt > 1 or ary[0]['Key'] != file)
+               # a key prefix has no timestamp of its own; report the newest member's
+               hash = max(ary, key = lambda a: a['LastModified']) if isdir else ary[0]
                uhash = None
                if ucmd:
                   ubuf = self.pgsystem(ucmd, self.LOGWRN, self.CMDRET)
                   if ubuf and re.match(r'^\{', ubuf): uhash = json.loads(ubuf)
                ret = self.object_file_stat(hash, uhash, opt)
-               if ret:
-                  cnt = len(ary)
-                  if cnt > 1 or hash['Key'] != file:
-                     ret['count'] = cnt
-                     ret['fname'] = op.basename(file)
-                     ret['isfile'] = 0
-                     size = 0
-                     for a in ary:
-                        size += int(a['Size'])
-                     ret['data_size'] = size
+               if ret and isdir:
+                  ret['count'] = cnt
+                  ret['fname'] = op.basename(file)
+                  ret['isfile'] = 0
+                  size = 0
+                  for a in ary:
+                     size += int(a['Size'])
+                  ret['data_size'] = size
                uhash = None
                break
          if opt&64: return self.FAILURE

{rda_python_common-3.0.16 → rda_python_common-3.0.18}/src/rda_python_common/pg_log.py

@@ -320,13 +320,18 @@ class PgLOG:
       msg = emlmsg
       for ekey in entries:
          entry = entries[ekey][0]
-         ms = re.search(r'(^|\n)({}: *(.*)\n)'.format(entry), emlmsg, re.I)
+         ms = re.search(r'(^|\n)({}: *(.*)\n)'.format(entry), msg, re.I)
          if ms:
-            vals = ms.groups()
-            msg = msg.replace(vals[1], '')
-            if vals[2]: entries[ekey][2] = vals[2]
+            # cut out this header line only; a replace() of the matched text would also
+            # strip an identical line from anywhere in the message body
+            msg = msg[:ms.start(2)] + msg[ms.end(2):]
+            if ms.group(3): entries[ekey][2] = ms.group(3)
          elif entries[ekey][1]:
             return self.pglog("{}Missing Entry '{}' for sending email".format(logmsg, entry), logact|self.ERRLOG)
+      if not msg.strip():
+         # send_python_email() mails the buffered EMLMSG when it is given no body, which
+         # would send an unrelated message to this recipient and empty the buffer
+         return self.pglog("{}Empty message body for sending email".format(logmsg), logact|self.ERRLOG)
       ret = self.send_python_email(entries['sb'][2], entries['to'][2], msg, entries['fr'][2], entries['cc'][2], logact)
       if ret == self.SUCCESS or not self.PGLOG['EMLSEND']: return ret   
       # try commandline sendmail
@@ -386,7 +391,10 @@ class PgLOG:
             self.PGLOG['EMLMSG'] = ''
          else:
             return ''
-      docc = False if cc else True
+      # only an omitted cc means 'use CCDADDR and carbon copy the sender'; an explicitly
+      # empty cc suppresses the Cc entirely, and used to leak the sender into the global
+      # CCDADDR anyway, carbon copying it on every later email of the same process
+      docc = True if cc is None else False
       if not sender:
          sender = self.PGLOG['CURUID']
          if sender != self.PGLOG['COMMONUSER']: docc = False

{rda_python_common-3.0.16 → rda_python_common-3.0.18/src/rda_python_common.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 3.0.16
+Version: 3.0.18
 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
@@ -189,7 +189,7 @@ PgLOG.pglog("hello", PgLOG.LOGWRN)
 python -c "import rda_python_common; print(rda_python_common.__version__)"
 ```
 
-You should see the installed version (currently `3.0.16`).  If the import
+You should see the installed version (currently `3.0.18`).  If the import
 fails, double-check that the active Python environment is the one where you
 ran `pip install`.