Move Opstool to python 3 #61
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
costimuraru
force-pushed
the
python3
branch
7 times, most recently
from
0ac2eb0 to
d642cbe
Compare
serban21
reviewed
Aug 26, 2019
src/ops/python_compat.py
Outdated
| @@ -0,0 +1,24 @@ | |||
| # Copyright 2019 Adobe. All rights reserved. | |||
Contributor
There was a problem hiding this comment.
Why not use six (https://six.readthedocs.io/) for compatibility?
serban21
reviewed
Aug 26, 2019
src/ops/cli/inventory.py
Outdated
| def get_host_facts(self, host, indent="\t"): | ||
| vars = host.get_vars() | ||
| vars = {unicode(key): var for key, var in vars.items()} # the yaml dumper doesn't handle mixed keys encoding | ||
| vars = {str(key): var for key, var in vars.items()} # the yaml dumper doesn't handle mixed keys encoding |
Contributor
There was a problem hiding this comment.
This entire line might not be needed at all. We could test that, or at least add a TODO
serban21
reviewed
Aug 26, 2019
costimuraru
force-pushed
the
python3
branch
2 times, most recently
from
499f0a6 to
f18aa1e
Compare
print unicode fixes Signed-off-by: costimuraru <costimuraru@gmail.com> fix inventory sorting Signed-off-by: costimuraru <costimuraru@gmail.com> publish Signed-off-by: costimuraru <costimuraru@gmail.com> Use python3 docker image Signed-off-by: costimuraru <costimuraru@gmail.com> Add patch version test Signed-off-by: costimuraru <costimuraru@gmail.com> Add patch version [RELEASE] - Release version 1.9.3 Fix travia Fix Signed-off-by: costimuraru <costimuraru@gmail.com> Python3 fixes Fix tests for python3 Fix version check Signed-off-by: costimuraru <costimuraru@gmail.com> [RELEASE] - Release version 1.9.4 Upgrade ops-cli Use six for python3 compat check Implement feedback Show docker build command Signed-off-by: costimuraru <costimuraru@gmail.com>
complexsplit
approved these changes
Aug 27, 2019
dancb10
reviewed
Aug 27, 2019
| elif isinstance(value, str): # Python 2 str, check if it can be represented in utf8 | ||
| value.encode('utf-8') | ||
| except UnicodeDecodeError as e: | ||
| print 'Invalid character in argument "{0}", most likely an "en dash", replace it with normal dash -'.format( |
There was a problem hiding this comment.
[not important] Maybe we can add an automatic replacement .replace(u'\u2014', '-', inplace=True) to skip this exception? Check if argument contains en dash and replace with with normal dash. Thus the user doesn't need to retype the command and change it's arguments
dancb10
reviewed
Aug 27, 2019
dancb10
reviewed
Aug 27, 2019
dancb10
approved these changes
Aug 27, 2019
Signed-off-by: costimuraru <costimuraru@gmail.com>
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.
Fixes #1