Use iteritems from six module

tonysyu · tonysyu · commit 7e2bffb3b24e · 2013-11-17T14:04:49.000-06:00
diff --git a/lib/matplotlib/style/core.py b/lib/matplotlib/style/core.py
@@ -137,7 +137,7 @@ def update_nested_dict(main_dict, new_dict):
     already exists. Instead you should update the sub-dict.
     """
     # update named styles specified by user
-    for name, rc_dict in new_dict.iteritems():
+    for name, rc_dict in six.iteritems(new_dict):
         if name in main_dict:
             main_dict[name].update(rc_dict)
         else:
diff --git a/lib/matplotlib/tests/test_style.py b/lib/matplotlib/tests/test_style.py
@@ -1,3 +1,6 @@
+from __future__ import (absolute_import, division, print_function,
+                        unicode_literals)
+
 import os
 import shutil
 import tempfile
@@ -7,6 +10,8 @@
 from matplotlib import style
 from matplotlib.style.core import USER_LIBRARY_PATHS, STYLE_EXTENSION
 
+import six
+
 
 PARAM = 'image.cmap'
 VALUE = 'pink'
@@ -22,7 +27,7 @@ def temp_style(style_name, settings=None):
     # Write style settings to file in the temp directory.
     tempdir = tempfile.mkdtemp()
     with open(os.path.join(tempdir, temp_file), 'w') as f:
-        for k, v in settings.iteritems():
+        for k, v in six.iteritems(settings):
             f.write('%s: %s' % (k, v))
 
     # Add temp directory to style path and reload so we can access this style.
