Merge remote-tracking branch 'upstream/v1.3.x'

mdboom · mdboom · commit 23a8a4789992 · 2013-06-04T09:12:07.000-04:00
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -8468,18 +8468,22 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
                 xvals.append(x.copy())
                 yvals.append(y.copy())
 
-            # add patches in reverse order so that when stacking,
-            # items lower in the stack are plottted on top of
-            # items higher in the stack
-            for x, y, c in reversed(zip(xvals, yvals, color)):
-                if fill:
-                    patches.append(self.fill(x, y,
-                                             closed=True,
-                                             facecolor=c))
-                else:
-                    patches.append(self.fill(x, y,
-                                             closed=True, edgecolor=c,
-                                             fill=False))
+            if fill:
+                # add patches in reverse order so that when stacking,
+                # items lower in the stack are plottted on top of
+                # items higher in the stack
+                for x, y, c in reversed(zip(xvals, yvals, color)):
+                    patches.append(self.fill(
+                        x, y,
+                        closed=True,
+                        facecolor=c))
+            else:
+                for x, y, c in reversed(zip(xvals, yvals, color)):
+                    split = int(len(x) / 2) + 1
+                    patches.append(self.fill(
+                        x[:split], y[:split],
+                        closed=False, edgecolor=c,
+                        fill=False))
 
             # we return patches, so put it back in the expected order
             patches.reverse()
diff --git a/lib/matplotlib/dates.py b/lib/matplotlib/dates.py
@@ -787,7 +787,7 @@ def __init__(self, tz=None, minticks=5, maxticks=None,
             YEARLY:   [1, 2, 4, 5, 10, 20, 40, 50, 100, 200, 400, 500,
                        1000, 2000, 4000, 5000, 10000],
             MONTHLY:  [1, 2, 3, 4, 6],
-            DAILY:    [1, 2, 3, 7, 14],
+            DAILY:    [1, 2, 3, 7, 14, 21],
             HOURLY:   [1, 2, 3, 4, 6, 12],
             MINUTELY: [1, 5, 10, 15, 30],
             SECONDLY: [1, 5, 10, 15, 30],
diff --git a/lib/matplotlib/tests/test_dates.py b/lib/matplotlib/tests/test_dates.py
@@ -222,6 +222,12 @@ def _create_auto_date_locator(date1, date2):
                  '1990-09-01 00:00:00+00:00', '1990-10-01 00:00:00+00:00',
                  '1990-11-01 00:00:00+00:00', '1990-12-01 00:00:00+00:00']
                 ],
+               [datetime.timedelta(days=140),
+                ['1990-01-06 00:00:00+00:00', '1990-01-27 00:00:00+00:00',
+                 '1990-02-17 00:00:00+00:00', '1990-03-10 00:00:00+00:00',
+                 '1990-03-31 00:00:00+00:00', '1990-04-21 00:00:00+00:00',
+                 '1990-05-12 00:00:00+00:00']
+                ],
                [datetime.timedelta(days=40),
                 ['1990-01-03 00:00:00+00:00', '1990-01-10 00:00:00+00:00',
                  '1990-01-17 00:00:00+00:00', '1990-01-24 00:00:00+00:00',
diff --git a/setupext.py b/setupext.py
@@ -1466,7 +1466,10 @@ def check(self):
         # This check needs to be performed out-of-process, because
         # importing gi and then importing regular old pygtk afterward
         # segfaults the interpreter.
-        p = multiprocessing.Pool()
+        try:
+            p = multiprocessing.Pool()
+        except:
+            return "unknown (can not use multiprocessing to determine)"
         success, msg = p.map(backend_gtk3agg_internal_check, [0])[0]
         p.close()
         p.join()
@@ -1518,7 +1521,10 @@ def check(self):
         # This check needs to be performed out-of-process, because
         # importing gi and then importing regular old pygtk afterward
         # segfaults the interpreter.
-        p = multiprocessing.Pool()
+        try:
+            p = multiprocessing.Pool()
+        except:
+            return "unknown (can not use multiprocessing to determine)"
         success, msg = p.map(backend_gtk3cairo_internal_check, [0])[0]
         p.close()
         p.join()
