python3 migration #20
Open
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
Contributor
ThomasWaldmann
left a comment
ThomasWaldmann
left a comment
There was a problem hiding this comment.
thanks for the PR!
some stuff that 2to3 has done seems a bit superfluous though, see my comments.
some other stuff seems even wrong.
the .decode() stuff might be valid, but needs checking for py2 compat.
| """ | ||
|
|
||
| from __future__ import print_function | ||
|
|
Contributor
There was a problem hiding this comment.
does it still work on py2 with that?
Comment on lines
18
to
22
| try: | ||
| from ConfigParser import SafeConfigParser as ConfigParser, Error as ConfigParserError | ||
| from configparser import SafeConfigParser as ConfigParser, Error as ConfigParserError | ||
| except ImportError: | ||
| # Python 3 | ||
| from configparser import ConfigParser, Error as ConfigParserError |
Contributor
There was a problem hiding this comment.
that doesn't look correct.
the upper block is meant for python 2, so it should be ConfigParser.
if that import fails (e.g. because we are on py3), it is retried in the lower except block.
| 'MONTHS', 'MONTHS', 'YEARS', 'YEARS', 'FOREVER', 'FOREVER' | ||
| ) | ||
| LIFETIME_MAPPING = dict(zip(LIFETIME_CHOICES, LIFETIME_NAMES)) | ||
| LIFETIME_MAPPING = dict(list(zip(LIFETIME_CHOICES, LIFETIME_NAMES))) |
Contributor
There was a problem hiding this comment.
can you explain why this is needed?
| config = ConfigParser() | ||
| config.add_section('bepasty-client-cli') | ||
| for k, v in CONFIG_DEFAULTS.items(): | ||
| for k, v in list(CONFIG_DEFAULTS.items()): |
| raise click.UsageError('Error in configuration file: {}'.format(exc)) | ||
| ctx.default_map = dict() | ||
| for option in CONFIG_DEFAULTS.keys(): | ||
| for option in list(CONFIG_DEFAULTS.keys()): |
| ) | ||
| try: | ||
| for k, v in response.json().items(): | ||
| for k, v in list(response.json().items()): |
| if not ftype: | ||
| mime = magic.Magic(mime=True) | ||
| ftype = mime.from_buffer(first_chunk).decode() | ||
| ftype = mime.from_buffer(first_chunk) |
Contributor
There was a problem hiding this comment.
does it still work on py2 with that?
Contributor
|
@Marwe did you see my feedback? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Applied 2to3 and found a decode to remove, now it works here with python3
hopefully closes: #19
please review and look for other potential migration issues