Fixed bug in axes.py that broke Numeric compatibility.

efiring · efiring · commit d282109bb784 · 2006-11-11T23:02:06.000Z
svn path=/trunk/matplotlib/; revision=2868
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+2006-11-11 Fixed bug that broke Numeric compatibility - EF
+
 2006-11-05 Added broken_barh function for makring a sequence of
 horizontal bars broken by gaps -- see examples/broken_barh.py
 
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -389,7 +389,7 @@ def __init__(self, fig, rect,
     def get_window_extent(self, *args, **kwargs):
         'get the axes bounding box in display space'
         return self.bbox
-    
+
     def _init_axis(self):
         "move this out of __init__ because non-separable axes don't use it"
         self.xaxis = XAxis(self)
@@ -1217,7 +1217,7 @@ def set_xlim(self, xmin=None, xmax=None, emit=False):
         ACCEPTS: len(2) sequence of floats
         """
 
-        if xmax is None and hasattr(xmin,'__len__'):
+        if xmax is None and iterable(xmin):
             xmin,xmax = xmin
 
         old_xmin,old_xmax = self.get_xlim()
@@ -1330,7 +1330,7 @@ def set_ylim(self, ymin=None, ymax=None, emit=False):
         ACCEPTS: len(2) sequence of floats
         """
 
-        if ymax is None and hasattr(ymin,'__len__'):
+        if ymax is None and iterable(ymin):
             ymin,ymax = ymin
 
         old_ymin,old_ymax = self.get_ylim()
@@ -1797,7 +1797,7 @@ def annotate(self, *args, **kwargs):
         self._set_artist_props(a)
         self.texts.append(a)
         return a
-        
+
 
     #### Lines and spans
 
@@ -2508,7 +2508,7 @@ def make_iterable(x):
 
         if yerr is not None:
             if not iterable(yerr):
-                yerr = asarray([yerr]*nbars, Float) 
+                yerr = asarray([yerr]*nbars, Float)
             else:
                 yerr = asarray(yerr)
         if xerr is not None:
@@ -2641,7 +2641,7 @@ def broken_barh(self, xranges, yrange, **kwargs):
 
         xranges : sequence of (xmin, xwidth)
         yrange  : (ymin, ywidth)
-        
+
         optional kwargs:
           edgecolors
           facecolors
@@ -2659,7 +2659,7 @@ def broken_barh(self, xranges, yrange, **kwargs):
 
         return col
 
-                    
+
     def stem(self, x, y, linefmt='b-', markerfmt='bo', basefmt='r-'):
         """
         STEM(x, y, linefmt='b-', markerfmt='bo', basefmt='r-')
@@ -3222,44 +3222,44 @@ def scatter(self, x, y, s=20, c='b', marker='o', cmap=None, norm=None,
 
         sym = None
         starlike = False
-        
+
         # to be API compatible
         if marker is None and not (verts is None):
             marker = (verts, 0)
             verts = None
-        
+
         if is_string_like(marker):
             # the standard way to define symbols using a string character
             sym = syms.get(marker)
             if sym is None and verts is None:
                 raise ValueError('Unknown marker symbol to scatter')
             numsides, rotation = syms[marker]
-        
+
         elif iterable(marker):
             # accept marker to be:
             #    (numsides, style, [angle])
             # or
             #    (verts[], style, [angle])
-            
+
             if len(marker)<2 or len(marker)>3:
                 raise ValueError('Cannot create markersymbol from marker')
-            
+
             if is_numlike(marker[0]):
                 # (numsides, style, [angle])
-                
+
                 if len(marker)==2:
                     numsides, rotation = marker[0], math.pi/4.
                 elif len(marker)==3:
                     numsides, rotation = marker[0], marker[2]
                 sym = True
-                
+
                 if marker[1]==1:
                     # starlike symbol, everthing else is interpreted as solid symbol
                     starlike = True
-            
+
             else:
                 verts = asarray(marker[0])
-                
+
         if sym is not None:
             if not starlike:
                 collection = RegularPolyCollection(
@@ -3285,7 +3285,7 @@ def scatter(self, x, y, s=20, c='b', marker='o', cmap=None, norm=None,
             # rescale verts
             rescale = sqrt(max(verts[:,0]**2+verts[:,1]**2))
             verts /= rescale
-            
+
             scales = asarray(scales)
             scales = sqrt(scales * self.figure.dpi.get() / 72.)
             if len(scales)==1:
@@ -4832,7 +4832,7 @@ def draw(self, renderer):
         artists.extend(self.texts)
         artists.extend(self.collections)
         artists.extend(self.patches)
-        artists.extend(self.artists)        
+        artists.extend(self.artists)
         dsu = [ (a.zorder, a) for a in artists]
         dsu.sort()
 
diff --git a/src/_transforms.cpp b/src/_transforms.cpp
@@ -374,7 +374,7 @@ Bbox::overlapsx(const Py::Tuple &args, const Py::Dict &kwargs) {
     b =  ( ( (ominx>=minx) && (ominx<=maxx)) ||
 	   ( (minx>=ominx) && (minx<=omaxx)) );
 
-  }  
+  }
   return Py::Int(b);
 
 }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+2006-11-11 Fixed bug that broke Numeric compatibility - EF`
	`2`	`+`
`1`	`3`	`2006-11-05 Added broken_barh function for makring a sequence of`
`2`	`4`	`horizontal bars broken by gaps -- see examples/broken_barh.py`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -374,7 +374,7 @@ Bbox::overlapsx(const Py::Tuple &args, const Py::Dict &kwargs) {`
`374`	`374`	`b = ( ( (ominx>=minx) && (ominx<=maxx)) \|\|`
`375`	`375`	`( (minx>=ominx) && (minx<=omaxx)) );`
`376`	`376`
`377`		`- }`
	`377`	`+ }`
`378`	`378`	`return Py::Int(b);`
`379`	`379`
`380`	`380`	`}`