Clean up PEP 257 support

[etc/vim.git] / black.py

diff --git a/black.py b/black.py
index 7dc6ef86c1d4b12a4a46bc2c1cd6fe080a12af01..dc67991f2c94d3f1444a56179409eb8c65cfbd9a 100644 (file)
--- a/black.py
+++ b/black.py
@@ -989,14 +989,11 @@ class Line:
 
     @property
     def is_triple_quoted_string(self) -> bool:
 
     @property
     def is_triple_quoted_string(self) -> bool:

-        """Is the line a triple quoted docstring?"""
+        """Is the line a triple quoted string?"""

         return (
             bool(self)
             and self.leaves[0].type == token.STRING
         return (
             bool(self)
             and self.leaves[0].type == token.STRING

-            and (
-                self.leaves[0].value.startswith('"""')
-                or self.leaves[0].value.startswith("'''")
-            )
+            and self.leaves[0].value.startswith(('"""', "'''"))

         )
 
     def contains_standalone_comments(self, depth_limit: int = sys.maxsize) -> bool:
         )
 
     def contains_standalone_comments(self, depth_limit: int = sys.maxsize) -> bool:


@@ -1257,9 +1254,8 @@ class EmptyLineTracker:
             if self.previous_line.is_decorator:
                 return 0, 0
 
             if self.previous_line.is_decorator:
                 return 0, 0
 

-            if (
-                self.previous_line.is_class
-                and self.previous_line.depth != current_line.depth
+            if self.previous_line.depth < current_line.depth and (
+                self.previous_line.is_class or self.previous_line.is_def

             ):
                 return 0, 0
 
             ):
                 return 0, 0