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

A few syntax cleanups #3208

Merged
merged 2 commits into from Oct 5, 2018
Merged

A few syntax cleanups #3208

merged 2 commits into from Oct 5, 2018

Conversation

mwichmann
Copy link
Collaborator

Suggested by PyCharm. Includes three "real" changes:

  1. src/engine/SCons/Node/init.py has a print statement in a function
    which references 'self', but there is no 'self' defined (it is not
    a method in a class). Guessing it should have been 'node'.
  2. src/engine/SCons/Environment.py makes a call using 'kwbd' which is not
    defined, looks like a copy-paste error and should be 'bd'.
  3. src/engine/SCons/Tool/JavaCommon.py splits 'file', which is not
    defined, was evidently supposed to be 'fn'.

These should be double-checked.

The rest are purely syntax: whitespace, dropping trailing semicolons,
using "is" to test for None, simplifying comparisons, normalizing
docstring commenting ("always triple double quotes"), unneeded
backslashes.

Signed-off-by: Mats Wichmann mats@linux.com

Contributor Checklist:

  • I have created a new test or updated the unit tests to cover the new/changed functionality.
  • I have updated master/src/CHANGES.txt directory (and read the README.txt in that directory)
  • I have updated the appropriate documentation

Suggested by PyCharm.  Includes three "real" changes:

1. src/engine/SCons/Node/__init__.py has a print statement in a function
   which references 'self', but there is no 'self' defined (it is not
   a method in a class). Guessing it should have been 'node'.
2. src/engine/SCons/Environment.py makes a call using 'kwbd' which is not
   defined, looks like a copy-paste error and should be 'bd'.
3. src/engine/SCons/Tool/JavaCommon.py splits 'file', which is not
   defined, was evidently supposed to be 'fn'.

These should be double-checked.

The rest are purely syntax: whitespace, dropping trailing semicolons,
using "is" to test for None, simplifying comparisons, normalizing
docstring commenting ("always triple double quotes"), unneeded
backslashes.

Signed-off-by: Mats Wichmann <mats@linux.com>
@mwichmann
Copy link
Collaborator Author

Okay, this breaks something, looking. The appveyor fails are not code-related - it's not getting things from chocolatey. But the two packaging tests from the travis builds I can confirm here are real.

Signed-off-by: Mats Wichmann <mats@linux.com>
@coveralls
Copy link

Coverage Status

Coverage decreased (-1.09%) to 78.881% when pulling 2470a8e on mwichmann:mdw-syntax-1 into ab7b175 on SCons:master.

1 similar comment
@coveralls
Copy link

Coverage Status

Coverage decreased (-1.09%) to 78.881% when pulling 2470a8e on mwichmann:mdw-syntax-1 into ab7b175 on SCons:master.

@bdbaddog bdbaddog merged commit 8f2701f into SCons:master Oct 5, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants