Add trailing comma for single `as` imports, too

diff --git a/black.py b/black.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)

diff --git a/docs/reference/reference_functions.rst b/docs/reference/reference_functions.rst
index ccea313be20cdee83546b85316b768f8d1af92b1..dffde25ba2001e5389148789aa767cb1192c7f8b 100644 (file)
--- a/docs/reference/reference_functions.rst
+++ b/docs/reference/reference_functions.rst
@@ -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

diff --git a/tests/data/comments2.py b/tests/data/comments2.py
index 32a2ab379363aae23fde56b99898c1728397f7d3..53d4881f1807beea419af713840832f79bd5f5d1 100644 (file)
--- a/tests/data/comments2.py
+++ b/tests/data/comments2.py
@@ -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__ = [

diff --git a/tests/data/comments4.py b/tests/data/comments4.py
index 013684cac43238b5e307f6b5392a9f068e977684..c0db5b1c85061757811e230cb1a923646beb42b3 100644 (file)
--- a/tests/data/comments4.py
+++ b/tests/data/comments4.py
@@ -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"),