rda-python-common 1.0.24__py3-none-any.whl → 1.0.26__py3-none-any.whl

rda_python_common/PgDBI.py

@@ -1500,7 +1500,7 @@ def ucar_user_info(userno, logname = None):
    elif pgrec['userno']:
       pgrec['userno'] = userno = int(pgrec['userno'])
    if pgrec['upid']: pgrec['upid'] = int(pgrec['upid'])          
-   if pgrec['stat_flag']: pgrec['stat_flag'] = 'A' if pgrec['stat_flag'] == '1' else 'C'
+   if pgrec['stat_flag']: pgrec['stat_flag'] = 'A' if pgrec['stat_flag'] == "True" else 'C'
    if pgrec['email'] and re.search(r'(@|\.)ucar\.edu$', pgrec['email'], re.I):
       pgrec['email'] = pgrec['ucaremail']
       pgrec['org_name'] = 'NCAR'

rda_python_common/PgSIG.py

@@ -816,16 +816,22 @@ def get_pbs_info(qopts, multiple = 0, logact = 0, chkcnt = 1):
          if re.match(r'^-----', line): chkd = 0
       else:
          vals = re.split(r'\s+', PgLOG.pgtrim(line))
-         if len(vals) == kcnt:
+         vcnt = len(vals)
+         if vcnt == 1:
+            if multiple:
+               stat[ckeys[kcnt-1]].append(vals[0])
+            else:
+               stat[ckeys[kcnt-1]] = vals[0]
+               break
+         elif vcnt > 1:
             ms = re.match(r'^(\d+)', vals[0])
             if ms: vals[0] = ms.group(1)
-            if multiple:
-               for i in range(kcnt):
+            for i in range(vcnt):
+               if multiple:
                   stat[ckeys[i]].append(vals[i])
-            else:
-               for i in range(kcnt):
+               else:
                   stat[ckeys[i]] = vals[i]
-               break
+                  if vcnt == kcnt: break
 
    return stat
 

{rda_python_common-1.0.24.dist-info → rda_python_common-1.0.26.dist-info}/METADATA

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

@@ -1,15 +1,15 @@
 rda_python_common/PgCMD.py,sha256=EYjG2Z4zEnvsXE1z-jt5UaNoEKxnOYYiMMzvW6HrKA4,20597
-rda_python_common/PgDBI.py,sha256=iGy0SQZsdVbSz2ewTIUK3e-RQBC5eQM9-_XUcFU1c50,74211
+rda_python_common/PgDBI.py,sha256=4r7sglMn1M-wfbsaHIWPcoX3p5JbBNTCuEAu-q1BWhQ,74214
 rda_python_common/PgFile.py,sha256=756onQnWH_MK8llF0-8b6yV6KC1eY_eCPEkygxeJQQU,98460
 rda_python_common/PgLOG.py,sha256=DFCQgcmbU04H6Kz9X9nxuFdLA1VNRBQefRvK8LvO9Pw,54273
 rda_python_common/PgLock.py,sha256=12i84nsGBuifSyPnm8IR63LvHvRuVU573D5QKFlHdOI,22623
 rda_python_common/PgOPT.py,sha256=JbzLCkJ_RYR95fDCKyT1uxJAddYB6FuPs3L47PxcuKs,55445
-rda_python_common/PgSIG.py,sha256=oDXcSnnzW6wKm_cSpFxQZWAo2hpPPTcuNDYhPSNQcRc,35607
+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.24.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
-rda_python_common-1.0.24.dist-info/METADATA,sha256=LtSYAwFwFwOoF4qwTkF4CjGJ4VdTan9JFupfNiTO2wI,716
-rda_python_common-1.0.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rda_python_common-1.0.24.dist-info/top_level.txt,sha256=KVQmx7D3DD-jsiheqL8HdTrRE14hpRnZY5_ioMArA5k,18
-rda_python_common-1.0.24.dist-info/RECORD,,
+rda_python_common-1.0.26.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
+rda_python_common-1.0.26.dist-info/METADATA,sha256=Bs-u2UnNIq9dSQSzsjlp1u64euzt0pardPKKkk5Nu24,716
+rda_python_common-1.0.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rda_python_common-1.0.26.dist-info/top_level.txt,sha256=KVQmx7D3DD-jsiheqL8HdTrRE14hpRnZY5_ioMArA5k,18
+rda_python_common-1.0.26.dist-info/RECORD,,