Merged revisions 8579 via svnmerge from

efiring · efiring · commit b0ccfeedb862 · 2010-07-26T19:17:37.000Z
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint ........ r8579 | efiring | 2010-07-26 09:14:16 -1000 (Mon, 26 Jul 2010) | 2 lines [3032390] subplot: more robust argument handling, consistent with 0.99.3 ........ svn path=/trunk/matplotlib/; revision=8580
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -8295,6 +8295,7 @@ def __init__(self, fig, *args, **kwargs):
         being created.  *plotNum* starts at 1 in the upper left
         corner and increases to the right.
 
+
         If *numRows* <= *numCols* <= *plotNum* < 10, *args* can be the
         decimal integer *numRows* * 100 + *numCols* * 10 + *plotNum*.
         """
@@ -8304,24 +8305,27 @@ def __init__(self, fig, *args, **kwargs):
         if len(args) == 1:
             if isinstance(args[0], SubplotSpec):
                 self._subplotspec = args[0]
-
             else:
-                s = str(args[0])
-                if len(s) != 3:
-                    raise ValueError('Argument to subplot must be a 3 digits long')
-                rows, cols, num = map(int, s)
+                try:
+                    s = str(int(args[0]))
+                    rows, cols, num = map(int, s)
+                except ValueError:
+                    raise ValueError(
+                         'Single argument to subplot must be a 3-digit integer')
                 self._subplotspec = GridSpec(rows, cols)[num-1]
                 # num - 1 for converting from MATLAB to python indexing
         elif len(args)==3:
             rows, cols, num = args
+            rows = int(rows)
+            cols = int(cols)
             if isinstance(num, tuple) and len(num) == 2:
+                num = [int(n) for n in num]
                 self._subplotspec = GridSpec(rows, cols)[num[0]-1:num[1]]
             else:
-                self._subplotspec = GridSpec(rows, cols)[num-1]
+                self._subplotspec = GridSpec(rows, cols)[int(num)-1]
                 # num - 1 for converting from MATLAB to python indexing
         else:
-            raise ValueError(  'Illegal argument to subplot')
-
+            raise ValueError('Illegal argument(s) to subplot: %s' % (args,))
 
         self.update_params()
 
diff --git a/lib/matplotlib/gridspec.py b/lib/matplotlib/gridspec.py
@@ -70,7 +70,7 @@ def set_height_ratios(self, height_ratios):
     def get_height_ratios(self):
         return self._row_height_ratios
 
-    
+
     def get_grid_positions(self, fig):
         """
         return lists of bottom and top position of rows, left and
@@ -116,7 +116,7 @@ def get_grid_positions(self, fig):
 
         sepWidths = [0] + ([sepW] * (ncols-1))
         cellWs = np.add.accumulate(np.ravel(zip(sepWidths, cellWidths)))
-            
+
 
 
         figTops = [top - cellHs[2*rowNum] for rowNum in range(nrows)]
@@ -126,7 +126,7 @@ def get_grid_positions(self, fig):
 
 
         return figBottoms, figTops, figLefts, figRights
-        
+
 
     def __getitem__(self, key):
         """
@@ -287,7 +287,7 @@ def __init__(self, nrows, ncols,
 
     def get_subplot_params(self, fig=None):
         """
-        return a dictionary of subplot layout parameters. 
+        return a dictionary of subplot layout parameters.
         """
 
         if fig is None:
@@ -324,7 +324,7 @@ class SubplotSpec(object):
     """
     specifies the location of the subplot in the given *GridSpec*.
     """
-    
+
     def __init__(self, gridspec, num1, num2=None):
         """
         The subplot will occupy the num1-th cell of the given
