Merged revisions 8841-8842 via svnmerge from

mdboom · mdboom · commit 6a8d05c2c80a · 2010-12-17T18:27:11.000Z
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint ........ r8841 | mdboom | 2010-12-14 12:37:42 -0500 (Tue, 14 Dec 2010) | 2 lines [3137172] Fix cyclical import problem. ........ r8842 | mdboom | 2010-12-17 12:57:59 -0500 (Fri, 17 Dec 2010) | 1 line Fix Unicode encoding error saving SVGs with Unicode characters on some platforms ........ svn path=/trunk/matplotlib/; revision=8843
diff --git a/lib/matplotlib/backends/backend_svg.py b/lib/matplotlib/backends/backend_svg.py
@@ -860,7 +860,7 @@ def print_svg(self, filename, *args, **kwargs):
         if is_string_like(filename):
             fh_to_close = svgwriter = codecs.open(filename, 'w', 'utf-8')
         elif is_writable_file_like(filename):
-            svgwriter = codecs.EncodedFile(filename, 'utf-8')
+            svgwriter = codecs.getwriter('utf-8')(filename)
             fh_to_close = None
         else:
             raise ValueError("filename must be a path or a file-like object")
@@ -869,10 +869,10 @@ def print_svg(self, filename, *args, **kwargs):
     def print_svgz(self, filename, *args, **kwargs):
         if is_string_like(filename):
             gzipwriter = gzip.GzipFile(filename, 'w')
-            fh_to_close = svgwriter = codecs.EncodedFile(gzipwriter, 'utf-8')
+            fh_to_close = svgwriter = codecs.getwriter('utf-8')(gzipwriter)
         elif is_writable_file_like(filename):
             fh_to_close = gzipwriter = gzip.GzipFile(fileobj=filename, mode='w')
-            svgwriter = codecs.EncodedFile(gzipwriter, 'utf-8')
+            svgwriter = codecs.getwriter('utf-8')(gzipwriter)
         else:
             raise ValueError("filename must be a path or a file-like object")
         return self._print_svg(filename, svgwriter, fh_to_close)
diff --git a/lib/matplotlib/tri/triplot.py b/lib/matplotlib/tri/triplot.py
@@ -1,4 +1,3 @@
-import matplotlib.axes
 from matplotlib.cbook import ls_mapper
 from matplotlib.patches import PathPatch
 from matplotlib.path import Path
@@ -39,6 +38,8 @@ def triplot(ax, *args, **kwargs):
 
         .. plot:: mpl_examples/pylab_examples/triplot_demo.py
     """
+    import matplotlib.axes
+
     tri, args, kwargs = Triangulation.get_from_args_and_kwargs(*args, **kwargs)
 
     x = tri.x
