Remove Python 2-only code #875
Merged
Conversation
This file contains 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
stephenfin
commented
Jun 7, 2020
| @@ -103,7 +102,7 @@ def __init__(cls, name, bases, clsdict): | |||
| cls._classinit() | |||
|
|
|||
|
|
|||
| class NodeHandler(with_metaclass(MetaHelper, object)): | |||
| class NodeHandler(metaclass=MetaHelper): | |||
There was a problem hiding this comment.
note: Yes, this is correct. You don't need to explicit subclass object in Python 3 as discussed here.
'logging.exception' will log the stacktrace of an exception automatically. You need to provide the message. In addition, all 'logging' calls require an argument. Resolve both issues. Signed-off-by: Stephen Finucane <stephen@that.guru>
The vendored 'rst2pdf.rson' module provides a number of factory methods. Many of these factory methods provide the ability to override Python builtins by passing arguments, e.g.: Tokenizer.factory(len=some_other_len_function) We weren't using any of this functionality, which means it's unnecessary complexity that should be removed. Do just that. Signed-off-by: Stephen Finucane <stephen@that.guru>
We not longer need to switch between unicode and str or basetring and str depending on whether we're Python 2 or Python 3 respectively. Just use 'str' everywhere. Signed-off-by: Stephen Finucane <stephen@that.guru>
This is unnecessary complexity now.
Each of these are the defaults in Python 3.x. Signed-off-by: Stephen Finucane <stephen@that.guru>
stephenfin
force-pushed
the
python3-ification
branch
from
8ff20d1
to
c264a6e
Compare
|
Resolved the conflicts due to the now-merged #841 |
akrabat
approved these changes
Jun 20, 2020
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 depends on #841. Remove six, unnecessary future imports, and code that is only used under the now-unsupported Python 2.7 environment.