Merge remote-tracking branch 'upstream/v1.3.x'

mdboom · mdboom · commit a87f5210c975 · 2013-06-11T13:01:33.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -23,4 +23,7 @@ script:
   # Travis VM to run out of memory (since so many copies of inkscape and
   # ghostscript are running at the same time).
   - echo Testing using 8 processes
+  # Generate the font caches in a single process before starting the
+  # multiple processes
+  - python -c "from matplotlib import font_manager"
   - python ../matplotlib/tests.py -sv --processes=8 --process-timeout=300
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -2863,6 +2863,18 @@ def press_pan(self, event):
 
     def press_zoom(self, event):
         """the press mouse button in zoom to rect mode callback"""
+        # If we're already in the middle of a zoom, pressing another
+        # button works to "cancel"
+        if self._ids_zoom != []:
+            for zoom_id in self._ids_zoom:
+                self.canvas.mpl_disconnect(zoom_id)
+            self.release(event)
+            self.draw()
+            self._xypress = None
+            self._button_pressed = None
+            self._ids_zoom = []
+            return
+
         if event.button == 1:
             self._button_pressed = 1
         elif event.button == 3:
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -284,7 +284,7 @@ def set_font(self, fontname, fontsize, store=1):
         if (fontname,fontsize) != (self.fontname,self.fontsize):
             out = ("/%s findfont\n"
                    "%1.3f scalefont\n"
-                   "setfont\n" % (fontname.decode('ascii'), fontsize))
+                   "setfont\n" % (fontname, fontsize))
 
             self._pswriter.write(out)
             if store: self.fontname = fontname
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -391,14 +391,14 @@ def ttfFontProperty(font):
     sfnt2 = sfnt.get((1,0,0,2))
     sfnt4 = sfnt.get((1,0,0,4))
     if sfnt2:
-        sfnt2 = sfnt2.lower()
+        sfnt2 = sfnt2.decode('ascii').lower()
     else:
         sfnt2 = ''
     if sfnt4:
-        sfnt4 = sfnt4.lower()
+        sfnt4 = sfnt4.decode('ascii').lower()
     else:
         sfnt4 = ''
-    if   sfnt4.find('oblique') >= 0:
+    if sfnt4.find('oblique') >= 0:
         style = 'oblique'
     elif sfnt4.find('italic') >= 0:
         style = 'italic'
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
@@ -271,8 +271,10 @@ def find_dotted_module(module_name, path=None):
             """A version of imp which can handle dots in the module name"""
             res = None
             for sub_mod in module_name.split('.'):
-                res = _, path, _ = imp.find_module(sub_mod, path)
+                res = file, path, _ = imp.find_module(sub_mod, path)
                 path = [path]
+                if file is not None:
+                    file.close()
             return res
 
         mod_file = find_dotted_module(func.__module__)[1]
diff --git a/lib/matplotlib/textpath.py b/lib/matplotlib/textpath.py
@@ -63,10 +63,9 @@ def _get_char_id(self, font, ccode):
         """
         sfnt = font.get_sfnt()
         try:
-            ps_name = sfnt[(1, 0, 0, 6)]
+            ps_name = sfnt[(1, 0, 0, 6)].decode('ascii')
         except KeyError:
-            ps_name = sfnt[(3, 1, 0x0409, 6)].decode(
-                'utf-16be').encode('ascii', 'replace')
+            ps_name = sfnt[(3, 1, 0x0409, 6)].decode('utf-16be')
         char_id = urllib.quote('%s-%x' % (ps_name, ccode))
         return char_id
 
