Merge branch 'v1.1.x'

WeatherGod · WeatherGod · commit c721cf030baa · 2012-07-23T15:20:52.000-04:00
Conflicts:
	lib/matplotlib/__init__.py
diff --git a/doc/users/recipes.rst b/doc/users/recipes.rst
@@ -307,7 +307,7 @@ Transparent, fancy legends
 ==========================
 
 Sometimes you know what your data looks like before you plot it, and
-mak know for instance that there won't be much data in the upper right
+may know for instance that there won't be much data in the upper right
 hand corner.  Then you can safely create a legend that doesn't overlay
 your data::
 
@@ -316,7 +316,7 @@ your data::
 Other times you don't know where your data is, and loc='best' will try
 and place the legend::
 
-  ax.legend(loc='upper right')
+  ax.legend(loc='best')
 
 but still, your legend may overlap your data, and in these cases it's
 nice to make the legend frame transparent.
diff --git a/lib/matplotlib/backends/backend_gdk.py b/lib/matplotlib/backends/backend_gdk.py
@@ -141,7 +141,7 @@ def draw_image(self, gc, x, y, im):
     def draw_text(self, gc, x, y, s, prop, angle, ismath):
         x, y = int(x), int(y)
 
-        if x <0 or y <0: # window has shrunk and text is off the edge
+        if x < 0 or y < 0: # window has shrunk and text is off the edge
             return
 
         if angle not in (0,90):
@@ -156,6 +156,9 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath):
         else:
             layout, inkRect, logicalRect = self._get_pango_layout(s, prop)
             l, b, w, h = inkRect
+            if (x + w > self.width or y + h > self.height):
+                return
+
             self.gdkDrawable.draw_layout(gc.gdkGC, x, y-h-b, layout)
 
 
@@ -224,7 +227,8 @@ def _draw_rotated_text(self, gc, x, y, s, prop, angle):
         x = int(x-h)
         y = int(y-w)
 
-        if x < 0 or y < 0: # window has shrunk and text is off the edge
+        if (x < 0 or y < 0 or # window has shrunk and text is off the edge
+            x + w > self.width or y + h > self.height):
             return
 
         key = (x,y,s,angle,hash(prop))
diff --git a/lib/matplotlib/backends/qt4_editor/formlayout.py b/lib/matplotlib/backends/qt4_editor/formlayout.py
@@ -273,7 +273,9 @@ def setup(self):
             elif isinstance(value, (str, unicode)):
                 field = QLineEdit(value, self)
             elif isinstance(value, (list, tuple)):
-                selindex = list(value).pop(0)
+                if isinstance(value, tuple):
+                    value = list(value)
+                selindex = value.pop(0)
                 field = QComboBox(self)
                 if isinstance(value[0], (list, tuple)):
                     keys = [ key for key, _val in value ]
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_14.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_14.png
diff --git a/lib/matplotlib/tests/test_mlab.py b/lib/matplotlib/tests/test_mlab.py
@@ -30,11 +30,14 @@ def test_recarray_csv_roundtrip():
 
 @raises(ValueError)
 def test_rec2csv_bad_shape():
-    bad = np.recarray((99,4),[('x',np.float),('y',np.float)])
-    fd = tempfile.TemporaryFile(suffix='csv')
-
-    # the bad recarray should trigger a ValueError for having ndim > 1.
-    mlab.rec2csv(bad,fd)
+    try:
+        bad = np.recarray((99,4),[('x',np.float),('y',np.float)])
+        fd = tempfile.TemporaryFile(suffix='csv')
+    
+        # the bad recarray should trigger a ValueError for having ndim > 1.
+        mlab.rec2csv(bad,fd)
+    finally:
+        fd.close()
 
 def test_prctile():
     # test odd lengths
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -1549,15 +1549,22 @@ def __call__(self):
         try:
             majorstep = majorlocs[1] - majorlocs[0]
         except IndexError:
-            raise ValueError('Need at least two major ticks to find minor '
-                             'tick locations')
+            # Need at least two major ticks to find minor tick locations
+            # TODO: Figure out a way to still be able to display minor
+            # ticks without two major ticks visible. For now, just display
+            # no ticks at all.
+            majorstep = 0
 
         if self.ndivs is None:
-            x = int(round(10 ** (np.log10(majorstep) % 1)))
-            if x in [1, 5, 10]:
-                ndivs = 5
-            else:
-                ndivs = 4
+            if majorstep == 0 :
+                # TODO: Need a better way to figure out ndivs
+                ndivs = 1
+            else :
+                x = int(round(10 ** (np.log10(majorstep) % 1)))
+                if x in [1, 5, 10]:
+                    ndivs = 5
+                else:
+                    ndivs = 4
         else:
             ndivs = self.ndivs
 
@@ -1567,12 +1574,15 @@ def __call__(self):
         if vmin > vmax:
             vmin,vmax = vmax,vmin
 
-        t0 = majorlocs[0]
-        tmin = np.ceil((vmin - t0) / minorstep) * minorstep
-        tmax = np.floor((vmax - t0) / minorstep) * minorstep
-        locs = np.arange(tmin, tmax, minorstep) + t0
-        cond = np.abs((locs - t0) % majorstep) > minorstep/10.0
-        locs = locs.compress(cond)
+        if len(majorlocs) > 0:
+            t0 = majorlocs[0]
+            tmin = np.ceil((vmin - t0) / minorstep) * minorstep
+            tmax = np.floor((vmax - t0) / minorstep) * minorstep
+            locs = np.arange(tmin, tmax, minorstep) + t0
+            cond = np.abs((locs - t0) % majorstep) > minorstep/10.0
+            locs = locs.compress(cond)
+        else:
+            locs = []
 
         return self.raise_if_exceeds(np.array(locs))
 
