Able to produce simple_plot.py!!!

svn path=/branches/py3k/; revision=8561

Author: mdboom

examples/pylab_examples/simple_plot.py

@@ -8,4 +8,5 @@
 ylabel('voltage (mV)')
 title('About as simple as it gets, folks')
 grid(True)
+savefig("test.png")
 show()

lib/matplotlib/artist.py

@@ -485,7 +485,7 @@ def set_clip_path(self, path, transform=None):
         :class:`~matplotlib.transforms.Transform`) |
         :class:`~matplotlib.patches.Patch` | None ]
         """
-        from patches import Patch, Rectangle
+        from matplotlib.patches import Patch, Rectangle
 
         success = False
         if transform is None:

lib/matplotlib/axes.py

@@ -1,5 +1,5 @@
 from __future__ import division, generators
-import math, sys, warnings, datetime, new
+import math, sys, warnings, datetime
 from operator import itemgetter
 import itertools
 
@@ -8468,9 +8468,15 @@ def subplot_class_factory(axes_class=None):
 
     new_class = _subplot_classes.get(axes_class)
     if new_class is None:
-        new_class = new.classobj("%sSubplot" % (axes_class.__name__),
-                                 (SubplotBase, axes_class),
-                                 {'_axes_class': axes_class})
+        if sys.hexversion >= 0x03000000:
+            new_class = type("%sSubplot" % (axes_class.__name__),
+                             (SubplotBase, axes_class),
+                             {'_axes_class': axes_class})
+        else:
+            import new
+            new_class = new.classobj("%sSubplot" % (axes_class.__name__),
+                                     (SubplotBase, axes_class),
+                                     {'_axes_class': axes_class})
         _subplot_classes[axes_class] = new_class
 
     return new_class

lib/matplotlib/backends/backend_agg.py

@@ -35,7 +35,7 @@
 from matplotlib.path import Path
 from matplotlib.transforms import Bbox, BboxBase
 
-from _backend_agg import RendererAgg as _RendererAgg
+from matplotlib.backends._backend_agg import RendererAgg as _RendererAgg
 from matplotlib import _png
 
 backend_version = 'v2.2'
@@ -436,7 +436,7 @@ def print_raw(self, filename_or_obj, *args, **kwargs):
         original_dpi = renderer.dpi
         renderer.dpi = self.figure.dpi
         if is_string_like(filename_or_obj):
-            filename_or_obj = file(filename_or_obj, 'wb')
+            filename_or_obj = open(filename_or_obj, 'wb')
         renderer._renderer.write_rgba(filename_or_obj)
         renderer.dpi = original_dpi
     print_rgba = print_raw
@@ -447,7 +447,7 @@ def print_png(self, filename_or_obj, *args, **kwargs):
         original_dpi = renderer.dpi
         renderer.dpi = self.figure.dpi
         if is_string_like(filename_or_obj):
-            filename_or_obj = file(filename_or_obj, 'wb')
+            filename_or_obj = open(filename_or_obj, 'wb')
         _png.write_png(renderer._renderer.buffer_rgba(0, 0),
                        renderer.width, renderer.height,
                        filename_or_obj, self.figure.dpi)

lib/matplotlib/backends/tkagg.py

@@ -1,4 +1,4 @@
-import _tkagg
+from matplotlib import _tkagg
 import Tkinter as Tk
 
 def blit(photoimage, aggimage, bbox=None, colormode=1):

lib/matplotlib/docstring.py

@@ -1,29 +1,31 @@
 from matplotlib import cbook
+import sys
+import types
 
 class Substitution(object):
     """
     A decorator to take a function's docstring and perform string
     substitution on it.
-    
+
     This decorator should be robust even if func.__doc__ is None
     (for example, if -OO was passed to the interpreter)
-    
+
     Usage: construct a docstring.Substitution with a sequence or
     dictionary suitable for performing substitution; then
     decorate a suitable function with the constructed object. e.g.
-    
+
     sub_author_name = Substitution(author='Jason')
-    
+
     @sub_author_name
     def some_function(x):
         "%(author)s wrote this function"
-    
+
     # note that some_function.__doc__ is now "Jason wrote this function"
-    
+
     One can also use positional arguments.
-    
+
     sub_first_last_names = Substitution('Edgar Allen', 'Poe')
-    
+
     @sub_first_last_names
     def some_function(x):
         "%s %s wrote the Raven"
@@ -56,16 +58,16 @@ class Appender(object):
     """
     A function decorator that will append an addendum to the docstring
     of the target function.
-    
+
     This decorator should be robust even if func.__doc__ is None
     (for example, if -OO was passed to the interpreter).
-    
+
     Usage: construct a docstring.Appender with a string to be joined to
     the original docstring. An optional 'join' parameter may be supplied
     which will be used to join the docstring and addendum. e.g.
-    
+
     add_copyright = Appender("Copyright (c) 2009", join='\n')
-    
+
     @add_copyright
     def my_dog(has='fleas'):
         "This docstring will have a copyright below"
@@ -100,6 +102,8 @@ def do_copy(target):
 def dedent_interpd(func):
     """A special case of the interpd that first performs a dedent on
     the incoming docstring"""
+    if isinstance(func, types.MethodType) and sys.hexversion <= 0x03000000:
+        func = func.im_func
     return interpd(dedent(func))
 
 def copy_dedent(source):

lib/matplotlib/figure.py

@@ -17,7 +17,7 @@
 from artist import Artist, allow_rasterization
 from axes import Axes, SubplotBase, subplot_class_factory
 from cbook import flatten, allequal, Stack, iterable, is_string_like
-import _image
+from matplotlib import _image
 import colorbar as cbar
 from image import FigureImage
 from matplotlib import rcParams

lib/matplotlib/font_manager.py

@@ -235,13 +235,12 @@ def OSXFontDirectory():
     within them.
     """
     fontpaths = []
-    def add(arg,directory,files):
-        fontpaths.append(directory)
 
     for fontdir in OSXFontDirectories:
         try:
             if os.path.isdir(fontdir):
-                os.path.walk(fontdir, add, None)
+                for root, dirs, files in os.walk(fontdir):
+                    fontpaths.append(root)
         except (IOError, OSError, TypeError, ValueError):
             pass
     return fontpaths
@@ -274,13 +273,12 @@ def x11FontDirectory():
     within them.
     """
     fontpaths = []
-    def add(arg,directory,files):
-        fontpaths.append(directory)
 
     for fontdir in X11FontDirectories:
         try:
             if os.path.isdir(fontdir):
-                os.path.walk(fontdir, add, None)
+                for root, dirs, files in os.walk(fontdir):
+                    fontpaths.append(root)
         except (IOError, OSError, TypeError, ValueError):
             pass
     return fontpaths
@@ -304,6 +302,7 @@ def get_fontconfig_fonts(fontext='ttf'):
         return fontfiles
 
     if pipe.returncode == 0:
+        output = str(output)
         for line in output.split('\n'):
             fname = line.split(':')[0]
             if (os.path.splitext(fname)[1][1:] in fontext and
@@ -945,7 +944,8 @@ def pickle_dump(data, filename):
     Equivalent to pickle.dump(data, open(filename, 'w'))
     but closes the file to prevent filehandle leakage.
     """
-    fh = open(filename, 'w')
+    fh = open(filename, 'wb')
+    print data
     try:
         pickle.dump(data, fh)
     finally:
@@ -956,7 +956,7 @@ def pickle_load(filename):
     Equivalent to pickle.load(open(filename, 'r'))
     but closes the file to prevent filehandle leakage.
     """
-    fh = open(filename, 'r')
+    fh = open(filename, 'rb')
     try:
         data = pickle.load(fh)
     finally:
@@ -975,7 +975,7 @@ class FontManager:
     # Increment this version number whenever the font cache data
     # format or behavior has changed and requires a existing font
     # cache files to be rebuilt.
-    __version__ = 7
+    __version__ = 8
 
     def __init__(self, size=None, weight='normal'):
         self._version = self.__version__
@@ -1337,6 +1337,19 @@ def findfont(prop, fontext='ttf'):
         return result
 
 else:
+    if sys.hexversion >= 0x03000000:
+        _fmcache = os.path.join(get_configdir(), 'fontList.py3k.cache')
+    else:
+        _fmcache = os.path.join(get_configdir(), 'fontList.py3k.cache')
+
+    fontManager = None
+
+    def _rebuild():
+        global fontManager
+        fontManager = FontManager()
+        pickle_dump(fontManager, _fmcache)
+        verbose.report("generated new fontManager")
+
     try:
         fontManager = pickle_load(_fmcache)
         if (not hasattr(fontManager, '_version') or

lib/matplotlib/lines.py

@@ -1823,4 +1823,4 @@ def onpick(self, event):
 
 # You can not set the docstring of an instancemethod,
 # but you can on the underlying function.  Go figure.
-docstring.dedent_interpd(Line2D.__init__.im_func)
+docstring.dedent_interpd(Line2D.__init__)

lib/matplotlib/mlab.py

@@ -148,7 +148,6 @@
 ma = np.ma
 from matplotlib import verbose
 
-import matplotlib.nxutils as nxutils
 import matplotlib.cbook as cbook
 from matplotlib import docstring
 
@@ -2964,6 +2963,7 @@ def inside_poly(points, verts):
     Return value is a sequence of indices into points for the points
     that are inside the polygon.
     """
+    # PY3KTODO: Reimplement in terms of _path module
     res, =  np.nonzero(nxutils.points_inside_poly(points, verts))
     return res