rda-python-common 1.0.33__py3-none-any.whl → 1.0.35__py3-none-any.whl

rda_python_common/PgLOG.py

@@ -259,25 +259,23 @@ def send_customized_email(logmsg, emlmsg, logact = 0):
       logmsg += ': '
    else:
       logmsg = ''
+   msg = emlmsg
    for ekey in entries:
       entry = entries[ekey][0]
-      if re.search(r'(^|\n){}:\s*\n'.format(entry), emlmsg, re.I):
-         ms = None
-      else:
-         ms = re.search(r'(^|\n){}:\s*(.+)\n'.format(entry), emlmsg, re.I)
+      ms = re.search(r'(^|\n)({}: *(.*)\n)'.format(entry), emlmsg, re.I)
       if ms:
-         entries[ekey][2] = ms.group(2)
+         vals = ms.groups()
+         msg = msg.replace(vals[1], '')
+         if vals[2]: entries[ekey][2] = vals[2]
       elif logact and entries[ekey][1]:
          return pglog("{}Missing Entry '{}' for sending email".format(logmsg, entry), logact|ERRLOG)
 
+   ret = send_python_email(entries['sb'][2], entries['to'][2], msg, entries['fr'][2], entries['cc'][2])
+   if ret != SUCCESS and PGLOG['EMLSEND']: ret = pgsystem(PGLOG['EMLSEND'], logact, 4, emlmsg)
+
    logmsg += "Email " + entries['to'][2]
    if entries['cc'][2]: logmsg += " Cc'd " + entries['cc'][2]
    logmsg += " Subject: " + entries['sb'][2]
-
-   ret = FAILURE
-   if PGLOG['EMLSEND']: ret = pgsystem(PGLOG['EMLSEND'], logact, 4, emlmsg)
-   if not ret: ret = send_python_email(entries['sb'][2], entries['to'][2], emlmsg, entries['fr'][2], entries['cc'][2], logact)
-
    if ret:      
       log_email(emlmsg)
       if logact: pglog(logmsg, logact&(~EXITLG))

{rda_python_common-1.0.33.dist-info → rda_python_common-1.0.35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 1.0.33
+Version: 1.0.35
 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.33.dist-info → rda_python_common-1.0.35.dist-info}/RECORD

@@ -1,15 +1,15 @@
 rda_python_common/PgCMD.py,sha256=EYjG2Z4zEnvsXE1z-jt5UaNoEKxnOYYiMMzvW6HrKA4,20597
 rda_python_common/PgDBI.py,sha256=12qnRXO7pWv8togtTsOvtVuGtwixnR-s2vLGPpdDfHw,74658
 rda_python_common/PgFile.py,sha256=KnG9S0bgXAAhQIoSJWf3zON8xIua3do4New4O_qdlwg,98468
-rda_python_common/PgLOG.py,sha256=kRoUGW5xG5SI7Ubb41RAbnSKItSJ59x8-tGDV52Q810,55251
+rda_python_common/PgLOG.py,sha256=GcV6b5vaBZlk5JCOnxdWDOWP-LcU4GjIZB8_cJseK2E,55221
 rda_python_common/PgLock.py,sha256=12i84nsGBuifSyPnm8IR63LvHvRuVU573D5QKFlHdOI,22623
 rda_python_common/PgOPT.py,sha256=zX8lWFdfV6GxjLKfMc9eM76mjIjss_ulPieerejcmks,55936
 rda_python_common/PgSIG.py,sha256=ZVM9Qz6yIFurwIQJtV5-CFbKOTdFsZ-Rs95SEpDFgNk,35795
 rda_python_common/PgSplit.py,sha256=QKPbF55m8KCTGmwVwL3uG_nuylCC4FSVfLuXeLjJHbE,8816
 rda_python_common/PgUtil.py,sha256=OqESKCd72b9g8m8jwjPJhXDtPYlW6G8oSOhwChvz2Cg,48600
 rda_python_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rda_python_common-1.0.33.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
-rda_python_common-1.0.33.dist-info/METADATA,sha256=0i7NzCeJ-p0KhJqhbLLojt_MeXzsNwlLl2EfDzg-7vo,716
-rda_python_common-1.0.33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rda_python_common-1.0.33.dist-info/top_level.txt,sha256=KVQmx7D3DD-jsiheqL8HdTrRE14hpRnZY5_ioMArA5k,18
-rda_python_common-1.0.33.dist-info/RECORD,,
+rda_python_common-1.0.35.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
+rda_python_common-1.0.35.dist-info/METADATA,sha256=02eefatMIkApUZT1YEL1HYHVPqp6wxgQ5NDJITPSpX8,716
+rda_python_common-1.0.35.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rda_python_common-1.0.35.dist-info/top_level.txt,sha256=KVQmx7D3DD-jsiheqL8HdTrRE14hpRnZY5_ioMArA5k,18
+rda_python_common-1.0.35.dist-info/RECORD,,