Skip to content

Commit

Permalink
Removed adding a space into empty docstrings. (#2249)
Browse files Browse the repository at this point in the history
Resolves #2168 by disabling the insertion of a " " when the docstring is entirely empty.

Note that this PR is focussed only on the case of empty docstrings. In particular this does not make any changes to the behaviour that a " " is inserted if a non-empty docstring begins with the quoting character. That is, black still prefers:

    """ "something" """

to:

    """"something" """

and that:

    """"Something""""

is not a legal docstring.
  • Loading branch information
MarkCBell committed May 25, 2021
1 parent 04518c3 commit 92f20d7
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Expand Up @@ -4,6 +4,7 @@

### _Black_

- A space is no longer inserted into empty docstrings (#2249)
- Fix handling of .gitignore files containing non-ASCII characters on Windows (#2229)
- Respect `.gitignore` files in all levels, not only `root/.gitignore` file (apply
`.gitignore` rules like `git` does) (#2225)
Expand Down
4 changes: 2 additions & 2 deletions src/black/linegen.py
Expand Up @@ -236,6 +236,7 @@ def visit_STRING(self, leaf: Leaf) -> Iterator[Line]:
# characters but only if they are the same as the first.
quote_len = 1 if docstring[1] != quote_char else 3
docstring = docstring[quote_len:-quote_len]
docstring_started_empty = not docstring

if is_multiline_string(leaf):
indent = " " * 4 * self.current_line.depth
Expand All @@ -255,8 +256,7 @@ def visit_STRING(self, leaf: Leaf) -> Iterator[Line]:
# Odd number of tailing backslashes, add some padding to
# avoid escaping the closing string quote.
docstring += " "
else:
# Add some padding if the docstring is empty.
elif not docstring_started_empty:
docstring = " "

# We could enforce triple quotes at this point.
Expand Down
16 changes: 8 additions & 8 deletions tests/data/docstring.py
Expand Up @@ -102,7 +102,7 @@ def and_this():
"hey yah"'''


def empty():
def multiline_whitespace():
'''
Expand All @@ -111,11 +111,11 @@ def empty():
'''


def oneline_empty():
def oneline_whitespace():
''' '''


def oneline_nothing():
def empty():
""""""


Expand Down Expand Up @@ -293,16 +293,16 @@ def and_this():
"hey yah"'''


def empty():
def multiline_whitespace():
""" """


def oneline_empty():
def oneline_whitespace():
""" """


def oneline_nothing():
""" """
def empty():
""""""


def single_quotes():
Expand Down Expand Up @@ -374,4 +374,4 @@ def my_god_its_full_of_stars_1():

# the space below is actually a \u2001, removed in output
def my_god_its_full_of_stars_2():
"I'm sorry Dave"
"I'm sorry Dave"

0 comments on commit 92f20d7

Please sign in to comment.