Merge pull request matplotlib#565 from mdboom/py3-merge

The MEGA Python 3.x branch merge

Author: mdboom

INSTALL

@@ -54,12 +54,12 @@ Next, we need to get matplotlib installed.  We provide prebuilt
 binaries for OS X and Windows on the matplotlib `download
 <http://sourceforge.net/projects/matplotlib/files/>`_ page.  Click on
 the latest release of the "matplotlib" package, choose your python
-version (e.g., 2.6 or 2.7) and your platform (macosx or win32).
-If you have any problems, please check the :ref:`installing-faq`,
-search using Google, and/or post a question to the `mailing list
+version (2.6, 2.7 or 3.2) and your platform (macosx or win32).  If you
+have any problems, please check the :ref:`installing-faq`, search
+using Google, and/or post a question the `mailing list
 <http://sourceforge.net/project/showfiles.php?group_id=80706>`_.
 
-If you are on Debian/Ubuntu Linux, it suffices to do::
+If you are on Debian/Ubuntu linux, it suffices to do::
 
   > sudo apt-get install python-matplotlib
 

doc/devel/coding_guide.rst

@@ -365,11 +365,7 @@ Requirements
 
 The following software is required to run the tests:
 
-  - nose_, version 0.11.1 or later
-
-  - `Python Imaging Library
-    <http://www.pythonware.com/products/pil/>`_ (to compare image
-    results)
+  - nose_, version 1.0 or later
 
   - `Ghostscript <http://pages.cs.wisc.edu/~ghost/>`_ (to render PDF
     files)
@@ -405,6 +401,9 @@ arguments works from within Python::
 .. _`nosetest arguments`: http://somethingaboutorange.com/mrl/projects/nose/1.0.0/usage.html
 
 
+Running tests by any means other than `matplotlib.test()`
+does not load the nose "knownfailureif" (Known failing tests) plugin,
+causing known-failing tests to fail for real.
 
 Writing a simple test
 ---------------------

doc/make.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+
+from __future__ import print_function
 import fileinput
 import glob
 import os
@@ -169,7 +171,7 @@ def latex():
 
         os.chdir('../..')
     else:
-        print 'latex build has not been tested on windows'
+        print('latex build has not been tested on windows')
 
 def clean():
     shutil.rmtree("build", ignore_errors=True)

doc/pyplots/make.py

@@ -0,0 +1,75 @@
+#!/usr/bin/env python
+
+from __future__ import print_function
+import sys, os, glob
+import matplotlib
+import IPython.Shell
+#matplotlib.rcdefaults()
+matplotlib.use('Agg')
+
+mplshell = IPython.Shell.MatplotlibShell('mpl')
+
+formats = [('png', 100),
+           ('hires.png', 200),
+           ('pdf', 72)]
+
+def figs():
+    print('making figs')
+    import matplotlib.pyplot as plt
+    for fname in glob.glob('*.py'):
+        if fname.split('/')[-1] == __file__.split('/')[-1]: continue
+        basename, ext = os.path.splitext(fname)
+        imagefiles = dict([('%s.%s'%(basename, format), dpi)
+                           for format, dpi in formats])
+        all_exists = True
+        for imagefile in imagefiles:
+            if not os.path.exists(imagefile):
+                all_exists = False
+                break
+
+        if all_exists:
+            print('    already have %s'%fname)
+        else:
+            print('    building %s'%fname)
+            plt.close('all')    # we need to clear between runs
+            mplshell.magic_run(basename)
+            for imagefile, dpi in imagefiles.iteritems():
+                # todo: this will get called even if the run script
+                # fails and exits, thus creating a stub pdf and png
+                # iles preventing them from getting built successfully
+                # later
+                plt.savefig(imagefile, dpi=dpi)
+    print('all figures made')
+
+
+def clean():
+    patterns = (['#*', '*~', '*pyc'] +
+                ['*.%s' % format for format, dpi in formats])
+    for pattern in patterns:
+        for fname in glob.glob(pattern):
+            os.remove(fname)
+    print('all clean')
+
+
+
+def all():
+    figs()
+
+funcd = {'figs':figs,
+         'clean':clean,
+         'all':all,
+         }
+
+if len(sys.argv)>1:
+    for arg in sys.argv[1:]:
+        func = funcd.get(arg)
+        if func is None:
+            raise SystemExit('Do not know how to handle %s; valid args are'%(
+                    arg, funcd.keys()))
+        func()
+else:
+    all()
+
+
+
+

doc/sphinxext/gen_rst.py

@@ -1,6 +1,7 @@
 """
 generate the rst files for the examples by iterating over the pylab examples
 """
+from __future__ import print_function
 import os, glob
 
 import os
@@ -152,7 +153,7 @@ def generate_example_rst(app):
 
     fhindex.close()
 
-    print
+    print()
 
 def setup(app):
     app.connect('builder-inited', generate_example_rst)

doc/sphinxext/math_symbol_table.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 symbols = [
     ["Lower-case Greek",
      5,
@@ -141,7 +142,7 @@ def setup(app):
     # Do some verification of the tables
     from matplotlib import _mathtext_data
 
-    print "SYMBOLS NOT IN STIX:"
+    print("SYMBOLS NOT IN STIX:")
     all_symbols = {}
     for category, columns, syms in symbols:
         if category == "Standard Function Names":
@@ -151,9 +152,9 @@ def setup(app):
             if len(sym) > 1:
                 all_symbols[sym[1:]] = None
                 if sym[1:] not in _mathtext_data.tex2uni:
-                    print sym
+                    print(sym)
 
-    print "SYMBOLS NOT IN TABLE:"
+    print("SYMBOLS NOT IN TABLE:")
     for sym in _mathtext_data.tex2uni:
         if sym not in all_symbols:
-            print sym
+            print(sym)

doc/utils/pylab_names.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 """
 autogenerate some tables for pylab namespace
 """
@@ -14,7 +15,7 @@
     doc = getattr(o, '__doc__', None)
     if doc is not None:
         doc = ' - '.join([line for line in doc.split('\n') if line.strip()][:2])
-        
+
     mod = getattr(o, '__module__', None)
     if mod is None:
         mod = 'unknown'
@@ -25,7 +26,7 @@
                 k = ':class:`~%s.%s`'%(mod, k)
             else:
                 k = ':func:`~%s.%s`'%(mod, k)
-            mod = ':mod:`%s`'%mod            
+            mod = ':mod:`%s`'%mod
         elif mod.startswith('numpy'):
             #k = '`%s <%s>`_'%(k, 'http://scipy.org/Numpy_Example_List_With_Doc#%s'%k)
             k = '`%s <%s>`_'%(k, 'http://sd-2116.dedibox.fr/pydocweb/doc/%s.%s'%(mod, k))
@@ -40,21 +41,21 @@
 mods.sort()
 for mod in mods:
     border = '*'*len(mod)
-    print mod
-    print border
+    print(mod)
+    print(border)
 
-    print
+    print()
     funcs, docs = zip(*modd[mod])
     maxfunc = max([len(f) for f in funcs])
     maxdoc = max(40, max([len(d) for d in docs]) )
     border = ' '.join(['='*maxfunc, '='*maxdoc])
-    print border
-    print ' '.join(['symbol'.ljust(maxfunc), 'description'.ljust(maxdoc)])
-    print border
+    print(border)
+    print(' '.join(['symbol'.ljust(maxfunc), 'description'.ljust(maxdoc)]))
+    print(border)
     for func, doc in modd[mod]:
         row = ' '.join([func.ljust(maxfunc), doc.ljust(maxfunc)])
-        print row
+        print(row)
 
-    print border
-    print
+    print(border)
+    print()
     #break

examples/animation/old_animation/animate_decay_tk_blit.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 import time, sys
 import numpy as np
 import matplotlib.pyplot as plt
@@ -44,7 +45,7 @@ def run(*args):
 
         if run.cnt==1000:
             # print the timing info and quit
-            print 'FPS:' , 1000/(time.time()-tstart)
+            print('FPS:' , 1000/(time.time()-tstart))
             sys.exit()
 
         run.cnt += 1

examples/animation/old_animation/animation_blit_fltk.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 import sys
 import fltk
 import matplotlib
@@ -37,7 +38,7 @@ def update(self,ptr):
         self.cnt+=1
         if self.cnt==1000:
             # print the timing info and quit
-            print 'FPS:' , 1000/(time.time()-self.tstart)
+            print('FPS:' , 1000/(time.time()-self.tstart))
             sys.exit()
         return True
 

examples/animation/old_animation/animation_blit_gtk.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 
+from __future__ import print_function
+
 # For detailed comments on animation and the techniques used here, see
 # the wiki entry
 # http://www.scipy.org/wikis/topical_software/MatplotlibAnimation
@@ -30,7 +32,7 @@
 tstart = time.time()
 
 def update_line(*args):
-    print 'you are here', update_line.cnt
+    print('you are here', update_line.cnt)
     if update_line.background is None:
         update_line.background = canvas.copy_from_bbox(ax.bbox)
 
@@ -46,7 +48,7 @@ def update_line(*args):
 
     if update_line.cnt==1000:
         # print the timing info and quit
-        print 'FPS:' , 1000/(time.time()-tstart)
+        print('FPS:' , 1000/(time.time()-tstart))
         gtk.mainquit()
         raise SystemExit