Finish linting on py3ish code #2949
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is a first step and only adds docstrings, etc. It doesn't refactor any code. Conflicts: prospector-more.yml readthedocs/restapi/views/model_views.py
In several cases, we can use the provided `request` rather than access `self` (which could make these functions easier to test in isolation). In others, the unused args could be folded into an unnamed kwarg param.
This worked as intended, but only because the overridden section variable would later evaluate to True. Using a different variable name makes this a bit less error-prone.
Fix linting problems with restapi application
This addresses no-else-return, which removes a `return` in an `else` after an `if` that already has a `return`. This makes the default return more obvious in most cases.
Conflicts: readthedocs/profiles/views.py readthedocs/restapi/client.py readthedocs/restapi/permissions.py readthedocs/restapi/serializers.py readthedocs/restapi/signals.py readthedocs/restapi/urls.py readthedocs/restapi/utils.py readthedocs/restapi/views/core_views.py readthedocs/restapi/views/footer_views.py readthedocs/restapi/views/integrations.py readthedocs/restapi/views/model_views.py readthedocs/restapi/views/search_views.py readthedocs/restapi/views/task_views.py requirements/lint.txt
Also, update travis and tox config for multiple versions of python
agjohnson
added
the
PR: work in progress
|
I think i got all the calls that future was overriding, but it might be a good idea to have @gthank look at the imports that were shuffled. The only thing I don't like about |
| include: | ||
| - python: 2.7 | ||
| env: TOXENV=docs | ||
| - python: 2.7 |
There was a problem hiding this comment.
Is lint different on 2 or 3, should we be linting both languages?
There was a problem hiding this comment.
Good question. I was going to say bump linting and docs steps up to py3 when our code is ready. I don't know if bumping up before then would yield any unwarranted effects or not from the code not being quiet py3 compatible.
agjohnson
removed
the
PR: work in progress
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This merges in #2863 and #2938, and fixes the rest of the linting problems introduced with #2819. Most of these errors with ordering of imports. The problem with using
future, and the includesbuiltinswithfuture, is that these both cause a number of linting problems. The standard library mocking needs to be at the bottom of the import block, otherwise all the following import statements are considered out of order.This work normalizes the import order to (mostly) follow pep8:
builtins, which is third party even though it overrides standard importsfuture, each import needs a# noqato avoid errors on not being able to find the import (as it's just monkey patched viafuture)This also updated our travis config to test with the correct Python version.
Most important here are the last of the commits to this branch, following d2599ba. The other work is available in other PRs.