Merge branch 'grid_indep_axis_ctrl' of http://github.com/kaufman/matplotlib

efiring · efiring · commit 545044abd456 · 2011-04-23T17:11:28.000-10:00
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -2036,11 +2036,11 @@ def set_axisbelow(self, b):
         self._axisbelow = b
 
     @docstring.dedent_interpd
-    def grid(self, b=None, which='major', axis='xy', **kwargs):
+    def grid(self, b=None, which='major', axis='both', **kwargs):
         """
         call signature::
 
-           grid(self, b=None, which='major', axis='xy', **kwargs)
+           grid(self, b=None, which='major', axis='both', **kwargs)
 
         Set the axes grids on or off; *b* is a boolean.  (For MATLAB
         compatibility, *b* may also be a string, 'on' or 'off'.)
@@ -2052,7 +2052,7 @@ def grid(self, b=None, which='major', axis='xy', **kwargs):
         *which* can be 'major' (default), 'minor', or 'both' to control
         whether major tick grids, minor tick grids, or both are affected.
 
-        *axis* can be 'xy' (default), 'x', or 'y' to control which
+        *axis* can be 'both' (default), 'x', or 'y' to control which
         set of gridlines are drawn.
 
         *kawrgs* are used to set the grid line properties, eg::
@@ -2068,9 +2068,9 @@ def grid(self, b=None, which='major', axis='xy', **kwargs):
             b = True
         b = _string_to_bool(b)
 
-        if axis == 'x' or  axis == 'xy':
+        if axis == 'x' or  axis == 'both':
           self.xaxis.grid(b, which=which, **kwargs)
-        if axis == 'y' or  axis == 'xy':
+        if axis == 'y' or  axis == 'both':
           self.yaxis.grid(b, which=which, **kwargs)
 
     def ticklabel_format(self, **kwargs):
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -2644,7 +2644,7 @@ def cla():
 # This function was autogenerated by boilerplate.py.  Do not edit as
 # changes will be lost
 @docstring.copy_dedent(Axes.grid)
-def grid(b=None, which='major', axis='xy', **kwargs):
+def grid(b=None, which='major', axis='both', **kwargs):
     ret =  gca().grid(b, which, axis, **kwargs)
     draw_if_interactive()
     return ret
