rda-python-common 3.0.16__py3-none-any.whl → 3.0.18__py3-none-any.whl

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/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/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.dist-info → rda_python_common-3.0.18.dist-info}/METADATA

@@ -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.dist-info → rda_python_common-3.0.18.dist-info}/RECORD

@@ -7,12 +7,12 @@ rda_python_common/PgOPT.py,sha256=0nQPF19N-1VWwrjFHEeruVSwVDwvFKd4uowPc8dK7e4,56
 rda_python_common/PgSIG.py,sha256=0MJPH0fTtSshIsvUXkzQjReHPyCWdzHYOY5LbFSh7-A,34318
 rda_python_common/PgSplit.py,sha256=En7xcdkE4YNRcMX88qXnrUgUOnQU3Kqh8uxRIdlJhEA,9156
 rda_python_common/PgUtil.py,sha256=7hXAznAI8tYh-nJRKBIXejNe2ROQ2Wxn28OAndeg0Iw,48433
-rda_python_common/__init__.py,sha256=SXJ9H3nEd5bF9WiHvbYzPqLADjU_wAHSbGiOag2MtQ8,995
+rda_python_common/__init__.py,sha256=RnBj2y9ieviHHwkUJ6ayCqCa2pkhjnf3IuTr0CbAFgo,995
 rda_python_common/pg_cmd.py,sha256=PiQaAeb7l92LceqMwSzLpz9nD5pDRHJcEZxTDn-HeCs,33255
 rda_python_common/pg_dbi.py,sha256=h1snZ8fJwHeBQJmNjsjJoDKkfT4FW9avMvdHgcIc-cA,122328
-rda_python_common/pg_file.py,sha256=U6G10v_788DITInnrSzRpJMRC0MhpWub_HsHGKTtCeE,166954
+rda_python_common/pg_file.py,sha256=3cnaY4wS9t8D4Rcv5_QfHmB9JkNwNGgnKj-KNDff6sc,167089
 rda_python_common/pg_lock.py,sha256=31EaVDjCkcx3-n8-KnzG18R8Pz7Z6KyFsEqcml6Iq5c,32702
-rda_python_common/pg_log.py,sha256=zWtd0o77zNyYYA0puAmB2NpW3FgOod5FB7Duyc6GPww,81971
+rda_python_common/pg_log.py,sha256=fN6dcAlcd6nHf21r_CfraCAMgwkrqrDCMSdMtXUa62A,82686
 rda_python_common/pg_opt.py,sha256=LxVAf47wi2STkVGSXMvV3IZphEJcoO8bvYXy6kQ5ox4,82403
 rda_python_common/pg_password.py,sha256=X-eIDwdqBhtrhrbDTNWle-0JtWsyIVZdDOZaBu7cFHM,2343
 rda_python_common/pg_sig.py,sha256=o4L9qjrgOIAASXntY6kHfEGV2TXuFL3mTczqkemY9oQ,53572
@@ -20,9 +20,9 @@ rda_python_common/pg_split.py,sha256=aAWKUZPmZ-LQ_fJ3DSKzPKxJw0fMDJ2fgP8ZT629M30
 rda_python_common/pg_util.py,sha256=JL9NoW-VoQvsjXsUr09oBUWYJJNltU4GyQIfWlpkf90,86084
 rda_python_common/pgpassword.py,sha256=aTQaO59QokWrv2EKom4TvKhNW2Mr6aFMMBVG4DCbcKI,5023
 rda_python_common/pgpassword.usg,sha256=Wrle6A8sdlMGx3ZEAmE6TNDPOlG84Whe0T3rCNFzPfY,2013
-rda_python_common-3.0.16.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
-rda_python_common-3.0.16.dist-info/METADATA,sha256=luPqGelJ-O6qsvmbn41HIMiqKqK5a1tJTBFXOeB6XMA,14530
-rda_python_common-3.0.16.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-rda_python_common-3.0.16.dist-info/entry_points.txt,sha256=pZgVNWspcK-F1TbPav7C3C9NdeHDZMm_25fW9weix00,65
-rda_python_common-3.0.16.dist-info/top_level.txt,sha256=KVQmx7D3DD-jsiheqL8HdTrRE14hpRnZY5_ioMArA5k,18
-rda_python_common-3.0.16.dist-info/RECORD,,
+rda_python_common-3.0.18.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
+rda_python_common-3.0.18.dist-info/METADATA,sha256=3QrHnixrdNIgkpmFIHckhAUU-yF13XU34C3U6Aq0VG0,14530
+rda_python_common-3.0.18.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+rda_python_common-3.0.18.dist-info/entry_points.txt,sha256=pZgVNWspcK-F1TbPav7C3C9NdeHDZMm_25fW9weix00,65
+rda_python_common-3.0.18.dist-info/top_level.txt,sha256=KVQmx7D3DD-jsiheqL8HdTrRE14hpRnZY5_ioMArA5k,18
+rda_python_common-3.0.18.dist-info/RECORD,,