Simplify argument count/stride argument handling for plot_surface()

WeatherGod · WeatherGod · commit 2f75b39f33e1 · 2016-11-10T11:31:40.000-05:00
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -1555,13 +1555,17 @@ def plot_surface(self, X, Y, Z, *args, **kwargs):
         sample the input data to generate the graph.  If 1k by 1k
         arrays are passed in the default values for the strides will
         result in a 100x100 grid being plotted. Defaults to 10.
-        Superceded by `rcount` and `ccount` if both the
-        stride and the count are specified as of v2.0.0.
-
-        The `rcount` and `ccount` kwargs are the new method for
-        sampling the input data to generate the graph, and
-        supercedes `rstride` and `cstride` (unless using the
-        'classic' style) if both are specified. Added in v2.0.0.
+        Raises a ValueError if both stride and count kwargs
+        (see next section) are provided.
+
+        The `rcount` and `ccount` kwargs supersedes `rstride` and
+        `cstride`for default sampling method for surface plotting.
+        These arguments will determine at most how many evenly spaced
+        samples will be taken from the input data to generate the graph.
+        This is the default sampling method unless using the 'classic'
+        style. Will raise ValueError if both stride and count are
+        specified.
+        Added in v2.0.0.
 
         ============= ================================================
         Argument      Description
@@ -1591,10 +1595,11 @@ def plot_surface(self, X, Y, Z, *args, **kwargs):
         X, Y, Z = np.broadcast_arrays(X, Y, Z)
         rows, cols = Z.shape
 
-        has_rstride = 'rstride' in kwargs
-        has_cstride = 'cstride' in kwargs
-        has_rcount = 'rcount' in kwargs
-        has_ccount = 'ccount' in kwargs
+        has_stride = 'rstride' in kwargs or 'cstride' in kwargs
+        has_count = 'rcount' in kwargs or 'rcount' in kwargs
+
+        if has_stride and has_count:
+            raise ValueError("Cannot specify both stride and count arguments")
 
         rstride = kwargs.pop('rstride', 10)
         cstride = kwargs.pop('cstride', 10)
@@ -1603,17 +1608,16 @@ def plot_surface(self, X, Y, Z, *args, **kwargs):
 
         if rcParams['_internal.classic_mode']:
             # Strides have priority over counts in classic mode.
-            if not has_rstride and has_rcount:
+            # So, only compute strides from counts
+            # if counts were explicitly given
+            if has_count:
                 rstride = int(np.ceil(rows / rcount))
-            if not has_cstride and has_ccount:
                 cstride = int(np.ceil(cols / ccount))
         else:
-            # If the count is provided then it has priority
-            # If neither count or stride is provided then use
-            # the default count.
-            if has_rcount or (not has_rstride and not has_rcount):
+            # If the strides are provided then it has priority.
+            # Otherwise, compute the strides from the counts.
+            if not has_stride:
                 rstride = int(np.ceil(rows / rcount))
-            if has_ccount or (not has_cstride and not has_ccount):
                 cstride = int(np.ceil(cols / ccount))
 
         if 'facecolors' in kwargs:
