rda-python-common 1.0.33__tar.gz → 1.0.34__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of rda-python-common might be problematic. Click here for more details.

Files changed (21) hide show
  1. {rda_python_common-1.0.33 → rda_python_common-1.0.34}/PKG-INFO +1 -1
  2. {rda_python_common-1.0.33 → rda_python_common-1.0.34}/pyproject.toml +1 -1
  3. {rda_python_common-1.0.33 → rda_python_common-1.0.34}/src/rda_python_common/PgLOG.py +8 -10
  4. {rda_python_common-1.0.33 → rda_python_common-1.0.34}/src/rda_python_common.egg-info/PKG-INFO +1 -1
  5. {rda_python_common-1.0.33 → rda_python_common-1.0.34}/LICENSE +0 -0
  6. {rda_python_common-1.0.33 → rda_python_common-1.0.34}/README.md +0 -0
  7. {rda_python_common-1.0.33 → rda_python_common-1.0.34}/setup.cfg +0 -0
  8. {rda_python_common-1.0.33 → rda_python_common-1.0.34}/src/rda_python_common/PgCMD.py +0 -0
  9. {rda_python_common-1.0.33 → rda_python_common-1.0.34}/src/rda_python_common/PgDBI.py +0 -0
  10. {rda_python_common-1.0.33 → rda_python_common-1.0.34}/src/rda_python_common/PgFile.py +0 -0
  11. {rda_python_common-1.0.33 → rda_python_common-1.0.34}/src/rda_python_common/PgLock.py +0 -0
  12. {rda_python_common-1.0.33 → rda_python_common-1.0.34}/src/rda_python_common/PgOPT.py +0 -0
  13. {rda_python_common-1.0.33 → rda_python_common-1.0.34}/src/rda_python_common/PgSIG.py +0 -0
  14. {rda_python_common-1.0.33 → rda_python_common-1.0.34}/src/rda_python_common/PgSplit.py +0 -0
  15. {rda_python_common-1.0.33 → rda_python_common-1.0.34}/src/rda_python_common/PgUtil.py +0 -0
  16. {rda_python_common-1.0.33 → rda_python_common-1.0.34}/src/rda_python_common/__init__.py +0 -0
  17. {rda_python_common-1.0.33 → rda_python_common-1.0.34}/src/rda_python_common.egg-info/SOURCES.txt +0 -0
  18. {rda_python_common-1.0.33 → rda_python_common-1.0.34}/src/rda_python_common.egg-info/dependency_links.txt +0 -0
  19. {rda_python_common-1.0.33 → rda_python_common-1.0.34}/src/rda_python_common.egg-info/requires.txt +0 -0
  20. {rda_python_common-1.0.33 → rda_python_common-1.0.34}/src/rda_python_common.egg-info/top_level.txt +0 -0
  21. {rda_python_common-1.0.33 → rda_python_common-1.0.34}/test/test_common.py +0 -0
{rda_python_common-1.0.33 → rda_python_common-1.0.34}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: rda_python_common
3
- Version: 1.0.33
3
+ Version: 1.0.34
4
4
  Summary: RDA Python common library codes shared by other RDA python packages
5
5
  Author-email: Zaihua Ji <zji@ucar.edu>
6
6
  Project-URL: Homepage, https://github.com/NCAR/rda-python-common
{rda_python_common-1.0.33 → rda_python_common-1.0.34}/pyproject.toml RENAMED
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
4
4
 
5
5
  [project]
6
6
  name = "rda_python_common"
7
- version = "1.0.33"
7
+ version = "1.0.34"
8
8
  authors = [
9
9
  { name="Zaihua Ji", email="zji@ucar.edu" },
10
10
  ]
{rda_python_common-1.0.33 → rda_python_common-1.0.34}/src/rda_python_common/PgLOG.py RENAMED
@@ -259,25 +259,23 @@ def send_customized_email(logmsg, emlmsg, logact = 0):
259
259
  logmsg += ': '
260
260
  else:
261
261
  logmsg = ''
262
+ msg = emlmsg
262
263
  for ekey in entries:
263
264
  entry = entries[ekey][0]
264
- if re.search(r'(^|\n){}:\s*\n'.format(entry), emlmsg, re.I):
265
- ms = None
266
- else:
267
- ms = re.search(r'(^|\n){}:\s*(.+)\n'.format(entry), emlmsg, re.I)
265
+ ms = re.search(r'(^|\n)({}: *(.*)\n)'.format(entry), emlmsg, re.I)
268
266
  if ms:
269
- entries[ekey][2] = ms.group(2)
267
+ vals = ms.groups()
268
+ msg = re.sub(vals[1], '', msg)
269
+ if vals[2]: entries[ekey][2] = vals[2]
270
270
  elif logact and entries[ekey][1]:
271
271
  return pglog("{}Missing Entry '{}' for sending email".format(logmsg, entry), logact|ERRLOG)
272
272
 
273
+ ret = send_python_email(entries['sb'][2], entries['to'][2], msg, entries['fr'][2], entries['cc'][2])
274
+ if ret != SUCCESS and PGLOG['EMLSEND']: ret = pgsystem(PGLOG['EMLSEND'], logact, 4, emlmsg)
275
+
273
276
  logmsg += "Email " + entries['to'][2]
274
277
  if entries['cc'][2]: logmsg += " Cc'd " + entries['cc'][2]
275
278
  logmsg += " Subject: " + entries['sb'][2]
276
-
277
- ret = FAILURE
278
- if PGLOG['EMLSEND']: ret = pgsystem(PGLOG['EMLSEND'], logact, 4, emlmsg)
279
- if not ret: ret = send_python_email(entries['sb'][2], entries['to'][2], emlmsg, entries['fr'][2], entries['cc'][2], logact)
280
-
281
279
  if ret:
282
280
  log_email(emlmsg)
283
281
  if logact: pglog(logmsg, logact&(~EXITLG))
{rda_python_common-1.0.33 → rda_python_common-1.0.34}/src/rda_python_common.egg-info/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: rda_python_common
3
- Version: 1.0.33
3
+ Version: 1.0.34
4
4
  Summary: RDA Python common library codes shared by other RDA python packages
5
5
  Author-email: Zaihua Ji <zji@ucar.edu>
6
6
  Project-URL: Homepage, https://github.com/NCAR/rda-python-common