Close files opened during testing

mdboom · mdboom · commit b0259b308de5 · 2013-06-10T22:19:04.000-04:00
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/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
 
