OrderedDict instead of sorting

klaus · mdboom · commit 006f6ad82fcd · 2015-12-09T21:18:04.000-05:00
diff --git a/lib/matplotlib/backends/backend_svg.py b/lib/matplotlib/backends/backend_svg.py
@@ -6,6 +6,7 @@
 from matplotlib.externals.six import unichr
 
 import os, base64, tempfile, gzip, io, sys, codecs, re
+from collections import OrderedDict
 
 import numpy as np
 
@@ -263,15 +264,15 @@ def __init__(self, width, height, svgwriter, basename=None, image_dpi=72):
             assert basename is not None
             self.basename = basename
             self._imaged = {}
-        self._clipd = {}
+        self._clipd = OrderedDict()
         self._char_defs = {}
         self._markers = {}
         self._path_collection_id = 0
         self._imaged = {}
-        self._hatchd = {}
+        self._hatchd = OrderedDict()
         self._has_gouraud = False
         self._n_gradients = 0
-        self._fonts = {}
+        self._fonts = OrderedDict()
         self.mathtext_parser = MathTextParser('SVG')
 
         RendererBase.__init__(self)
@@ -1087,7 +1088,7 @@ def _draw_text_as_text(self, gc, x, y, s, prop, angle, ismath, mtext=None):
 
             # Sort the characters by font, and output one tspan for
             # each
-            spans = {}
+            spans = OrderedDict()
             for font, fontsize, thetext, new_x, new_y, metrics in svg_glyphs:
                 style = generate_css({
                     'font-size': six.text_type(fontsize) + 'px',
@@ -1103,7 +1104,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 list(six.iteritems(spans)):
+            for style, chars in six.iteritems(spans):
                 chars.sort()
 
                 same_y = True
diff --git a/lib/matplotlib/textpath.py b/lib/matplotlib/textpath.py
@@ -20,6 +20,7 @@
 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):
@@ -183,7 +184,7 @@ def get_glyphs_with_font(self, font, s, glyph_map=None,
             glyph_map = dict()
 
         if return_new_glyphs_only:
-            glyph_map_new = dict()
+            glyph_map_new = OrderedDict()
         else:
             glyph_map_new = glyph_map
 
