TravisCI: Test on production Python 3.7 and 3.8-dev (#393)

[etc/vim.git] / black.py

diff --git a/black.py b/black.py
index b9eca0adbaf29bc170e77f595b5c905945819e82..f49e6df423e438acb9896c3d60e5c4d81758e608 100644 (file)
--- a/black.py
+++ b/black.py
@@ -46,7 +46,7 @@ from blib2to3.pgen2 import driver, token
 from blib2to3.pgen2.parse import ParseError
 
 
 from blib2to3.pgen2.parse import ParseError
 
 

-__version__ = "18.6b2"
+__version__ = "18.6b4"

 DEFAULT_LINE_LENGTH = 88
 DEFAULT_EXCLUDES = (
     r"/(\.git|\.hg|\.mypy_cache|\.tox|\.venv|_build|buck-out|build|dist)/"
 DEFAULT_LINE_LENGTH = 88
 DEFAULT_EXCLUDES = (
     r"/(\.git|\.hg|\.mypy_cache|\.tox|\.venv|_build|buck-out|build|dist)/"


@@ -2577,6 +2577,9 @@ def convert_one_fmt_off_pair(node: Node) -> bool:
                         continue
 
                 ignored_nodes = list(generate_ignored_nodes(leaf))
                         continue
 
                 ignored_nodes = list(generate_ignored_nodes(leaf))

+                if not ignored_nodes:
+                    continue
+

                 first = ignored_nodes[0]  # Can be a container node with the `leaf`.
                 parent = first.parent
                 prefix = first.prefix
                 first = ignored_nodes[0]  # Can be a container node with the `leaf`.
                 parent = first.parent
                 prefix = first.prefix


@@ -2605,7 +2608,7 @@ def convert_one_fmt_off_pair(node: Node) -> bool:
                 )
                 return True
 
                 )
                 return True
 

-            previous_consumed += comment.consumed
+            previous_consumed = comment.consumed

 
     return False
 
 
     return False
 


@@ -2950,7 +2953,7 @@ def gen_python_files_in_dir(
     """Generate all files under `path` whose paths are not excluded by the
     `exclude` regex, but are included by the `include` regex.
 
     """Generate all files under `path` whose paths are not excluded by the
     `exclude` regex, but are included by the `include` regex.
 

-    Symbolic links pointing outside of the root directory are ignored.
+    Symbolic links pointing outside of the `root` directory are ignored.

 
     `report` is where output about exclusions goes.
     """
 
     `report` is where output about exclusions goes.
     """


@@ -2961,8 +2964,7 @@ def gen_python_files_in_dir(
         except ValueError:
             if child.is_symlink():
                 report.path_ignored(
         except ValueError:
             if child.is_symlink():
                 report.path_ignored(

-                    child,
-                    "is a symbolic link that points outside of the root directory",
+                    child, f"is a symbolic link that points outside {root}"

                 )
                 continue
 
                 )
                 continue