diff --git a/README.md b/README.md index 273b042..2b87e29 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Whenever the original PEP 8 at python.org gets updated we need to migrate these To migrate the latest changes from the original PEP 8 source do the following: -* Look at the [source control history for the original PEP 8](https://github.com/python/peps/commits/master/pep-0008.txt) and compare it with what's live on pep8.org. (As of 2019-06 we're tracking rev `e0436e9`.) +* Look at the [source control history for the original PEP 8](https://github.com/python/peps/commits/master/pep-0008.txt) and compare it with what's live on pep8.org. (As of 2019-06 we're tracking rev `2f8f1ec`.) * Apply the missing changes to `index.html` and create a pull-request to get them reviewed and live on pep8.org diff --git a/index.html b/index.html index 61c2508..c0e02fd 100644 --- a/index.html +++ b/index.html @@ -255,7 +255,7 @@ ul > li { foo = long_function_name(var_one, var_two, var_three, var_four) -# More indentation included to distinguish this from the rest. +# Add 4 spaces (an extra level of indentation) to distinguish arguments from the rest. def long_function_name( var_one, var_two, var_three, var_four): @@ -353,7 +353,7 @@ result = some_function_that_takes_arguments(

The default wrapping in most tools disrupts the visual structure of the code, making it more difficult to understand. The limits are chosen to avoid wrapping in editors with the window width set to 80, even if the tool places a marker glyph in the final column when wrapping lines. Some web based tools may not offer dynamic line wrapping at all.

-

Some teams strongly prefer a longer line length. For code maintained exclusively or primarily by a team that can reach agreement on this issue, it is okay to increase the nominal line length from 80 to 100 characters (effectively increasing the maximum length to 99 characters), provided that comments and docstrings are still wrapped at 72 characters.

+

Some teams strongly prefer a longer line length. For code maintained exclusively or primarily by a team that can reach agreement on this issue, it is okay to increase the line length limit up to 99 characters, provided that comments and docstrings are still wrapped at 72 characters.

The Python standard library is conservative and requires limiting lines to 79 characters (and docstrings/comments to 72).

@@ -371,7 +371,7 @@ result = some_function_that_takes_arguments(

Make sure to indent the continued line appropriately.

-

Should a line break before or after a binary operator?

+

Should a Line Break Before or After a Binary Operator?

For decades the recommended style was to break after binary operators. But this can hurt readability in two ways: the operators tend to get scattered across different columns on the screen, and each operator is moved away from its operand and onto the previous line. Here, the eye has to do extra work to tell which items are added and which are subtracted:

@@ -429,7 +429,7 @@ income = (gross_wages