OrderedDict instead of sorting

klaus · klaus · commit 3289825038e7 · 2015-12-11T10:51:08.000+01:00
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -1,10 +1,11 @@
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals)
 
+from collections import OrderedDict
+
 from matplotlib.externals import six
 from matplotlib.externals.six.moves import xrange
 
-from collections import OrderedDict
 import itertools
 import warnings
 import math
@@ -17,7 +18,7 @@
 
 from matplotlib import cbook
 from matplotlib.cbook import (_check_1d, _string_to_bool, iterable,
-                              index_of, get_label, sorted_itervalues)
+                              index_of, get_label)
 from matplotlib import docstring
 import matplotlib.colors as mcolors
 import matplotlib.lines as mlines
@@ -3686,7 +3687,7 @@ def get_children(self):
         children.extend(self.lines)
         children.extend(self.texts)
         children.extend(self.artists)
-        children.extend(sorted_itervalues(self.spines))
+        children.extend(six.itervalues(self.spines))
         children.append(self.xaxis)
         children.append(self.yaxis)
         children.append(self.title)
diff --git a/lib/matplotlib/backends/backend_svg.py b/lib/matplotlib/backends/backend_svg.py
@@ -1,12 +1,13 @@
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals)
 
+from collections import OrderedDict
+
 from matplotlib.externals import six
 from matplotlib.externals.six.moves import xrange
 from matplotlib.externals.six import unichr
 
 import os, base64, tempfile, gzip, io, sys, codecs, re
-from collections import OrderedDict
 
 import numpy as np
 
@@ -17,8 +18,7 @@
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase,\
      FigureManagerBase, FigureCanvasBase
 from matplotlib.backends.backend_mixed import MixedModeRenderer
-from matplotlib.cbook import (is_string_like, is_writable_file_like, maxdict,
-                              sorted_iteritems, sorted_itervalues)
+from matplotlib.cbook import is_string_like, is_writable_file_like, maxdict
 from matplotlib.colors import rgb2hex
 from matplotlib.figure import Figure
 from matplotlib.font_manager import findfont, FontProperties, get_font
@@ -359,7 +359,7 @@ def _write_hatches(self):
         HATCH_SIZE = 72
         writer = self.writer
         writer.start('defs')
-        for ((path, face, stroke), oid) in sorted_itervalues(self._hatchd):
+        for ((path, face, stroke), oid) in six.itervalues(self._hatchd):
             writer.start(
                 'pattern',
                 id=oid,
@@ -470,7 +470,7 @@ def _write_clips(self):
             return
         writer = self.writer
         writer.start('defs')
-        for clip, oid in sorted_itervalues(self._clipd):
+        for clip, oid in six.itervalues(self._clipd):
             writer.start('clipPath', id=oid)
             if len(clip) == 2:
                 clippath, clippath_trans = clip
@@ -489,7 +489,7 @@ def _write_svgfonts(self):
 
         writer = self.writer
         writer.start('defs')
-        for font_fname, chars in sorted_iteritems(self._fonts):
+        for font_fname, chars in six.iteritems(self._fonts):
             font = get_font(font_fname)
             font.set_size(72, 72)
             sfnt = font.get_sfnt()
@@ -918,7 +918,7 @@ def _draw_text_as_path(self, gc, x, y, s, prop, angle, ismath, mtext=None):
 
             if glyph_map_new:
                 writer.start('defs')
-                for char_id, glyph_path in sorted_iteritems(glyph_map_new):
+                for char_id, glyph_path in six.iteritems(glyph_map_new):
                     path = Path(*glyph_path)
                     path_data = self._convert_path(path, simplify=False)
                     writer.element('path', id=char_id, d=path_data)
@@ -961,7 +961,7 @@ def _draw_text_as_path(self, gc, x, y, s, prop, angle, ismath, mtext=None):
             # used.
             if glyph_map_new:
                 writer.start('defs')
-                for char_id, glyph_path in sorted_iteritems(glyph_map_new):
+                for char_id, glyph_path in six.iteritems(glyph_map_new):
                     char_id = self._adjust_char_id(char_id)
                     # Some characters are blank
                     if not len(glyph_path[0]):
@@ -1105,7 +1105,7 @@ def _draw_text_as_text(self, gc, x, y, s, prop, angle, ismath, mtext=None):
                     fontset = self._fonts.setdefault(font.fname, set())
                     fontset.add(thetext)
 
-            for style, chars in sorted_iteritems(spans):
+            for style, chars in six.iteritems(spans):
                 chars.sort()
 
                 same_y = True
diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py
@@ -2491,17 +2491,3 @@ def __exit__(self, exc_type, exc_value, traceback):
                     os.rmdir(path)
                 except OSError:
                     pass
-
-
-def sorted_iteritems(a):
-    """
-    Iterate over the items of a dictionary in an order defined by the keys
-    """
-    return ((k,v) for k,v in sorted(six.iteritems(a)))
-
-
-def sorted_itervalues(a):
-    """
-    Iterate over the values of a dictionary in an order defined by the keys
-    """
-    return (v for k,v in sorted_iteritems(a))
diff --git a/lib/matplotlib/textpath.py b/lib/matplotlib/textpath.py
@@ -3,6 +3,8 @@
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals)
 
+from collections import OrderedDict
+
 from matplotlib.externals import six
 from matplotlib.externals.six.moves import zip
 
@@ -20,7 +22,6 @@
 from matplotlib.font_manager import FontProperties, get_font
 from matplotlib.transforms import Affine2D
 from matplotlib.externals.six.moves.urllib.parse import quote as urllib_quote
-from collections import OrderedDict
 
 
 class TextToPath(object):
