Merge remote-tracking branch 'origin/v1.4.x'

Conflicts:
	INSTALL
	lib/matplotlib/tests/test_coding_standards.py

Author: jenshnielsen

.travis.yml

@@ -23,6 +23,8 @@ matrix:
 install:
   - pip install -q --use-mirrors nose python-dateutil numpy pep8 pyparsing pillow
   - sudo apt-get update && sudo apt-get -qq install inkscape libav-tools
+  # We use --no-install-recommends to avoid pulling in additional large latex docs that we don't need 
+  - if [[ $BUILD_DOCS == true ]]; then sudo apt-get install -qq --no-install-recommends dvipng texlive-latex-base texlive-latex-extra texlive-fonts-recommended graphviz; fi
   - if [[ $BUILD_DOCS == true ]]; then pip install sphinx numpydoc linkchecker; fi
   - python setup.py install
 

INSTALL

@@ -193,7 +193,7 @@ Required Dependencies
     using pip, easy_install or installing from source, the installer
     will attempt to download and install `pyparsing` from PyPI.
 
-six 1.3 or later
+six 1.4 or later
     Python 2/3 compatibility library.  This is also a dependency of
     :term:`dateutil`.
 
@@ -202,6 +202,11 @@ libpng 1.2 (or later)
     <http://www.libpng.org/pub/png/libpng.html>`__). libpng requires
     zlib.
 
+`pytz`
+    Used to manipulate time-zone aware datetimes.
+
+
+
 Optional GUI framework
 ^^^^^^^^^^^^^^^^^^^^^^
 
@@ -240,19 +245,9 @@ Optional dependencies
     If Pillow is installed, matplotlib can read and write a larger
     selection of image file formats.
 
-:term:`freetype` 2.4 or later
-    library for reading true type font files.  Matplotlib in known
-    to work with freetype 2.3, and the required version will be reduced
-    in 1.4.1.  If you need to build from source on a system which only has
-    freetype 2.3 available, please edit L945 of `setupext.py` to reduce
-    `min_version` to 2.3.
-
-`pytz`
-    Required if you want to manipulate datetime objects which are time-zone
-    aware.  An exception will be raised if you try to make time-zone aware
-    plots with out `pytz` installed.  It will become a required dependency
-    in 1.4.1.
 
+:term:`freetype` 2.3 or later
+    library for reading true type font files.
 
 
 Required libraries that ship with matplotlib

doc/_templates/index.html

@@ -63,9 +63,9 @@ <h1>Introduction</h1>
   For a sampling, see the <a href="{{ pathto('users/screenshots') }}">screenshots</a>, <a href="{{ pathto('gallery') }}">thumbnail</a> gallery,  and
     <a href="examples/index.html">examples</a> directory</p>
 
-<p>For simple plotting the <pre>pyplot</pre> interface provides a
+<p>For simple plotting the <tt>pyplot</tt> interface provides a
   MATLAB-like interface, particularly when combined
-  with <pre>IPython</pre>.  For the power user, you have full control
+  with <tt>IPython</tt>.  For the power user, you have full control
   of line styles, font properties, axes properties, etc, via an object
   oriented interface or via a set of functions familiar to MATLAB
   users.</p>

examples/event_handling/timers.py

@@ -14,13 +14,13 @@ def update_title(axes):
 x = np.linspace(-3, 3)
 ax.plot(x, x*x)
 
-# Create a new timer object. Set the interval 500 milliseconds (1000 is default)
-# and tell the timer what function should be called.
+# Create a new timer object. Set the interval to 100 milliseconds
+# (1000 is default) and tell the timer what function should be called.
 timer = fig.canvas.new_timer(interval=100)
 timer.add_callback(update_title, ax)
 timer.start()
 
-#Or could start the timer on first figure draw
+# Or could start the timer on first figure draw
 #def start_timer(evt):
 #    timer.start()
 #    fig.canvas.mpl_disconnect(drawid)

lib/matplotlib/__init__.py

@@ -766,7 +766,11 @@ def matplotlib_fname():
     - Lastly, it looks in `$MATPLOTLIBDATA/matplotlibrc` for a
       system-defined copy.
     """
-    fname = os.path.join(os.getcwd(), 'matplotlibrc')
+    if six.PY2:
+        cwd = os.getcwdu()
+    else:
+        cwd = os.getcwd()
+    fname = os.path.join(cwd, 'matplotlibrc')
     if os.path.exists(fname):
         return fname
 

lib/matplotlib/axes/_axes.py

@@ -124,9 +124,10 @@ def set_title(self, label, fontdict=None, loc="center", **kwargs):
 
         Other parameters
         ----------------
-        Other keyword arguments are text properties, see
-        :class:`~matplotlib.text.Text` for a list of valid text
-        properties.
+        kwargs : text properties
+            Other keyword arguments are text properties, see
+            :class:`~matplotlib.text.Text` for a list of valid text
+            properties.
         """
         try:
             title = {'left': self._left_title,
@@ -2883,7 +2884,7 @@ def xywhere(xs, ys, mask):
 
         return errorbar_container  # (l0, caplines, barcols)
 
-    def boxplot(self, x, notch=False, sym='b+', vert=True, whis=1.5,
+    def boxplot(self, x, notch=False, sym=None, vert=True, whis=1.5,
                 positions=None, widths=None, patch_artist=False,
                 bootstrap=None, usermedians=None, conf_intervals=None,
                 meanline=False, showmeans=False, showcaps=True,
@@ -2919,11 +2920,13 @@ def boxplot(self, x, notch=False, sym='b+', vert=True, whis=1.5,
             If False, produces a rectangular box plot.
             If True, will produce a notched box plot
 
-          sym : str, default = 'b+'
+          sym : str or None, default = None
             The default symbol for flier points.
             Enter an empty string ('') if you don't want to show fliers.
+            If `None`, then the fliers default to 'b+'  If you want more
+            control use the fliersprop kwarg.
 
-          vert : bool, default = False
+          vert : bool, default = True
             If True (default), makes the boxes vertical.
             If False, makes horizontal boxes.
 
@@ -3021,10 +3024,11 @@ def boxplot(self, x, notch=False, sym='b+', vert=True, whis=1.5,
         Returns
         -------
 
-        A dictionary mapping each component of the boxplot
-        to a list of the :class:`matplotlib.lines.Line2D`
-        instances created. That dictionary has the following keys
-        (assuming vertical boxplots):
+        result : dict
+            A dictionary mapping each component of the boxplot
+            to a list of the :class:`matplotlib.lines.Line2D`
+            instances created. That dictionary has the following keys
+            (assuming vertical boxplots):
 
             - boxes: the main body of the boxplot showing the quartiles
               and the median's confidence intervals if enabled.
@@ -3043,10 +3047,39 @@ def boxplot(self, x, notch=False, sym='b+', vert=True, whis=1.5,
         """
         bxpstats = cbook.boxplot_stats(x, whis=whis, bootstrap=bootstrap,
                                        labels=labels)
+        # make sure we have a dictionary
         if flierprops is None:
-            flierprops = dict(sym=sym)
-        else:
-            flierprops['sym'] = sym
+            flierprops = dict()
+        # if non-default sym value, put it into the flier dictionary
+        # the logic for providing the default symbol ('b+') now lives
+        # in bxp in the initial value of final_flierprops
+        # handle all of the `sym` related logic here so we only have to pass
+        # on the flierprops dict.
+        if sym is not None:
+            # no-flier case, which should really be done with
+            # 'showfliers=False' but none-the-less deal with it to keep back
+            # compatibility
+            if sym == '':
+                # blow away existing dict and make one for invisible markers
+                flierprops = dict(linestyle='none', marker='',
+                    markeredgecolor='none',
+                    markerfacecolor='none')
+            # now process the symbol string
+            else:
+                # process the symbol string
+                # discarded linestyle
+                _, marker, color = _process_plot_format(sym)
+                # if we have a marker, use it
+                if marker is not None:
+                    flierprops['marker'] = marker
+                # if we have a color, use it
+                if color is not None:
+                    flierprops['color'] = color
+                    # assume that if color is passed in the user want
+                    # filled symbol, if the users want more control use
+                    # flierprops
+                    flierprops['markeredgecolor'] = color
+                    flierprops['markerfacecolor'] = color
 
         # replace medians if necessary:
         if usermedians is not None:
@@ -3288,24 +3321,9 @@ def bxp(self, bxpstats, positions=None, widths=None, vert=True,
         final_flierprops = dict(linestyle='none', marker='+',
                     markeredgecolor='b',
                     markerfacecolor='none')
+
         # flier (outlier) properties
         if flierprops is not None:
-            sym = flierprops.pop('sym', None)
-
-            # watch inverted logic, checks for non-default
-            # value of `sym`
-            if not (sym == '' or (sym is None)):
-                # process the symbol string
-                # discarded linestyle
-                _, marker, color = _process_plot_format(sym)
-                if marker is not None:
-                    flierprops['marker'] = marker
-                if color is not None:
-                    flierprops['color'] = color
-                    # assume that if color is passed in the user want
-                    # filled symbol
-                    flierprops['markeredgecolor'] = color
-                    flierprops['markerfacecolor'] = color
             final_flierprops.update(flierprops)
 
         # median line properties
@@ -5032,6 +5050,7 @@ def pcolormesh(self, *args, **kwargs):
 
           *edgecolors*: [*None* | ``'None'`` | ``'face'`` | color |
                          color sequence]
+
             If *None*, the rc setting is used by default.
 
             If ``'None'``, edges will not be visible.