Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mgr: replace iteritems with six.iteritems #22870

Merged
merged 7 commits into from Jul 6, 2018
Merged

Conversation

smithfarm
Copy link
Contributor

@smithfarm smithfarm commented Jul 5, 2018

Fixes: http://tracker.ceph.com/issues/24779
Signed-off-by: Nathan Cutler ncutler@suse.com

@smithfarm smithfarm force-pushed the wip-24779 branch 2 times, most recently from 4a39068 to 76c987a Compare July 5, 2018 10:46
Copy link
Member

@wido wido left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good for Influx and Telegraf

@jcsp
Copy link
Contributor

jcsp commented Jul 5, 2018

As @tchaikov noticed that dashboard is already using six (even though we don't formally have the dependency), maybe we should use six here and make it official? At the point we're handling things like iteritems lots of places it seems worthwhile.

ceph-mgr already depends on six indirectly (via python-bcrypt's dependency), so this is not a big jump

@smithfarm smithfarm added DNM and removed needs-qa labels Jul 5, 2018
@smithfarm
Copy link
Contributor Author

@jcsp OK, I'll limit the PR to src/pybind/mgr and use six everywhere.

@smithfarm smithfarm changed the title pybind: treat iteritems for py3 compatibility mgr: replace iteritems with six.iteritems Jul 5, 2018
@smithfarm
Copy link
Contributor Author

@jcsp Migration to six complete: please have a look?

@liewegas liewegas merged commit 093562f into ceph:master Jul 6, 2018
liewegas added a commit that referenced this pull request Jul 6, 2018
* refs/pull/22870/head:
	mgr: replace iteritems with six.iteritems (mgr_module.py)
	mgr: replace iteritems with six.iteritems (crash)
	mgr: replace iteritems with six.iteritems (telegraf)
	mgr: replace iteritems with six.iteritems (status)
	mgr: replace iteritems with six.iteritems (restful)
	mgr: replace iteritems with six.iteritems (influx)
	mgr: replace iteritems with six.iteritems (balancer)

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Wido den Hollander <wido@42on.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
@smithfarm smithfarm deleted the wip-24779 branch July 6, 2018 20:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants