More miscellaneous print_function updates.

Author: mdboom

release/win32/data/setupwin.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 from distutils import cygwinccompiler
 
 try:

release/win32/data/setupwinegg.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 from distutils import cygwinccompiler
 
 try:

test/_buildbot_install.py

@@ -1,5 +1,6 @@
 """This script will install matplotlib to a virtual environment to
 faciltate testing."""
+from __future__ import print_function
 import shutil, os, sys
 from subprocess import Popen, PIPE, STDOUT
 from optparse import OptionParser

test/_buildbot_test.py

@@ -1,4 +1,5 @@
 """This script will test matplotlib in a virtual environment"""
+from __future__ import print_function
 import os, glob
 
 from _buildbot_util import check_call

test/_buildbot_test_postmortem.py

@@ -4,6 +4,7 @@
 
 This is meant to be run from the mplroot directory."""
 
+from __future__ import print_function
 import os, shutil
 
 roots = ['test_matplotlib','test_plots']
@@ -91,8 +92,8 @@ def path_split_all(fname):
             continue
         if not os.path.exists(expected_fname):
             continue
-        print fname
-        print absdiff_fname
+        print(fname)
+        print(absdiff_fname)
 
         teststr = os.path.splitext(fname)[0]
         this_targetdir = os.path.join(target_dir,teststr)

test/_buildbot_util.py

@@ -1,5 +1,6 @@
 """Module to help _buildbot_*.py scripts."""
 
+from __future__ import print_function
 import shutil, os, sys
 from subprocess import Popen, PIPE, STDOUT
 

unit/__init__.py

@@ -0,0 +1 @@
+from __future__ import print_function

unit/agg_memleak.py

@@ -2,6 +2,7 @@
 And another broken test...
 """
 
+from __future__ import print_function
 import sys, time, os
 from matplotlib.ft2font import FT2Font
 from numpy.random import rand
@@ -11,7 +12,7 @@
 def report_memory(i):
     pid = os.getpid()
     a2 = os.popen('ps -p %d -o rss,sz' % pid).readlines()
-    print i, '  ', a2[1],
+    print(i, '  ', a2[1], end='')
     return int(a2[1].split()[0])
 
 fname = '/usr/local/share/matplotlib/Vera.ttf'
@@ -52,7 +53,7 @@ def report_memory(i):
     if i==1: start = val
 
 end = val
-print 'Average memory consumed per loop: %1.4f\n' % ((end-start)/float(N))
+print('Average memory consumed per loop: %1.4f\n' % ((end-start)/float(N)))
 
 # w/o text and w/o write_png: Average memory consumed per loop: 0.02
 # w/o text and w/ write_png : Average memory consumed per loop: 0.3400

unit/auto_legend.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 from pylab import *
 import sys
 

unit/cbook_unit.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 import unittest
 from datetime import datetime