Make use of six iteration functions in more places.
Review Request #9738 — Created March 5, 2018 and submitted
While we're generally pretty good about using
had a few places where we weren't using them, and instead were calling
.items()directly, producing different
results on Python 2.x and 3.x. This change makes use of
locations, and documents one location where it appears we can use it but
actually can't due to the object type.
Unit tests pass (along with other changes) on Python 2.7, 3.4, 3.5, and 3.6.