rda-python-common 3.0.2__py3-none-any.whl → 3.0.3__py3-none-any.whl

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.
@@ -262,22 +262,23 @@ class PgLOG:
262
262
  msg += " with 1 Error:\n"
263
263
  else:
264
264
  msg += " with {} Errors:\n".format(self.PGLOG['ERRCNT'])
265
+ msg += "\nERROR MESSAGE:\n"
265
266
  msg += self.break_long_string(self.PGLOG['ERRMSG'], 512, None, self.PGLOG['EMLMAX']/2, None, 50, 25)
266
267
  self.PGLOG['ERRCNT'] = 0
267
268
  self.PGLOG['ERRMSG'] = ''
268
269
  if self.PGLOG['SUMMSG']:
269
- msg += self.PGLOG['SEPLINE']
270
- if self.PGLOG['SUMMSG']: msg += "Summary:\n"
270
+ msg += "\nSUMMARY:\n"
271
271
  msg += self.break_long_string(self.PGLOG['SUMMSG'], 512, None, self.PGLOG['EMLMAX']/2, None, 50, 25)
272
272
  if self.PGLOG['EMLMSG']:
273
- msg += self.PGLOG['SEPLINE']
274
- if self.PGLOG['SUMMSG']: msg += "Detail Information:\n"
273
+ msg += "\nDETAIL INFORMATION:\n"
275
274
  self.PGLOG['EMLMSG'] = msg + self.break_long_string(self.PGLOG['EMLMSG'], 512, None, self.PGLOG['EMLMAX'], None, 50, 40)
276
275
  self.PGLOG['SUMMSG'] = "" # in case not
277
276
  else:
278
277
  if logact&self.ERRLOG: # record error for email summary
279
278
  self.PGLOG['ERRCNT'] += 1
280
- if logact&self.BRKLIN: self.PGLOG['ERRMSG'] += "\n"
279
+ if self.PGLOG['ERRMSG']: # blank line between consecutive errors
280
+ if not self.PGLOG['ERRMSG'].endswith('\n'): self.PGLOG['ERRMSG'] += "\n"
281
+ self.PGLOG['ERRMSG'] += "\n"
281
282
  self.PGLOG['ERRMSG'] += "{}. {}".format(self.PGLOG['ERRCNT'], msg)
282
283
  elif logact&self.EMLSUM:
283
284
  if self.PGLOG['SUMMSG']:
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: rda_python_common
3
- Version: 3.0.2
3
+ Version: 3.0.3
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
@@ -12,7 +12,7 @@ rda_python_common/pg_cmd.py,sha256=PiQaAeb7l92LceqMwSzLpz9nD5pDRHJcEZxTDn-HeCs,3
12
12
  rda_python_common/pg_dbi.py,sha256=Qbg3PpXOggTWYKPv5vkpL6cqkVmCwmdWcyA59z9GiWA,118310
13
13
  rda_python_common/pg_file.py,sha256=nwu1DTD6Pgi4yUFt_IJwvYvMbVMW1eEIf1N5EZjM1o8,162232
14
14
  rda_python_common/pg_lock.py,sha256=31EaVDjCkcx3-n8-KnzG18R8Pz7Z6KyFsEqcml6Iq5c,32702
15
- rda_python_common/pg_log.py,sha256=lzhjEL7FaGjHfl4cmlMuIZVAb5x0fSgiI8AShe0sAHw,82146
15
+ rda_python_common/pg_log.py,sha256=gZvUGaZTtMTpGlKwhp6H4LySf6R0SjcQI0zCX7X84-8,82211
16
16
  rda_python_common/pg_opt.py,sha256=evf0ZtNeYyRjGyTIghD6wI5u7eDbiDkDudLYRk5z0QA,82500
17
17
  rda_python_common/pg_password.py,sha256=X-eIDwdqBhtrhrbDTNWle-0JtWsyIVZdDOZaBu7cFHM,2343
18
18
  rda_python_common/pg_sig.py,sha256=o4L9qjrgOIAASXntY6kHfEGV2TXuFL3mTczqkemY9oQ,53572
@@ -20,9 +20,9 @@ rda_python_common/pg_split.py,sha256=aAWKUZPmZ-LQ_fJ3DSKzPKxJw0fMDJ2fgP8ZT629M30
20
20
  rda_python_common/pg_util.py,sha256=3_-baqCI9j5bkC2Uw3hRJZtYwdr0FQC6mtgbeIhLwyQ,86045
21
21
  rda_python_common/pgpassword.py,sha256=aTQaO59QokWrv2EKom4TvKhNW2Mr6aFMMBVG4DCbcKI,5023
22
22
  rda_python_common/pgpassword.usg,sha256=Wrle6A8sdlMGx3ZEAmE6TNDPOlG84Whe0T3rCNFzPfY,2013
23
- rda_python_common-3.0.2.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
24
- rda_python_common-3.0.2.dist-info/METADATA,sha256=Sb_3PacPPJ24okg_57yRgv_z-qbzs-rxGvBeXl1uisc,14528
25
- rda_python_common-3.0.2.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
26
- rda_python_common-3.0.2.dist-info/entry_points.txt,sha256=pZgVNWspcK-F1TbPav7C3C9NdeHDZMm_25fW9weix00,65
27
- rda_python_common-3.0.2.dist-info/top_level.txt,sha256=KVQmx7D3DD-jsiheqL8HdTrRE14hpRnZY5_ioMArA5k,18
28
- rda_python_common-3.0.2.dist-info/RECORD,,
23
+ rda_python_common-3.0.3.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
24
+ rda_python_common-3.0.3.dist-info/METADATA,sha256=YtKxxQ80PBOPbIFk2X4rFxuFkKRz4V2yN0gYyxuwL48,14528
25
+ rda_python_common-3.0.3.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
26
+ rda_python_common-3.0.3.dist-info/entry_points.txt,sha256=pZgVNWspcK-F1TbPav7C3C9NdeHDZMm_25fW9weix00,65
27
+ rda_python_common-3.0.3.dist-info/top_level.txt,sha256=KVQmx7D3DD-jsiheqL8HdTrRE14hpRnZY5_ioMArA5k,18
28
+ rda_python_common-3.0.3.dist-info/RECORD,,