commit 7c0bc6acf8793293e5ac3a5e4c6693af4dc8b51a
author Alice Wang <aliceywang@chromium.org> Thu Mar 25 09:06:36 2021
committer Commit Bot <commit-bot@chromium.org> Thu Mar 25 10:07:02 2021
tree 10186f2d199194988e95f41aebd1662bd4ddf064
parent 36e45025a81ac877509a444ce80a04f57544f50b

Revert "Do not use iteritems"

This reverts commit 7a3a7363a7c321684eb327d1b8aa536986a12ff8.

Reason for revert: The usage of the package six has caused failures on bot https://ci.chromium.org/p/chrome/builders/ci/orderfile-clankium since 2020-03-10 for missing six:

File "/b/swarming/w/ir/cache/builder/src/third_party/catapult/devil/devil/devil_env.py", line 20, in <module>
    import six
ImportError: No module named six

TBR=jbudorick@chromium.org

Original change's description:
> Do not use iteritems
>
> Use six.iteritems() instead
> Also fix a type error when write str to tmpfile in py3,
> as default mode will be 'wb'
>
> Bug: chromium:1185409
> Change-Id: I5c98611623fc4177d4c88c42924b6eacc9d36f44
> Reviewed-on: https://chromium-review.googlesource.com/c/catapult/+/2739660
> Reviewed-by: Ben Pastene <bpastene@chromium.org>
> Reviewed-by: Nate Fischer <ntfschr@chromium.org>
> Reviewed-by: Dirk Pranke <dpranke@google.com>
> Commit-Queue: Weizhong Xia <weizhong@google.com>

Bug: chromium:1185409
Change-Id: Ib33b28bc8a204d09a9646f3714da752982b937a3
Reviewed-on: https://chromium-review.googlesource.com/c/catapult/+/2786740
Reviewed-by: Alice Wang <aliceywang@chromium.org>
Commit-Queue: Alice Wang <aliceywang@chromium.org>