minor modifications to make more py3 friendly

Author: leejjoon

lib/matplotlib/tight_layout.py

@@ -10,6 +10,8 @@
 
 """
 
+import warnings
+
 import matplotlib
 from matplotlib.transforms import TransformedBbox, Bbox
 
@@ -44,7 +46,7 @@ def auto_adjust_subplotpars(fig, renderer,
     information of subplot itself, but uses what is given by
     *nrows_ncols* and *num1num2_list* parameteres. Also, the results could be
     incorrect if some subplots have ``adjustable=datalim``.
-    
+
     Parameters:
 
     nrows_ncols
@@ -80,7 +82,7 @@ def auto_adjust_subplotpars(fig, renderer,
         hpad_inches = w_pad * FontProperties(size=rcParams["font.size"]).get_size_in_points() / renderer.dpi
     else:
         hpad_inches = pad_inches
-        
+
 
     if len(subplot_list) == 0:
         raise RuntimeError("")
@@ -96,18 +98,18 @@ def auto_adjust_subplotpars(fig, renderer,
         else: margin_right = None
         if _top: margin_top = 1. - _top
         else: margin_top = None
-        
+
     vspaces = [[] for i in range((rows+1)*cols)]
     hspaces = [[] for i in range(rows*(cols+1))]
-    
+
     union = Bbox.union
 
     if ax_bbox_list is None:
         ax_bbox_list = []
         for subplots in subplot_list:
             ax_bbox = union([ax.get_position(original=True) for ax in subplots])
             ax_bbox_list.append(ax_bbox)
-        
+
     for subplots, ax_bbox, (num1, num2) in zip(subplot_list,
                                                ax_bbox_list,
                                                num1num2_list):
@@ -132,7 +134,7 @@ def auto_adjust_subplotpars(fig, renderer,
 
         else:
             row2, col2 = divmod(num2, cols)
-        
+
             for row_i in range(row1, row2+1):
                 # left
                 hspaces[row_i * (cols+1) + col1].append(_get_left(tight_bbox, ax_bbox))
@@ -153,7 +155,7 @@ def auto_adjust_subplotpars(fig, renderer,
     if not margin_left:
         margin_left = max([sum(s) for s in hspaces[::cols+1]] + [0])
         margin_left += pad_inches / fig_width_inch
-    
+
     if not margin_right:
         margin_right =  max([sum(s) for s in hspaces[cols::cols+1]] + [0])
         margin_right += pad_inches / fig_width_inch
@@ -165,7 +167,7 @@ def auto_adjust_subplotpars(fig, renderer,
     if not margin_bottom:
         margin_bottom =  max([sum(s) for s in vspaces[-cols:]] + [0])
         margin_bottom += pad_inches / fig_height_inch
-    
+
 
     kwargs = dict(left=margin_left,
                   right=1-margin_right,
@@ -187,7 +189,7 @@ def auto_adjust_subplotpars(fig, renderer,
         kwargs["hspace"]=vspace/v_axes
 
     return kwargs
-    
+
 
 def get_renderer(fig):
     if fig._cachedRenderer:
@@ -199,7 +201,7 @@ def get_renderer(fig):
             renderer = canvas.get_renderer()
         else:
             # not sure if this can happen
-            print "tight_layout : falling back to Agg renderer"
+            warnings.warn("tight_layout : falling back to Agg renderer")
             from matplotlib.backends.backend_agg import FigureCanvasAgg
             canvas = FigureCanvasAgg(fig)
             renderer = canvas.get_renderer()

lib/mpl_toolkits/axes_grid1/axes_size.py

@@ -280,8 +280,7 @@ def __init__(self, ax, direction):
         try:
             self._get_func = self._get_func_map[direction]
         except KeyError:
-            print "direction must be one of left, right, bottom, top"
-            raise
+            raise KeyError("direction must be one of left, right, bottom, top")
 
     def __call__(self, renderer):
         vl = [self._get_func(ax.get_tightbbox(renderer, False),

lib/mpl_toolkits/axisartist/angle_helper.py

@@ -6,6 +6,7 @@
 A = np.array
 
 from mpl_toolkits.axisartist.grid_finder import ExtremeFinderSimple
+from __future__ import print_function
 
 def select_step_degree(dv):
 
@@ -433,38 +434,38 @@ def _adjust_extremes(self, lon_min, lon_max, lat_min, lat_max):
     #print select_step360(20.5+21.2/3600., 20.5+33.3/3600., 5)
 
     # test threshold factor
-    print select_step360(20.5+11.2/3600., 20.5+53.3/3600., 5,
-                         threshold_factor=60)
+    print(select_step360(20.5+11.2/3600., 20.5+53.3/3600., 5,
+                         threshold_factor=60))
 
-    print select_step360(20.5+11.2/3600., 20.5+53.3/3600., 5,
-                         threshold_factor=1)
+    print(select_step360(20.5+11.2/3600., 20.5+53.3/3600., 5,
+                         threshold_factor=1))
 
     fmt = FormatterDMS()
     #print fmt("left", 60, [0, -30, -60])
-    print fmt("left", 600, [12301, 12302, 12303])
+    print(fmt("left", 600, [12301, 12302, 12303]))
 
-    print select_step360(20.5+21.2/3600., 20.5+21.4/3600., 5)
-    print fmt("left", 36000, [738210, 738215, 738220])
-    print fmt("left", 360000, [7382120, 7382125, 7382130])
-    print fmt("left", 1., [45, 46, 47])
-    print fmt("left", 10., [452, 453, 454])
+    print(select_step360(20.5+21.2/3600., 20.5+21.4/3600., 5))
+    print(fmt("left", 36000, [738210, 738215, 738220]))
+    print(fmt("left", 360000, [7382120, 7382125, 7382130]))
+    print(fmt("left", 1., [45, 46, 47]))
+    print(fmt("left", 10., [452, 453, 454]))
 
 if 0:
-    print select_step360(20+21.2/60., 21+33.3/60., 5)
-    print select_step360(20.5+21.2/3600., 20.5+33.3/3600., 5)
-    print select_step360(20+21.2/60., 20+53.3/60., 5)
+    print(select_step360(20+21.2/60., 21+33.3/60., 5))
+    print(select_step360(20.5+21.2/3600., 20.5+33.3/3600., 5))
+    print(select_step360(20+21.2/60., 20+53.3/60., 5))
 
     ###
     levs, n, factor = select_step360(20.5+21.2/3600., 20.5+27.25/3600., 5)
     levs = levs * 0.1
     fmt = FormatterDMS()
     #print fmt("left", 60, [0, -30, -60])
-    print fmt("left", factor, levs)
+    print(fmt("left", factor, levs))
 
 
-    print select_step(-180, 180, 10, hour=False)
-    print select_step(-12, 12, 10, hour=True)
+    print(select_step(-180, 180, 10, hour=False))
+    print(select_step(-12, 12, 10, hour=True))
 
     fmt = FormatterDMS()
     #print fmt("left", 60, [0, -30, -60])
-    print fmt("left", 3600, [0, -30, -60])
+    print(fmt("left", 3600, [0, -30, -60]))

lib/mpl_toolkits/axisartist/clip_path.py

@@ -1,10 +1,11 @@
 import numpy as np
 from math import degrees
 import math
+import warnings
 
 def atan2(dy, dx):
     if dx == 0 and dx == 0:
-        print "warning"
+        warnings.warn("dx and dy is 0")
         return 0
     else:
         return math.atan2(dy, dx)
@@ -28,7 +29,7 @@ def clip(xlines, ylines, x0, clip="right", xdir=True, ydir=True):
         ysign = 1
     else:
         ysign = -1
-        
+
 
     for x, y in zip(xlines, ylines):
 
@@ -95,7 +96,7 @@ def clip_line_to_rect(xline, yline, bbox):
 
     xdir = x1 > x0
     ydir = y1 > y0
-    
+
     if x1 > x0:
         lx1, ly1, c_right_ = clip([xline], [yline], x1, clip="right", xdir=xdir, ydir=ydir)
         lx2, ly2, c_left_ = clip(lx1, ly1, x0, clip="left", xdir=xdir, ydir=ydir)
@@ -110,7 +111,7 @@ def clip_line_to_rect(xline, yline, bbox):
         ly3, lx3, c_top_ = clip(ly2, lx2, y0, clip="right", xdir=ydir, ydir=xdir)
         ly4, lx4, c_bottom_ = clip(ly3, lx3, y1, clip="left", xdir=ydir, ydir=xdir)
 
-        
+
     # lx1, ly1, c_right_ = clip([xline], [yline], x1, clip="right")
     # lx2, ly2, c_left_ = clip(lx1, ly1, x0, clip="left")
     # ly3, lx3, c_top_ = clip(ly2, lx2, y1, clip="right")

lib/mpl_toolkits/axisartist/grid_finder.py

@@ -7,6 +7,7 @@
 import matplotlib.ticker as mticker
 from matplotlib.transforms import Transform
 
+from __future__ import print_function
 
 # extremes finder
 
@@ -345,4 +346,4 @@ def __call__(self, direction, factor, values):
 
     fmt = FormatterPrettyPrint()
 
-    print fmt("left", None, locs)
+    print(fmt("left", None, locs))