rda-python-common 2.1.3__py3-none-any.whl → 2.1.5__py3-none-any.whl

rda_python_common/pg_file.py

@@ -2994,8 +2994,8 @@ class PgFile(PgUtil, PgSIG):
          logact = lact = self.LOGWRN
       lvl = self.DIRLVLS
       self.DIRLVLS = 0     # set to 0 to stop recording directory
-      while lvl > 0:
-         lvl -= 1
+      while lvl != 0:
+         if lvl > 0: lvl -= 1
          dirs = {}
          for dir in self.DELDIRS:
             host = self.DELDIRS[dir]
@@ -3007,7 +3007,8 @@ class PgFile(PgUtil, PgSIG):
             elif dstat > 0:
                if dstat == 1 and lvl > 0: self.pglog(dinfo + ": Directory not empty yet", lact)
                continue
-            if lvl: dirs[op.dirname(dir)] = host
+            pdir = self.dirname(dir)
+            if lvl and pdir and not re.match(r'^(\.|\./|/)$', pdir): dirs[pdir] = host
          if not dirs: break
          self.DELDIRS = dirs
       self.DELDIRS = {}   # empty cache afterward

rda_python_common/pg_log.py

@@ -199,9 +199,8 @@ class PgLOG:
          except Exception as e:
             self.pglog("{}: Error open file to write - {}".format(outfile, str(e)), self.PGOPT['extlog'])
       else:                             # result to STDOUT
-         if self.OUTPUT and self.OUTPUT != sys.stdout:
-            self.OUTPUT.close()
-            self.OUTPUT = sys.stdout
+         if self.OUTPUT and self.OUTPUT != sys.stdout: self.OUTPUT.close()
+         self.OUTPUT = sys.stdout
 
    def current_datetime(self, ctime=0):
       """Return a datetime string in YYYYMMDDHHMMSS format.

{rda_python_common-2.1.3.dist-info → rda_python_common-2.1.5.dist-info}/METADATA

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

@@ -10,18 +10,18 @@ rda_python_common/PgUtil.py,sha256=OqESKCd72b9g8m8jwjPJhXDtPYlW6G8oSOhwChvz2Cg,4
 rda_python_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rda_python_common/pg_cmd.py,sha256=hQZaW80eFqEUoF0vZHtGuvBEWXbXdY0Nvj6rFIQGboo,32856
 rda_python_common/pg_dbi.py,sha256=R-ZzHUItAxma_rCTrelDakFQDl8yEtOTKo4IRfzKl_Q,116269
-rda_python_common/pg_file.py,sha256=Gz0R1wISIMHr7UBPGqeK6eJlLCjwQcP_V6n65WxjTEM,161927
+rda_python_common/pg_file.py,sha256=gNhUjT39g6RMUel1Z4suxFrQtstQr8emNxI-NphKyOE,162015
 rda_python_common/pg_lock.py,sha256=Il-pY81JtEDMWtwqW6lEM-EtKbhNI6rug8VMCdkGgNc,32703
-rda_python_common/pg_log.py,sha256=0QSfyPh7eQCeRqXIr2JyuzYgqvrz02-mQmWB-6rWukg,80676
+rda_python_common/pg_log.py,sha256=Zte9joy46hn2RsJPNpisHLjxZI-mDdcXY4aSiMNlIoY,80661
 rda_python_common/pg_opt.py,sha256=N45DIY2O3S7ogABOHUecfiKwQY1_O4X7WYYZGLdnhOI,82506
 rda_python_common/pg_password.py,sha256=X-eIDwdqBhtrhrbDTNWle-0JtWsyIVZdDOZaBu7cFHM,2343
 rda_python_common/pg_sig.py,sha256=Dz7QKOkwYchbhVZgQxQqFrUmGaxer2bm8D2K99ig5L0,52760
 rda_python_common/pg_split.py,sha256=yOeUSRzgQlwNGzv76ZLCZtsjzDQw0NeYXz0IV0RZgXQ,16343
 rda_python_common/pg_util.py,sha256=1f25D4xyPMerW55q42CQOD0WYAoFYL2A8Opl4rHA8N4,87393
 rda_python_common/pgpassword.py,sha256=WXEq88XgkQSmJ2j2MX0HSVEUFZOFu-gokRJYvEQj_u4,2900
-rda_python_common-2.1.3.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
-rda_python_common-2.1.3.dist-info/METADATA,sha256=W-ysLsTr3KWxJMAUIYSbCKnbin9Erq_JVIYas0C---E,740
-rda_python_common-2.1.3.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-rda_python_common-2.1.3.dist-info/entry_points.txt,sha256=pZgVNWspcK-F1TbPav7C3C9NdeHDZMm_25fW9weix00,65
-rda_python_common-2.1.3.dist-info/top_level.txt,sha256=KVQmx7D3DD-jsiheqL8HdTrRE14hpRnZY5_ioMArA5k,18
-rda_python_common-2.1.3.dist-info/RECORD,,
+rda_python_common-2.1.5.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
+rda_python_common-2.1.5.dist-info/METADATA,sha256=o-rx2hJHMzPUTijfw5XylM5OkWJYVqbyiOFbMA4AVJw,740
+rda_python_common-2.1.5.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+rda_python_common-2.1.5.dist-info/entry_points.txt,sha256=pZgVNWspcK-F1TbPav7C3C9NdeHDZMm_25fW9weix00,65
+rda_python_common-2.1.5.dist-info/top_level.txt,sha256=KVQmx7D3DD-jsiheqL8HdTrRE14hpRnZY5_ioMArA5k,18
+rda_python_common-2.1.5.dist-info/RECORD,,