Merge lp:~elopio/canonical-identity-provider/fix1256365-python3 into lp:~canonical-isd-hackers/canonical-identity-provider/ssoclient

Proposed by Leo Arias
Status: Merged
Approved by: Ricardo Kirkner
Approved revision: 17
Merged at revision: 17
Proposed branch: lp:~elopio/canonical-identity-provider/fix1256365-python3
Merge into: lp:~canonical-isd-hackers/canonical-identity-provider/ssoclient
Diff against target: 12 lines (+1/-1)
1 file modified
ssoclient/v2/client.py (+1/-1)
To merge this branch: bzr merge lp:~elopio/canonical-identity-provider/fix1256365-python3
Reviewer Review Type Date Requested Status
Ricardo Kirkner (community) Approve
Review via email: mp+197233@code.launchpad.net

Commit message

Changed iteritems to items to make it compatible with py2 and py2.

To post a comment you must log in.
Revision history for this message
Ricardo Kirkner (ricardokirkner) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ssoclient/v2/client.py'
--- ssoclient/v2/client.py 2013-11-07 18:15:38 +0000
+++ ssoclient/v2/client.py 2013-11-29 16:08:36 +0000
@@ -27,7 +27,7 @@
27 """Recursively look for dates and try to parse them into datetimes."""27 """Recursively look for dates and try to parse them into datetimes."""
28 assert isinstance(value, dict)28 assert isinstance(value, dict)
29 result = value.copy()29 result = value.copy()
30 for k, v in value.iteritems():30 for k, v in value.items():
31 if isinstance(v, dict):31 if isinstance(v, dict):
32 result[k] = parse_datetimes(v)32 result[k] = parse_datetimes(v)
33 elif isinstance(v, list):33 elif isinstance(v, list):

Subscribers

People subscribed via source and target branches