Merge ~mthaddon/juju-lint/+git/juju-lint:dict_keys into juju-lint:master

Proposed by Tom Haddon
Status: Merged
Approved by: Tom Haddon
Approved revision: dd02fc8e223d13b7415a01981b6ffdbbba381cf8
Merged at revision: 9add4fc663838e463de90b95fdbe931cdfb49f36
Proposed branch: ~mthaddon/juju-lint/+git/juju-lint:dict_keys
Merge into: juju-lint:master
Diff against target: 16 lines (+2/-2)
1 file modified
jujulint.py (+2/-2)
Reviewer Review Type Date Requested Status
Stuart Bishop (community) Approve
Review via email: mp+351342@code.launchpad.net

Commit message

dict.keys() doesn't return an indexable object in python3 - convert to list lp#1783732

Description of the change

dict.keys() doesn't return an indexable object in python3 - convert to list lp#1783732

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Stuart Bishop (stub) wrote :

Yup

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 9add4fc663838e463de90b95fdbe931cdfb49f36

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/jujulint.py b/jujulint.py
2index 10b889d..05d68b0 100755
3--- a/jujulint.py
4+++ b/jujulint.py
5@@ -203,10 +203,10 @@ def check_subs(model, lint_rules):
6 for app in model.apps_on_machines[machine]:
7 model.missing_subs[required_sub].add(app)
8
9- for sub in model.missing_subs.keys()[:]:
10+ for sub in list(model.missing_subs.keys()):
11 if not model.missing_subs[sub]:
12 del model.missing_subs[sub]
13- for sub in model.extraneous_subs.keys()[:]:
14+ for sub in list(model.extraneous_subs.keys()):
15 if not model.extraneous_subs[sub]:
16 del model.extraneous_subs[sub]
17

Subscribers

People subscribed via source and target branches