Iterating over a dict is easy.

anntzer · anntzer · commit 7a83fc426f68 · 2016-12-21T11:52:44.000+01:00
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1894,4 +1894,4 @@ def inner(ax, *args, **kwargs):
 verbose.report('verbose.level %s' % verbose.level)
 verbose.report('interactive is %s' % is_interactive())
 verbose.report('platform is %s' % sys.platform)
-verbose.report('loaded modules: %s' % six.iterkeys(sys.modules), 'debug')
+verbose.report('loaded modules: %s' % list(sys.modules), 'debug')
diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py
@@ -1317,12 +1317,8 @@ def pprint_getters(self):
         Return the getters and actual values as list of strings.
         """
 
-        d = self.properties()
-        names = list(six.iterkeys(d))
-        names.sort()
         lines = []
-        for name in names:
-            val = d[name]
+        for name, val in sorted(six.iteritems(self.properties())):
             if getattr(val, 'shape', ()) != () and len(val) > 6:
                 s = str(val[:6]) + '...'
             else:
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -1332,12 +1332,11 @@ def set_anchor(self, anchor):
           =====  ============
 
         """
-        if (anchor in list(six.iterkeys(mtransforms.Bbox.coefs)) or
-                len(anchor) == 2):
+        if anchor in mtransforms.Bbox.coefs or len(anchor) == 2:
             self._anchor = anchor
         else:
             raise ValueError('argument must be among %s' %
-                             ', '.join(six.iterkeys(mtransforms.Bbox.coefs)))
+                             ', '.join(mtransforms.Bbox.coefs))
         self.stale = True
 
     def get_data_ratio(self):
@@ -2877,8 +2876,7 @@ def set_xlim(self, left=None, right=None, emit=True, auto=False, **kw):
         if 'xmax' in kw:
             right = kw.pop('xmax')
         if kw:
-            raise ValueError("unrecognized kwargs: %s" %
-                             list(six.iterkeys(kw)))
+            raise ValueError("unrecognized kwargs: %s" % list(kw))
 
         if right is None and iterable(left):
             left, right = left
@@ -3158,8 +3156,7 @@ def set_ylim(self, bottom=None, top=None, emit=True, auto=False, **kw):
         if 'ymax' in kw:
             top = kw.pop('ymax')
         if kw:
-            raise ValueError("unrecognized kwargs: %s" %
-                             list(six.iterkeys(kw)))
+            raise ValueError("unrecognized kwargs: %s" % list(kw))
 
         if top is None and iterable(bottom):
             bottom, top = bottom
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -1533,7 +1533,7 @@ def is_date(x):
                     'CreationDate': is_date,
                     'ModDate': is_date,
                     'Trapped': check_trapped}
-        for k in six.iterkeys(self.infoDict):
+        for k in self.infoDict:
             if k not in keywords:
                 warnings.warn('Unknown infodict keyword: %s' % k)
             else:
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -958,8 +958,8 @@ def _print_ps(self, outfile, format, *args, **kwargs):
         if papertype == 'auto':
             pass
         elif papertype not in papersize:
-            raise RuntimeError( '%s is not a valid papertype. Use one \
-                    of %s'% (papertype, ', '.join(six.iterkeys(papersize))))
+            raise RuntimeError('%s is not a valid papertype. Use one of %s' %
+                               (papertype, ', '.join(papersize)))
 
         orientation = kwargs.pop("orientation", "portrait").lower()
         if orientation == 'landscape': isLandscape = True
diff --git a/lib/matplotlib/backends/backend_svg.py b/lib/matplotlib/backends/backend_svg.py
@@ -593,10 +593,8 @@ def draw_markers(self, gc, marker_path, marker_trans, path, trans, rgbFace=None)
         style = self._get_style_dict(gc, rgbFace)
         dictkey = (path_data, generate_css(style))
         oid = self._markers.get(dictkey)
-        for key in list(six.iterkeys(style)):
-            if not key.startswith('stroke'):
-                del style[key]
-        style = generate_css(style)
+        style = generate_css({k: v for k, v in six.iteritems(style)
+                              if k.startswith('stroke')})
 
         if oid is None:
             oid = self._make_id('m', dictkey)
diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py
@@ -668,10 +668,8 @@ def __init__(self, **kwds):
         self.__dict__.update(kwds)
 
     def __repr__(self):
-        keys = six.iterkeys(self.__dict__)
-        return 'Bunch(%s)' % ', '.join(['%s=%s' % (k, self.__dict__[k])
-                                        for k
-                                        in keys])
+        return 'Bunch(%s)' % ', '.join(
+            '%s=%s' % kv for kv in six.iteritems(vars(self)))
 
 
 @deprecated('2.1')
@@ -940,7 +938,7 @@ class Xlator(dict):
 
     def _make_regex(self):
         """ Build re object based on the keys of the current dictionary """
-        return re.compile("|".join(map(re.escape, list(six.iterkeys(self)))))
+        return re.compile("|".join(map(re.escape, self)))
 
     def __call__(self, match):
         """ Handler invoked for each regex *match* """
diff --git a/lib/matplotlib/cm.py b/lib/matplotlib/cm.py
@@ -86,16 +86,13 @@ def _generate_cmap(name, lutsize):
 with _warnings.catch_warnings():
     _warnings.simplefilter("ignore")
     # Generate the reversed specifications ...
-    for cmapname in list(six.iterkeys(datad)):
-        spec = datad[cmapname]
-        spec_reversed = _reverse_cmap_spec(spec)
-        datad[cmapname + '_r'] = spec_reversed
+    for cmapname, spec in list(six.iteritems(datad)):
+        datad[cmapname + '_r'] = _reverse_cmap_spec(spec)
 
     # Precache the cmaps with ``lutsize = LUTSIZE`` ...
 
-    # Use datad.keys() to also add the reversed ones added in the section
-    # above:
-    for cmapname in six.iterkeys(datad):
+    # Also add the reversed ones added in the section above:
+    for cmapname in datad:
         cmap_d[cmapname] = _generate_cmap(cmapname, LUTSIZE)
 
 cmap_d.update(cmaps_listed)
diff --git a/lib/matplotlib/dviread.py b/lib/matplotlib/dviread.py
@@ -532,7 +532,7 @@ def __init__(self, scale, tfm, texname, vf):
             scale, tfm, texname, vf
         self.size = scale * (72.0 / (72.27 * 2**16))
         try:
-            nchars = max(six.iterkeys(tfm.width)) + 1
+            nchars = max(tfm.width) + 1
         except ValueError:
             nchars = 0
         self.widths = [(1000*tfm.width.get(char, 0)) >> 20
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -247,7 +247,7 @@ def win32InstalledFonts(directory=None, fontext='ttf'):
                     continue
                 except MemoryError:
                     continue
-            return list(six.iterkeys(items))
+            return list(items)
         finally:
             winreg.CloseKey(local)
     return None
@@ -439,11 +439,7 @@ def ttfFontProperty(font):
     #    600 (semibold, demibold), 700 (bold), 800 (heavy), 900 (black)
     #    lighter and bolder are also allowed.
 
-    weight = None
-    for w in six.iterkeys(weight_dict):
-        if sfnt4.find(w) >= 0:
-            weight = w
-            break
+    weight = next((w for w in weight_dict if sfnt4.find(w) >= 0), None)
     if not weight:
         if font.style_flags & ft2font.BOLD:
             weight = 700
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -56,7 +56,7 @@
     'blackman': _image.BLACKMAN,
 }
 
-interpolations_names = set(six.iterkeys(_interpd_))
+interpolations_names = set(_interpd_)
 
 
 def composite_images(images, renderer, magnification=1.0):
@@ -1224,7 +1224,7 @@ def pilread(fname):
         if im is None:
             raise ValueError('Only know how to handle extensions: %s; '
                              'with Pillow installed matplotlib can handle '
-                             'more images' % list(six.iterkeys(handlers)))
+                             'more images' % list(handlers))
         return im
 
     handler = handlers[ext]
diff --git a/lib/matplotlib/legend.py b/lib/matplotlib/legend.py
@@ -323,15 +323,13 @@ def __init__(self, parent, handles, labels,
                 if self.isaxes:
                     warnings.warn('Unrecognized location "%s". Falling back '
                                   'on "best"; valid locations are\n\t%s\n'
-                                  % (loc, '\n\t'.join(
-                                    six.iterkeys(self.codes))))
+                                  % (loc, '\n\t'.join(self.codes)))
                     loc = 0
                 else:
                     warnings.warn('Unrecognized location "%s". Falling back '
                                   'on "upper right"; '
                                   'valid locations are\n\t%s\n'
-                                  % (loc, '\n\t'.join(
-                                    six.iterkeys(self.codes))))
+                                  % (loc, '\n\t'.join(self.codes)))
                     loc = 1
             else:
                 loc = self.codes[loc]
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -264,8 +264,7 @@ class Line2D(Artist):
     drawStyles.update(_drawStyles_l)
     drawStyles.update(_drawStyles_s)
     # Need a list ordered with long names first:
-    drawStyleKeys = (list(six.iterkeys(_drawStyles_l)) +
-                     list(six.iterkeys(_drawStyles_s)))
+    drawStyleKeys = list(_drawStyles_l) + list(_drawStyles_s)
 
     # Referenced here to maintain API.  These are defined in
     # MarkerStyle
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -2358,7 +2358,7 @@ def __init__(self):
         p.rbracket      <<= Literal(']').suppress()
         p.bslash        <<= Literal('\\')
 
-        p.space         <<= oneOf(list(six.iterkeys(self._space_widths)))
+        p.space         <<= oneOf(list(self._space_widths))
         p.customspace   <<= (Suppress(Literal(r'\hspace'))
                           - ((p.lbrace + p.float_literal + p.rbrace)
                             | Error(r"Expected \hspace{n}")))
@@ -2367,17 +2367,17 @@ def __init__(self):
         p.single_symbol <<= Regex(r"([a-zA-Z0-9 +\-*/<>=:,.;!\?&'@()\[\]|%s])|(\\[%%${}\[\]_|])" %
                                unicode_range)
         p.snowflake     <<= Suppress(p.bslash) + oneOf(self._snowflake)
-        p.symbol_name   <<= (Combine(p.bslash + oneOf(list(six.iterkeys(tex2uni)))) +
+        p.symbol_name   <<= (Combine(p.bslash + oneOf(list(tex2uni))) +
                           FollowedBy(Regex("[^A-Za-z]").leaveWhitespace() | StringEnd()))
         p.symbol        <<= (p.single_symbol | p.symbol_name).leaveWhitespace()
 
         p.apostrophe    <<= Regex("'+")
 
-        p.c_over_c      <<= Suppress(p.bslash) + oneOf(list(six.iterkeys(self._char_over_chars)))
+        p.c_over_c      <<= Suppress(p.bslash) + oneOf(list(self._char_over_chars))
 
         p.accent        <<= Group(
                              Suppress(p.bslash)
-                           + oneOf(list(six.iterkeys(self._accent_map)) + list(self._wide_accents))
+                           + oneOf(list(self._accent_map) + list(self._wide_accents))
                            - p.placeable
                          )
 
diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py
@@ -2572,7 +2572,7 @@ def mapped_r2field(name):
 
     if jointype != 'inner' and defaults is not None:
         # fill in the defaults enmasse
-        newrec_fields = list(six.iterkeys(newrec.dtype.fields))
+        newrec_fields = list(newrec.dtype.fields)
         for k, v in six.iteritems(defaults):
             if k in newrec_fields:
                 newrec[k] = v
diff --git a/lib/matplotlib/offsetbox.py b/lib/matplotlib/offsetbox.py
@@ -1236,20 +1236,16 @@ def __init__(self, s, loc, pad=0.4, borderpad=0.5, prop=None, **kwargs):
 
         if prop is None:
             prop = {}
-        propkeys = list(six.iterkeys(prop))
-        badkwargs = ('ha', 'horizontalalignment', 'va', 'verticalalignment')
-        if set(badkwargs) & set(propkeys):
+        badkwargs = {'ha', 'horizontalalignment', 'va', 'verticalalignment'}
+        if badkwargs & set(prop):
             warnings.warn("Mixing horizontalalignment or verticalalignment "
-                    "with AnchoredText is not supported.")
+                          "with AnchoredText is not supported.")
 
-        self.txt = TextArea(s, textprops=prop,
-                            minimumdescent=False)
+        self.txt = TextArea(s, textprops=prop, minimumdescent=False)
         fp = self.txt._text.get_fontproperties()
-
-        super(AnchoredText, self).__init__(loc, pad=pad, borderpad=borderpad,
-                                           child=self.txt,
-                                           prop=fp,
-                                           **kwargs)
+        super(AnchoredText, self).__init__(
+            loc, pad=pad, borderpad=borderpad, child=self.txt, prop=fp,
+            **kwargs)
 
 
 class OffsetImage(OffsetBox):
diff --git a/lib/matplotlib/path.py b/lib/matplotlib/path.py
@@ -203,9 +203,7 @@ def _fast_from_codes_and_verts(cls, verts, codes, internals=None):
         if internals:
             raise ValueError('Unexpected internals provided to '
                              '_fast_from_codes_and_verts: '
-                             '{0}'.format('\n *'.join(six.iterkeys(
-                                 internals
-                             ))))
+                             '{0}'.format('\n *'.join(internals)))
         return pth
 
     def _update_values(self):
diff --git a/lib/matplotlib/table.py b/lib/matplotlib/table.py
@@ -256,7 +256,7 @@ def __init__(self, ax, loc=None, bbox=None, **kwargs):
         if is_string_like(loc) and loc not in self.codes:
             warnings.warn('Unrecognized location %s. Falling back on '
                           'bottom; valid locations are\n%s\t' %
-                          (loc, '\n\t'.join(six.iterkeys(self.codes))))
+                          (loc, '\n\t'.join(self.codes)))
             loc = 'bottom'
         if is_string_like(loc):
             loc = self.codes.get(loc, 1)
@@ -328,8 +328,7 @@ def _get_grid_bbox(self, renderer):
 
         Only include those in the range (0,0) to (maxRow, maxCol)"""
         boxes = [self._cells[pos].get_window_extent(renderer)
-                 for pos in six.iterkeys(self._cells)
-                 if pos[0] >= 0 and pos[1] >= 0]
+                 for pos in self._cells if pos[0] >= 0 and pos[1] >= 0]
 
         bbox = Bbox.union(boxes)
         return bbox.inverse_transformed(self.get_transform())
@@ -346,9 +345,9 @@ def contains(self, mouseevent):
         # doesn't have to bind to each one individually.
         renderer = self.figure._cachedRenderer
         if renderer is not None:
-            boxes = [self._cells[pos].get_window_extent(renderer)
-                     for pos in six.iterkeys(self._cells)
-                     if pos[0] >= 0 and pos[1] >= 0]
+            boxes = [cell.get_window_extent(renderer)
+                     for (row, col), cell in six.iteritems(self._cells)
+                     if row >= 0 and col >= 0]
             bbox = Bbox.union(boxes)
             return bbox.contains(mouseevent.x, mouseevent.y), {}
         else:
diff --git a/lib/matplotlib/testing/compare.py b/lib/matplotlib/testing/compare.py
@@ -157,7 +157,7 @@ def comparable_formats():
     on this system.
 
     """
-    return ['png'] + list(six.iterkeys(converter))
+    return ['png'] + list(converter)
 
 
 def convert(filename, cache):
diff --git a/lib/matplotlib/tests/test_colors.py b/lib/matplotlib/tests/test_colors.py
@@ -624,7 +624,7 @@ def test_pandas_iterable():
 def test_colormap_reversing():
     """Check the generated _lut data of a colormap and corresponding
     reversed colormap if they are almost the same."""
-    for name in six.iterkeys(cm.cmap_d):
+    for name in cm.cmap_d:
         cmap = plt.get_cmap(name)
         cmap_r = cmap.reversed()
         if not cmap_r._isinit:
diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py
@@ -113,7 +113,7 @@ def test_RcParams_class():
 
     # test the find_all functionality
     assert ['font.cursive', 'font.size'] == sorted(rc.find_all('i[vz]').keys())
-    assert ['font.family'] == list(six.iterkeys(rc.find_all('family')))
+    assert ['font.family'] == list(rc.find_all('family'))
 
 
 def test_rcparams_update():
@@ -153,7 +153,7 @@ def test_Bug_2543():
                                 category=UserWarning)
         with mpl.rc_context():
             _copy = mpl.rcParams.copy()
-            for key in six.iterkeys(_copy):
+            for key in _copy:
                 mpl.rcParams[key] = _copy[key]
             mpl.rcParams['text.dvipnghack'] = None
         with mpl.rc_context():
