juju-deployer

Merge lp:~wgrant/juju-deployer/py3-oops into lp:juju-deployer

  1. py3-oops
  2. Merge into trunk
Proposed by William Grant
Status: Merged
Merged at revision: 205
Proposed branch: lp:~wgrant/juju-deployer/py3-oops
Merge into: lp:juju-deployer
Diff against target: 14 lines (+2/-2)
1 file modified
deployer/action/diff.py (+2/-2)
To merge this branch: bzr merge lp:~wgrant/juju-deployer/py3-oops
Reviewer Review Type Date Requested Status
Tim Van Steenburgh (community) Approve
Review via email: mp+313427@code.launchpad.net

Commit message

Fix Python 3 compatibility of r204.

Description of the change

Fix Python 3 compatibility of r204.

It turns out that forgetting to run tox is a problem.

To post a comment you must log in.
Revision history for this message
Tim Van Steenburgh (tvansteenburgh) wrote :

LGTM, thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'deployer/action/diff.py'
2--- deployer/action/diff.py 2016-12-14 10:33:11 +0000
3+++ deployer/action/diff.py 2016-12-16 11:05:51 +0000
4@@ -136,8 +136,8 @@
5 mod['cfg-constraints'] = dep_constraints
6
7 # Now collect all the options from both services and diff them.
8- all_options = set(dep_service.get('options', {}).keys() +
9- env_service.get('options', {}).keys())
10+ all_options = (set(dep_service.get('options', {}).keys()) |
11+ set(env_service.get('options', {}).keys()))
12 for key in all_options:
13 dep_value = dep_service.get('options', {}).get(key)
14 # Assume the charm default if the deployment specifies no value.

Subscribers

People subscribed via source and target branches