rda-python-common 3.0.31__py3-none-any.whl → 3.0.32__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.31"
+__version__ = "3.0.32"
 
 __all__ = [
    "PgLOG",

rda_python_common/pg_sig.py

@@ -487,7 +487,7 @@ class PgSIG(PgDBI):
         if not dumpon: self.set_dump(self.SDUMP['DEF'])
         if signum == signal.SIGQUIT: self.PGSIG['QUIT'] = 1
       if self.PGSIG['PPID'] <= 1 and len(self.CPIDS) > 0:  # passing signal to child processes
-         for pid in self.CPIDS: self.kill_process(pid, signum)
+         for pid in list(self.CPIDS): self.kill_process(pid, signum)   # SIGCHLD may change CPIDS
 
    # catch the termination signal so a batch run gets a chance to report before it dies
    # PBS kills a job that runs out of walltime with SIGTERM first and SIGKILL a few seconds
@@ -829,8 +829,8 @@ class PgSIG(PgDBI):
       Returns:
          int: The child PID, or 0 if not found.
       """
-      for cpid in self.CPIDS:
-         if self.CPIDS[cpid] == pname: return cpid
+      for cpid, cname in list(self.CPIDS.items()):   # a copy: SIGCHLD may remove entries meanwhile
+         if cname == pname: return cpid
       return 0
 
    # check one or all child processes if they are still running
@@ -870,15 +870,15 @@ class PgSIG(PgDBI):
                else:
                   self.pglog("{}: Child still running".format(pid), logact)
                pcnt = 1
-            elif pid in self.CPIDS:
-               del self.CPIDS[pid]   # clean the saved info for the process
+            else:
+               self.CPIDS.pop(pid, None)   # clean the saved info; SIGCHLD may have removed it
          elif not pname:
             cpids = list(self.CPIDS)
             for cpid in cpids:
                if self.check_process(cpid):  # process is not done yet
                   pcnt += 1
-               elif cpid in self.CPIDS:
-                  del self.CPIDS[cpid]
+               else:
+                  self.CPIDS.pop(cpid, None)
          if pcnt == 0 or dowait == 0 or pcnt < ccnt: break
          self.show_wait_message(i, "{}: wait {}/{} child processes".format(self.PGSIG['DSTR'], pcnt, self.PGSIG['MPROC']), logact, dowait)
          i += 1
@@ -1241,8 +1241,8 @@ class PgSIG(PgDBI):
       Returns:
          int: The background process ID, or 0 if not found.
       """
-      for cbid in self.CBIDS:
-         if self.CBIDS[cbid] == bcmd: return cbid
+      for cbid, ccmd in list(self.CBIDS.items()):   # a copy: SIGCHLD may remove entries meanwhile
+         if ccmd == bcmd: return cbid
       return 0
 
    # check one or all child processes if they are still running
@@ -1274,8 +1274,8 @@ class PgSIG(PgDBI):
                else:
                   self.pglog("{}: Background process still running".format(bid), logact)
                bcnt = 1
-            elif bid in self.CBIDS:
-               del self.CBIDS[bid]   # clean the saved info for the process
+            else:
+               self.CBIDS.pop(bid, None)   # clean the saved info; SIGCHLD may have removed it
          elif not bcmd:
             # Bug fix: cannot delete from a dict while iterating over it;
             # iterate over a copy of the keys instead.
@@ -1284,7 +1284,7 @@ class PgSIG(PgDBI):
                if self.check_process(cbid):  # process is not done yet
                   bcnt += 1
                else:
-                  if cbid in self.CBIDS: del self.CBIDS[cbid]   # SIGCHLD may have removed it
+                  self.CBIDS.pop(cbid, None)   # SIGCHLD may have removed it
          if not (bcnt and dowait): break
          self.show_wait_message(i, "{}: wait {}/{} background processes".format(self.PGSIG['DSTR'], bcnt, self.PGSIG['BPROC']), logact, dowait)
          i += 1

{rda_python_common-3.0.31.dist-info → rda_python_common-3.0.32.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 3.0.31
+Version: 3.0.32
 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.31`).  If the import
+You should see the installed version (currently `3.0.32`).  If the import
 fails, double-check that the active Python environment is the one where you
 ran `pip install`.
 

{rda_python_common-3.0.31.dist-info → rda_python_common-3.0.32.dist-info}/RECORD

@@ -7,7 +7,7 @@ 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=FTPc_6PSJ2E2CjQET_-Dbs3zGy8sewMbnI7GMCtQXbk,995
+rda_python_common/__init__.py,sha256=7vknjjYyG_aC7QbPbXubi2BuMQLM0sMe7jmbraVqdPo,995
 rda_python_common/pg_cmd.py,sha256=MYldUuM8mSUIT34yKQyUd0i4NL4zdSB8C6Jcc28NRxA,33809
 rda_python_common/pg_dbi.py,sha256=ASIW2vsIjMab2TMfhqJiXS7LQhKKGpKjzNMqo7RCePw,122415
 rda_python_common/pg_file.py,sha256=7NipcgMy4t67zbH2MHtRL3vxyY1FHdIgMTQ-kE0H2fA,181122
@@ -15,14 +15,14 @@ rda_python_common/pg_lock.py,sha256=31EaVDjCkcx3-n8-KnzG18R8Pz7Z6KyFsEqcml6Iq5c,
 rda_python_common/pg_log.py,sha256=erQN4YYPwiORa3OE0Jt8s05rlWsjtyIs0fJ_KLbNAQ8,82959
 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=gmOIHRx-SqiFmjQorQcJoEsiXoXI-akDrYoP3SuKVfM,62032
+rda_python_common/pg_sig.py,sha256=S7FgYL87vo8xnL25E3-IHqo4p3Gv1jVrIbzoUM2IhAI,62155
 rda_python_common/pg_split.py,sha256=aAWKUZPmZ-LQ_fJ3DSKzPKxJw0fMDJ2fgP8ZT629M30,16375
 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.31.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
-rda_python_common-3.0.31.dist-info/METADATA,sha256=MH_cd7VJNUJsx2lMUxE4MaKuwoRAVSbZb0kyywMbOYk,14530
-rda_python_common-3.0.31.dist-info/WHEEL,sha256=mOdXR9C3wMVov7cSY8PY-XCzo3SmmWCHvGQr5csJoao,91
-rda_python_common-3.0.31.dist-info/entry_points.txt,sha256=pZgVNWspcK-F1TbPav7C3C9NdeHDZMm_25fW9weix00,65
-rda_python_common-3.0.31.dist-info/top_level.txt,sha256=KVQmx7D3DD-jsiheqL8HdTrRE14hpRnZY5_ioMArA5k,18
-rda_python_common-3.0.31.dist-info/RECORD,,
+rda_python_common-3.0.32.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
+rda_python_common-3.0.32.dist-info/METADATA,sha256=4g8--h9AH3tsSr7K-NENKxeC3IFkA11_zOniCZeoTCw,14530
+rda_python_common-3.0.32.dist-info/WHEEL,sha256=mOdXR9C3wMVov7cSY8PY-XCzo3SmmWCHvGQr5csJoao,91
+rda_python_common-3.0.32.dist-info/entry_points.txt,sha256=pZgVNWspcK-F1TbPav7C3C9NdeHDZMm_25fW9weix00,65
+rda_python_common-3.0.32.dist-info/top_level.txt,sha256=KVQmx7D3DD-jsiheqL8HdTrRE14hpRnZY5_ioMArA5k,18
+rda_python_common-3.0.32.dist-info/RECORD,,