Merge remote-tracking branch 'ugurthemaster/patch-1'

Conflicts:
	examples/axes_grid/demo_floating_axes.py

White space conflicts.

While merging made minor style tweak to imports

Author: tacaswell

examples/axes_grid/demo_floating_axes.py

@@ -1,12 +1,11 @@
 from matplotlib.transforms import Affine2D
-
 import mpl_toolkits.axisartist.floating_axes as floating_axes
-
 import numpy as np
 import mpl_toolkits.axisartist.angle_helper as angle_helper
 from matplotlib.projections import PolarAxes
-from mpl_toolkits.axisartist.grid_finder import FixedLocator, MaxNLocator, \
-    DictFormatter
+from mpl_toolkits.axisartist.grid_finder import (FixedLocator, MaxNLocator,
+     DictFormatter)
+import matplotlib.pyplot as plt
 
 
 def setup_axes1(fig, rect):
@@ -122,28 +121,22 @@ def setup_axes3(fig, rect):
     return ax1, aux_ax
 
 
-if 1:
-    import matplotlib.pyplot as plt
-    fig = plt.figure(1, figsize=(8, 4))
-    fig.subplots_adjust(wspace=0.3, left=0.05, right=0.95)
-
-    ax1, aux_ax2 = setup_axes1(fig, 131)
-    aux_ax2.bar([0, 1, 2, 3], [3, 2, 1, 3])
-
-    #theta = np.random.rand(10) #*.5*np.pi
-    #radius = np.random.rand(10) #+1.
-    #aux_ax1.scatter(theta, radius)
+##########################################################
+fig = plt.figure(1, figsize=(8, 4))
+fig.subplots_adjust(wspace=0.3, left=0.05, right=0.95)
 
-    ax2, aux_ax2 = setup_axes2(fig, 132)
+ax1, aux_ax1 = setup_axes1(fig, 131)
+aux_ax1.bar([0, 1, 2, 3], [3, 2, 1, 3])
 
-    theta = np.random.rand(10)*np.pi/2
-    radius = np.random.rand(10) + 1.
-    aux_ax2.scatter(theta, radius)
+ax2, aux_ax2 = setup_axes2(fig, 132)
+theta = np.random.rand(10)*.5*np.pi
+radius = np.random.rand(10)+1.
+aux_ax2.scatter(theta, radius)
 
-    ax3, aux_ax3 = setup_axes3(fig, 133)
+ax3, aux_ax3 = setup_axes3(fig, 133)
 
-    theta = (8 + np.random.rand(10)*(14 - 8))*15.  # in degrees
-    radius = np.random.rand(10)*14000.
-    aux_ax3.scatter(theta, radius)
+theta = (8 + np.random.rand(10)*(14-8))*15.  # in degrees
+radius = np.random.rand(10)*14000.
+aux_ax3.scatter(theta, radius)
 
-    plt.show()
+plt.show()