Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix quantity of blank lines after code object. #632

Merged
merged 1 commit into from Jul 13, 2016
Merged

Fix quantity of blank lines after code object. #632

merged 1 commit into from Jul 13, 2016

Conversation

@ghost
Copy link

@ghost ghost commented Jul 12, 2016

No description provided.

@jaraco
Copy link
Member

@jaraco jaraco commented Jul 12, 2016

This seems like a reasonable change. Consistency is good. The changes to files in _vendor while acceptable are discouraged as they will be overridden when that package is refreshed and also, it makes the file checksums not match any version in the upstream package. The best thing to do for those would be to request these changes in the relevant upstream package and then they'll eventually get refreshed here.

@@ -4,6 +4,8 @@
from setuptools.extern import six

# HFS Plus uses decomposed UTF-8

This comment has been minimized.

@jaraco

jaraco Jul 12, 2016
Member

I think this change is wrong. In my experience, the comments should be adjacent to their relevant code. These additional new lines make the comment appear as a standalone construct.

@@ -26,6 +27,7 @@ def setup_context(tmpdir):


class Test:

This comment has been minimized.

@jaraco

jaraco Jul 12, 2016
Member

Is the double new line after a class decoration something that's part of the standard? I'm not familiar with it. Can you provide a reference?

This comment has been minimized.

@ghost

ghost Jul 12, 2016
Author

it's E309, and it is not part of the standard.

@@ -160,6 +163,8 @@ def interpret_distro_name(
)

# From Python 2.7 docs

This comment has been minimized.

@jaraco

jaraco Jul 12, 2016
Member

Here again, the whitespace betrays the meaning.

@@ -3162,6 +3233,8 @@ def z(*paArgs):
#
# global helpers
#

This comment has been minimized.

@jaraco

jaraco Jul 12, 2016
Member

Here's a case where maybe the extra space makes sense. The comment isn't pertinent to the immediate following block but to the rest of the file.

@@ -766,11 +794,14 @@ def nullDebugAction(*args):

# this version is Python 2.x-3.x cross-compatible
'decorator to trim function calls to match the arity of the target'

This comment has been minimized.

@jaraco

jaraco Jul 12, 2016
Member

I'm pretty sure this string should be the do string for the function. Perhaps also the comment should be moved inside.

@ghost
Copy link
Author

@ghost ghost commented Jul 12, 2016

@jaraco Done.

@jaraco jaraco merged commit 45de6ea into pypa:master Jul 13, 2016
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@ghost
Copy link
Author

@ghost ghost commented Jul 14, 2016

@jaraco In this (#648) PR those two line adjacent to their relevant code.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

1 participant