rda-python-common 2.1.3__tar.gz → 2.1.5__tar.gz

{rda_python_common-2.1.3 → rda_python_common-2.1.5}/PKG-INFO

@@ -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 → rda_python_common-2.1.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rda_python_common"
-version = "2.1.3"
+version = "2.1.5"
 authors = [
   { name="Zaihua Ji", email="zji@ucar.edu" },
 ]

{rda_python_common-2.1.3 → rda_python_common-2.1.5}/src/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-2.1.3 → rda_python_common-2.1.5}/src/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 → rda_python_common-2.1.5}/src/rda_python_common.egg-info/PKG-INFO

@@ -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