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

mdboom · mdboom · commit 3d3a23e890d1 · 2014-01-13T10:07:03.000-05:00
Conflicts:
	lib/matplotlib/axes/_axes.py
	lib/matplotlib/dates.py
	lib/mpl_toolkits/axes_grid1/axes_grid.py
diff --git a/examples/axes_grid/demo_imagegrid_aspect.py b/examples/axes_grid/demo_imagegrid_aspect.py
@@ -0,0 +1,20 @@
+import matplotlib.pyplot as plt
+
+from mpl_toolkits.axes_grid1 import ImageGrid
+fig = plt.figure(1)
+
+grid1 = ImageGrid(fig, 121, (2,2), axes_pad=0.1,
+                 aspect=True, share_all=True)
+
+for i in [0, 1]:
+    grid1[i].set_aspect(2)
+
+
+grid2 = ImageGrid(fig, 122, (2,2), axes_pad=0.1,
+                 aspect=True, share_all=True)
+
+
+for i in [1, 3]:
+    grid2[i].set_aspect(2)
+
+plt.show()
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -535,11 +535,12 @@ def _get_xdg_config_dir():
     base directory spec
     <http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html>`_.
     """
-    home = get_home()
-    if home is None:
-        return None
-    else:
-        return os.environ.get('XDG_CONFIG_HOME', os.path.join(home, '.config'))
+    path = os.environ.get('XDG_CONFIG_HOME')
+    if path is None:
+        path = get_home()
+        if path is not None:
+            path = os.path.join(path, '.config')
+    return path
 
 
 def _get_xdg_cache_dir():
@@ -548,11 +549,12 @@ def _get_xdg_cache_dir():
     base directory spec
     <http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html>`_.
     """
-    home = get_home()
-    if home is None:
-        return None
-    else:
-        return os.environ.get('XDG_CACHE_HOME', os.path.join(home, '.cache'))
+    path = os.environ.get('XDG_CACHE_HOME')
+    if path is None:
+        path = get_home()
+        if path is not None:
+            path = os.path.join(path, '.cache')
+    return path
 
 
 def _get_config_or_cache_dir(xdg_base):
@@ -572,9 +574,8 @@ def _get_config_or_cache_dir(xdg_base):
     h = get_home()
     if h is not None:
         p = os.path.join(h, '.matplotlib')
-        if (sys.platform.startswith('linux') and
-            xdg_base is not None):
-            p = os.path.join(xdg_base, 'matplotlib')
+    if (sys.platform.startswith('linux') and xdg_base):
+        p = os.path.join(xdg_base, 'matplotlib')
 
     if p is not None:
         if os.path.exists(p):
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -5169,6 +5169,17 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
         if histtype == 'barstacked' and not stacked:
             stacked = True
 
+        # Check whether bins or range are given explicitly.
+        binsgiven = (cbook.iterable(bins) or bin_range is not None)
+
+        # basic input validation
+        flat = np.ravel(x)
+        if len(flat) == 0:
+            raise ValueError("x must have at least one data point")
+        elif len(flat) == 1 and not binsgiven:
+            raise ValueError(
+                "x has only one data point. bins or range kwarg must be given")
+
         # Massage 'x' for processing.
         # NOTE: Be sure any changes here is also done below to 'weights'
         if isinstance(x, np.ndarray) or not iterable(x[0]):
@@ -5223,19 +5234,16 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
         # Save the datalimits for the same reason:
         _saved_bounds = self.dataLim.bounds
 
-        # Check whether bins or range are given explicitly. In that
-        # case use those values for autoscaling.
-        binsgiven = (cbook.iterable(bins) or bin_range is not None)
-
         # If bins are not specified either explicitly or via range,
         # we need to figure out the range required for all datasets,
         # and supply that to np.histogram.
         if not binsgiven:
             xmin = np.inf
             xmax = -np.inf
             for xi in x:
-                xmin = min(xmin, xi.min())
-                xmax = max(xmax, xi.max())
+                if len(xi) > 0:
+                    xmin = min(xmin, xi.min())
+                    xmax = max(xmax, xi.max())
             bin_range = (xmin, xmax)
 
         #hist_kwargs = dict(range=range, normed=bool(normed))
@@ -5430,15 +5438,17 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
                 xmin0 = max(_saved_bounds[0]*0.9, minimum)
                 xmax = self.dataLim.intervalx[1]
                 for m in n:
-                    xmin = np.amin(m[m != 0])  # filter out the 0 height bins
+                    if np.sum(m) > 0:  # make sure there are counts
+                        xmin = np.amin(m[m != 0]) # filter out the 0 height bins
                 xmin = max(xmin*0.9, minimum)
                 xmin = min(xmin0, xmin)
                 self.dataLim.intervalx = (xmin, xmax)
             elif orientation == 'vertical':
                 ymin0 = max(_saved_bounds[1]*0.9, minimum)
                 ymax = self.dataLim.intervaly[1]
                 for m in n:
-                    ymin = np.amin(m[m != 0])  # filter out the 0 height bins
+                    if np.sum(m) > 0:  # make sure there are counts
+                        ymin = np.amin(m[m != 0]) # filter out the 0 height bins
                 ymin = max(ymin*0.9, minimum)
                 ymin = min(ymin0, ymin)
                 self.dataLim.intervaly = (ymin, ymax)
diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py
@@ -457,15 +457,20 @@ def _get_key(self, event):
         # In general, the modifier key is excluded from the modifier flag,
         # however this is not the case on "darwin", so double check that
         # we aren't adding repeat modifier flags to a modifier key.
-        modifiers = [(6, 'super', 'super'),
-                     (3, 'alt', 'alt'),
-                     (2, 'ctrl', 'control'),
-                    ]
-        if sys.platform == 'darwin':
+        if sys.platform == 'win32':
+            modifiers = [(17, 'alt', 'alt'),
+                         (2, 'ctrl', 'control'),
+                         ]
+        elif sys.platform == 'darwin':
             modifiers = [(3, 'super', 'super'),
                          (4, 'alt', 'alt'),
                          (2, 'ctrl', 'control'),
-                        ]
+                         ]
+        else:
+            modifiers = [(6, 'super', 'super'),
+                         (3, 'alt', 'alt'),
+                         (2, 'ctrl', 'control'),
+                         ]
 
         if key is not None:
             # note, shift is not added to the keys as this is already accounted for
diff --git a/lib/matplotlib/dates.py b/lib/matplotlib/dates.py
@@ -265,16 +265,25 @@ def __call__(self, s):
 _dateutil_parser_parse_np_vectorized = np.vectorize(dateutil.parser.parse)
 
 
-def datestr2num(d):
+def datestr2num(d, default=None):
     """
     Convert a date string to a datenum using
-    :func:`dateutil.parser.parse`.  *d* can be a single string or a
-    sequence of strings.
+    :func:`dateutil.parser.parse`.
+
+    Parameters
+    ----------
+    d : string or sequence of strings
+        The dates to convert.
+
+    default : datetime instance
+        The default date to use when fields are missing in `d`.
     """
     if cbook.is_string_like(d):
-        dt = dateutil.parser.parse(d)
+        dt = dateutil.parser.parse(d, default=default)
         return date2num(dt)
     else:
+        if default is not None:
+            d = [dateutil.parser.parse(s, default=default) for s in d]
         d = np.asarray(d)
         if not d.size:
             return d
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -1227,6 +1227,12 @@ def test_hist_stacked_bar():
     ax.hist(d, bins=10, histtype='barstacked', align='mid', color=colors, label=labels)
     ax.legend(loc='upper right', bbox_to_anchor = (1.0, 1.0), ncol=1)
 
+@cleanup
+def test_hist_emptydata():
+    fig = plt.figure()
+    ax = fig.add_subplot(111)
+    ax.hist([[], range(10), range(10)], histtype="step")
+
 @image_comparison(baseline_images=['transparent_markers'], remove_text=True)
 def test_transparent_markers():
     np.random.seed(0)
diff --git a/lib/mpl_toolkits/axes_grid1/axes_grid.py b/lib/mpl_toolkits/axes_grid1/axes_grid.py
@@ -572,28 +572,31 @@ def __init__(self, fig,
             col, row = self._get_col_row(i)
 
             if share_all:
-                sharex = self._refax
-                sharey = self._refax
+                if self.axes_all:
+                    sharex = self.axes_all[0]
+                    sharey = self.axes_all[0]
+                else:
+                    sharex = None
+                    sharey = None
             else:
                 sharex = self._column_refax[col]
                 sharey = self._row_refax[row]
 
             ax = axes_class(fig, rect, sharex=sharex, sharey=sharey,
                             **axes_class_args)
 
-            if share_all:
-                if self._refax is None:
-                    self._refax = ax
-            else:
-                if sharex is None:
-                    self._column_refax[col] = ax
-                if sharey is None:
-                    self._row_refax[row] = ax
-
             self.axes_all.append(ax)
             self.axes_column[col].append(ax)
             self.axes_row[row].append(ax)
 
+            if share_all:
+                if self._refax is None:
+                    self._refax = ax
+            if sharex is None:
+                self._column_refax[col] = ax
+            if sharey is None:
+                self._row_refax[row] = ax
+
             cax = self._defaultCbarAxesClass(fig, rect,
                                         orientation=self._colorbar_location)
             self.cbar_axes.append(cax)
@@ -642,14 +645,15 @@ def _update_locators(self):
             self.cbar_axes[0].set_axes_locator(locator)
             self.cbar_axes[0].set_visible(True)
 
-        for col, ax in enumerate(self._column_refax):
+        for col, ax in enumerate(self.axes_row[0]):
             if h:
                 h.append(self._horiz_pad_size)  # Size.Fixed(self._axes_pad))
 
             if ax:
-                sz = Size.AxesX(ax)
+                sz = Size.AxesX(ax, aspect="axes", ref_ax=self.axes_all[0])
             else:
-                sz = Size.AxesX(self.axes_llc)
+                sz = Size.AxesX(self.axes_all[0],
+                                aspect="axes", ref_ax=self.axes_all[0])
 
             if (self._colorbar_mode == "each" or
                     (self._colorbar_mode == 'edge' and
@@ -672,14 +676,15 @@ def _update_locators(self):
 
         v_ax_pos = []
         v_cb_pos = []
-        for row, ax in enumerate(self._row_refax[::-1]):
+        for row, ax in enumerate(self.axes_column[0][::-1]):
             if v:
                 v.append(self._horiz_pad_size)  # Size.Fixed(self._axes_pad))
 
             if ax:
-                sz = Size.AxesY(ax)
+                sz = Size.AxesY(ax, aspect="axes", ref_ax=self.axes_all[0])
             else:
-                sz = Size.AxesY(self.axes_llc)
+                sz = Size.AxesY(self.axes_all[0],
+                                aspect="axes", ref_ax=self.axes_all[0])
 
             if (self._colorbar_mode == "each" or
                     (self._colorbar_mode == 'edge' and
diff --git a/lib/mpl_toolkits/axes_grid1/axes_size.py b/lib/mpl_toolkits/axes_grid1/axes_size.py
@@ -77,19 +77,39 @@ def get_size(self, renderer):
 
 Scalable=Scaled
 
+def _get_axes_aspect(ax):
+    aspect = ax.get_aspect()
+    # when aspec is "auto", consider it as 1.
+    if aspect in ('normal', 'auto'):
+        aspect = 1.
+    elif aspect == "equal":
+        aspect = 1
+    else:
+        aspect = float(aspect)
+
+    return aspect
 
 class AxesX(_Base):
     """
     Scaled size whose relative part corresponds to the data width
     of the *axes* multiplied by the *aspect*.
     """
-    def __init__(self, axes, aspect=1.):
+    def __init__(self, axes, aspect=1., ref_ax=None):
         self._axes = axes
         self._aspect = aspect
+        if aspect == "axes" and ref_ax is None:
+            raise ValueError("ref_ax must be set when aspect='axes'")
+        self._ref_ax = ref_ax
 
     def get_size(self, renderer):
         l1, l2 = self._axes.get_xlim()
-        rel_size = abs(l2-l1)*self._aspect
+        if self._aspect == "axes":
+            ref_aspect = _get_axes_aspect(self._ref_ax)
+            aspect = ref_aspect/_get_axes_aspect(self._axes)
+        else:
+            aspect = self._aspect
+
+        rel_size = abs(l2-l1)*aspect
         abs_size = 0.
         return rel_size, abs_size
 
@@ -98,13 +118,23 @@ class AxesY(_Base):
     Scaled size whose relative part corresponds to the data height
     of the *axes* multiplied by the *aspect*.
     """
-    def __init__(self, axes, aspect=1.):
+    def __init__(self, axes, aspect=1., ref_ax=None):
         self._axes = axes
         self._aspect = aspect
+        if aspect == "axes" and ref_ax is None:
+            raise ValueError("ref_ax must be set when aspect='axes'")
+        self._ref_ax = ref_ax
 
     def get_size(self, renderer):
         l1, l2 = self._axes.get_ylim()
-        rel_size = abs(l2-l1)*self._aspect
+
+        if self._aspect == "axes":
+            ref_aspect = _get_axes_aspect(self._ref_ax)
+            aspect = _get_axes_aspect(self._axes)
+        else:
+            aspect = self._aspect
+
+        rel_size = abs(l2-l1)*aspect
         abs_size = 0.
         return rel_size, abs_size
 
