]> git.madduck.net Git - etc/vim.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Add trailing comma for single `as` imports, too
authorŁukasz Langa <lukasz@langa.pl>
Wed, 26 Sep 2018 15:26:35 +0000 (08:26 -0700)
committerŁukasz Langa <lukasz@langa.pl>
Wed, 26 Sep 2018 15:26:35 +0000 (08:26 -0700)
black.py
docs/reference/reference_functions.rst
tests/data/comments2.py
tests/data/comments4.py

index 84ae9f1eed963536bfd3c7b0a2f04857c3ae78e8..2eefe11f112de6d3161187fe5bf31e543a934bac 100644 (file)
--- a/black.py
+++ b/black.py
@@ -2329,8 +2329,9 @@ def bracket_split_build_line(
             # Since body is a new indent level, remove spurious leading whitespace.
             normalize_prefix(leaves[0], inside_brackets=True)
             # Ensure a trailing comma when expected.
             # Since body is a new indent level, remove spurious leading whitespace.
             normalize_prefix(leaves[0], inside_brackets=True)
             # Ensure a trailing comma when expected.
-            if original.is_import and len(leaves) == 1:
-                leaves.append(Leaf(token.COMMA, ","))
+            if original.is_import:
+                if leaves[-1].type != token.COMMA:
+                    leaves.append(Leaf(token.COMMA, ","))
     # Populate the line
     for leaf in leaves:
         result.append(leaf, preformatted=True)
     # Populate the line
     for leaf in leaves:
         result.append(leaf, preformatted=True)
index ccea313be20cdee83546b85316b768f8d1af92b1..dffde25ba2001e5389148789aa767cb1192c7f8b 100644 (file)
@@ -79,6 +79,8 @@ Parsing
 Split functions
 ---------------
 
 Split functions
 ---------------
 
+.. autofunction:: black.bracket_split_build_line
+
 .. autofunction:: black.bracket_split_succeeded_or_raise
 
 .. autofunction:: black.delimiter_split
 .. autofunction:: black.bracket_split_succeeded_or_raise
 
 .. autofunction:: black.delimiter_split
index 32a2ab379363aae23fde56b99898c1728397f7d3..53d4881f1807beea419af713840832f79bd5f5d1 100644 (file)
@@ -1,3 +1,10 @@
+from com.my_lovely_company.my_lovely_team.my_lovely_project.my_lovely_component import (
+    MyLovelyCompanyTeamProjectComponent  # NOT DRY
+)
+from com.my_lovely_company.my_lovely_team.my_lovely_project.my_lovely_component import (
+    MyLovelyCompanyTeamProjectComponent as component  # DRY
+)
+
 # Please keep __all__ alphabetized within each category.
 
 __all__ = [
 # Please keep __all__ alphabetized within each category.
 
 __all__ = [
@@ -148,6 +155,13 @@ instruction()
 # output
 
 
 # output
 
 
+from com.my_lovely_company.my_lovely_team.my_lovely_project.my_lovely_component import (
+    MyLovelyCompanyTeamProjectComponent,  # NOT DRY
+)
+from com.my_lovely_company.my_lovely_team.my_lovely_project.my_lovely_component import (
+    MyLovelyCompanyTeamProjectComponent as component,  # DRY
+)
+
 # Please keep __all__ alphabetized within each category.
 
 __all__ = [
 # Please keep __all__ alphabetized within each category.
 
 __all__ = [
index 013684cac43238b5e307f6b5392a9f068e977684..c0db5b1c85061757811e230cb1a923646beb42b3 100644 (file)
@@ -1,3 +1,11 @@
+from com.my_lovely_company.my_lovely_team.my_lovely_project.my_lovely_component import (
+    MyLovelyCompanyTeamProjectComponent,  # NOT DRY
+)
+from com.my_lovely_company.my_lovely_team.my_lovely_project.my_lovely_component import (
+    MyLovelyCompanyTeamProjectComponent as component,  # DRY
+)
+
+
 class C:
     @pytest.mark.parametrize(
         ("post_data", "message"),
 class C:
     @pytest.mark.parametrize(
         ("post_data", "message"),