Merge lp:~chris.macnaughton/mojo/py3002 into lp:~ost-maintainers/mojo/py3
Status: | Merged |
---|---|
Approved by: | Ryan Beisner on 2018-01-26 |
Approved revision: | 474 |
Merged at revision: | 465 |
Proposed branch: | lp:~chris.macnaughton/mojo/py3002 |
Merge into: | lp:~ost-maintainers/mojo/py3 |
Diff against target: |
337 lines (+71/-33) 9 files modified
contrib/test/utils.py (+1/-1) mojo/cli.py (+13/-15) mojo/juju/status.py (+3/-1) mojo/juju/wait.py (+3/-0) mojo/phase.py (+4/-1) mojo/tests/test_juju2.py (+19/-9) mojo/utils.py (+3/-0) setup.py (+1/-0) tox.ini (+24/-6) |
To merge this branch: | bzr merge lp:~chris.macnaughton/mojo/py3002 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenStack Charm Testing Maintainers | 2018-01-19 | Pending | |
Review via email:
|
- 470. By Chris MacNaughton on 2018-01-22
-
add list() back around map() to make it work on py2+3
Not quite py3 ready:
2018-01-24 11:10:49 [INFO] Rsyncing /home/ubuntu/
2018-01-24 11:10:50 [INFO] Retrieve the spec's manifest
2018-01-24 11:10:50 [INFO] Manifest comment:
#######
Collect the charm branches from Launchpad
#######
2018-01-24 11:10:50 [INFO] Building resource tree
2018-01-24 11:10:50 [ERROR] Unknown error
Traceback (most recent call last):
File "/home/
args.func(args)
File "/home/
return method(*args, **kwargs)
File "/home/
manifest.
File "/home/
auto_
File "/home/
rendered_
File "/home/
return func(*args, **kwargs)
TypeError: a bytes-like object is required, not 'str'
- 471. By Chris MacNaughton on 2018-01-25
-
decode bytes to str
- 472. By Chris MacNaughton on 2018-01-25
-
import six
- 473. By Chris MacNaughton on 2018-01-25
-
add encoding to popen
- 474. By Chris MacNaughton on 2018-01-25
-
ensure we decode command line output if needed
Ok, have run the openstack-
Have confirmed with a basic mojo run that this works on py2 still, commencing a test on py3