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

Conflicts:
	lib/matplotlib/backends/qt4_editor/formlayout.py
	setupext.py

Author: mdboom

lib/matplotlib/__init__.py

@@ -129,18 +129,21 @@ def compare_versions(a, b):
         raise ImportError(
             "matplotlib requires pyparsing >= 1.5.6")
 
-    if pyparsing.__version__ == '2.0.0':
-        raise ImportError(
-            "pyparsing 2.0.0 has bugs that prevent its use with "
-            "matplotlib")
+    # pyparsing 2.0.0 bug, but it may be patched in distributions
+    try:
+        f = pyparsing.Forward()
+        f <<= pyparsing.Literal('a')
+        bad_pyparsing = f is None
+    except:
+        bad_pyparsing = True
 
     # pyparsing 1.5.6 does not have <<= on the Forward class, but
     # pyparsing 2.0.0 and later will spew deprecation warnings if
     # using << instead.  Additionally, the <<= in pyparsing 1.5.7 is
     # broken, since it doesn't return self.  In order to support
     # pyparsing 1.5.6 and above with a common code base, this small
     # monkey patch is applied.
-    if not compare_versions(pyparsing.__version__, '2.0.1'):
+    if bad_pyparsing:
         def _forward_ilshift(self, other):
             self.__lshift__(other)
             return self

lib/matplotlib/axes/_axes.py

@@ -3250,7 +3250,8 @@ def scatter(self, x, y, s=20, c='b', marker='o', cmap=None, norm=None,
         edgecolors = kwargs.get('edgecolors', None)
         if faceted is not None:
             cbook.warn_deprecated(
-                '1.2', 'faceted', alternative='edgecolor', obj_type='option')
+                '1.2', name='faceted', alternative='edgecolor',
+                obj_type='option')
             if faceted:
                 edgecolors = None
             else:
@@ -4507,7 +4508,8 @@ def pcolor(self, *args, **kwargs):
         vmax = kwargs.pop('vmax', None)
         if 'shading' in kwargs:
             cbook.warn_deprecated(
-                '1.2', 'shading', alternative='edgecolors', obj_type='option')
+                '1.2', name='shading', alternative='edgecolors',
+                obj_type='option')
         shading = kwargs.pop('shading', 'flat')
 
         X, Y, C = self._pcolorargs('pcolor', *args, allmatch=False)

lib/matplotlib/backends/backend_pdf.py

@@ -1550,6 +1550,7 @@ def draw_path_collection(self, gc, master_transform, paths, all_transforms,
 
         if not len(facecolors):
             filled = False
+            can_do_optimization = not gc.get_hatch()
         else:
             if np.all(facecolors[:, 3] == facecolors[0, 3]):
                 filled = facecolors[0, 3] != 0.0

lib/matplotlib/backends/qt4_editor/formlayout.py

@@ -92,6 +92,9 @@ def set_color(self, color):
 
     color = QtCore.Property("QColor", get_color, set_color)
 
+def col2hex(color):
+    """Convert matplotlib color to hex before passing to Qt"""
+    return rgb2hex(colorConverter.to_rgb(color))
 
 def to_qcolor(color):
     """Create a QColor from a matplotlib color"""

lib/matplotlib/cbook.py

@@ -120,7 +120,7 @@ def new_function():
         The object type being deprecated.
     """
     message = _generate_deprecation_message(
-        since, message, name, alternative, pending, 'function')
+        since, message, name, alternative, pending, obj_type)
 
     warnings.warn(message, mplDeprecation, stacklevel=1)
 

lib/matplotlib/mpl.py

@@ -6,7 +6,7 @@
 import warnings
 from matplotlib import cbook
 cbook.warn_deprecated(
-    '1.3', 'matplotlib.mpl', alternative='`import matplotlib as mpl`',
+    '1.3', name='matplotlib.mpl', alternative='`import matplotlib as mpl`',
     obj_type='module')
 from matplotlib import artist
 from matplotlib import axis

lib/matplotlib/tests/__init__.py

@@ -14,7 +14,7 @@ def setup():
     # The baseline images are created in this locale, so we should use
     # it during all of the tests.
     import locale
-    locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')
+    locale.setlocale(locale.LC_ALL, str('en_US.UTF-8'))
 
     use('Agg', warn=False) # use Agg backend for these tests