New distribution [0.7.3.post2]

* no changes to core logics
* revised core codes

Author: JarryShaw

docker/Dockerfile

@@ -1,6 +1,6 @@
 # basic info
 FROM library/ubuntu
-LABEL version 0.7.3.post1
+LABEL version 0.7.3.post2
 LABEL description "Ubuntu Environment for F2FORMAT"
 
 # prepare environment

f2format.py

@@ -31,7 +31,7 @@
     del multiprocessing
 
 # version string
-__version__ = '0.7.3.post1'
+__version__ = '0.7.3.post2'
 
 # from configparser
 BOOLEAN_STATES = {'1': True, '0': False,
@@ -357,6 +357,45 @@ def get_parser():
     return parser
 
 
+def find(root):  # pragma: no cover
+    """Recursively find all files under root.
+
+    Args:
+     - root -- os.PathLike, root path to search
+
+    Returns:
+     - typing.Generator -- yield all files under the root path
+
+    """
+    flst = list()
+    temp = os.listdir(root)
+    for file in temp:
+        path = os.path.join(root, file)
+        if os.path.isdir(path):
+            flst.extend(find(path))
+        elif os.path.isfile(path):
+            flst.append(path)
+        elif os.path.islink(path):  # exclude symbolic links
+            continue
+    yield from flst
+
+
+def rename(path, root):
+    """Rename file for archiving.
+
+    Args:
+     - path -- os.PathLike, file to rename
+     - root -- os.PathLike, archive path
+
+    Returns:
+     - str -- the archiving path
+
+    """
+    stem, ext = os.path.splitext(path)
+    name = '%s-%s%s' % (stem, uuid.uuid4(), ext)
+    return os.path.join(root, name)
+
+
 def main(argv=None):
     """Entry point for f2format.
 
@@ -384,25 +423,6 @@ def main(argv=None):
     F2FORMAT_QUIET = os.getenv('F2FORMAT_QUIET')
     os.environ['F2FORMAT_QUIET'] = '1' if args.quiet else ('0' if F2FORMAT_QUIET is None else F2FORMAT_QUIET)
 
-    def find(root):  # pragma: no cover
-        """Recursively find all files under root."""
-        flst = list()
-        temp = os.listdir(root)
-        for file in temp:
-            path = os.path.join(root, file)
-            if os.path.isdir(path):
-                flst.extend(find(path))
-            elif os.path.isfile(path):
-                flst.append(path)
-            elif os.path.islink(path):  # exclude symbolic links
-                continue
-        yield from flst
-
-    def rename(path):
-        stem, ext = os.path.splitext(path)
-        name = '%s-%s%s' % (stem, uuid.uuid4(), ext)
-        return os.path.join(ARCHIVE, name)
-
     # make archive directory
     if archive:
         os.makedirs(ARCHIVE, exist_ok=True)
@@ -412,13 +432,13 @@ def rename(path):
     for path in args.file:
         if os.path.isfile(path):
             if archive:
-                dest = rename(path)
+                dest = rename(path, root=ARCHIVE)
                 os.makedirs(os.path.dirname(dest), exist_ok=True)
                 shutil.copy(path, dest)
             filelist.append(path)
         if os.path.isdir(path):
             if archive:
-                shutil.copytree(path, rename(path))
+                shutil.copytree(path, rename(path, root=ARCHIVE))
             filelist.extend(find(path))
 
     # check if file is Python source code

setup.py

@@ -15,7 +15,7 @@
     long_desc = file.read()
 
 # version string
-__version__ = '0.7.3.post1'
+__version__ = '0.7.3.post2'
 
 # set-up script for pip distribution
 setup(

share/f2format.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH F2FORMAT 1 "July 14, 2019" "v0.7.3.post1" ""
+.TH F2FORMAT 1 "July 21, 2019" "v0.7.3.post2" ""
 .SH NAME
 f2format \- back-port compiler for Python 3.6 f-string literals
 .

share/f2format.rst

@@ -6,8 +6,8 @@ f2format
 back-port compiler for Python 3.6 f-string literals
 ---------------------------------------------------
 
-:Version: v0.7.3.post1
-:Date: July 14, 2019
+:Version: v0.7.3.post2
+:Date: July 21, 2019
 :Manual section: 1
 :Author:
     Jarry Shaw, a newbie programmer, is the author, owner and maintainer