Merge lp://qastaging/~jacekn/charm-helpers/python-six-fix into lp://qastaging/charm-helpers
Proposed by
Jacek Nykis
| Status: | Rejected |
|---|---|
| Rejected by: | Stuart Bishop |
| Proposed branch: | lp://qastaging/~jacekn/charm-helpers/python-six-fix |
| Merge into: | lp://qastaging/charm-helpers |
| Diff against target: |
93 lines (+21/-12) 3 files modified
charmhelpers/core/host.py (+11/-2) tests/contrib/charmsupport/test_nrpe.py (+9/-9) tests/core/test_strutils.py (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~jacekn/charm-helpers/python-six-fix |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Stuart Bishop (community) | Disapprove | ||
|
Review via email:
|
|||
Description of the change
Fix nrpe and strutils tests
Import six module only if needed. Install python{,3}-six if needed
To post a comment you must log in.
Unmerged revisions
- 385. By Jacek Nykis
-
fix if logic bug
- 384. By Jacek Nykis
-
Import six module only if needed. Install python{,3}-six if needed
- 383. By Jacek Nykis
-
Fix nrpe and strutils tests
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
six should now always be available, as it is bootstrapped by charmhelpers/