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

mdboom · mdboom · commit ff227d3e366c · 2013-09-04T11:46:47.000-04:00
Conflicts:
	lib/matplotlib/tests/__init__.py
	lib/matplotlib/tests/test_backend_pdf.py
	lib/matplotlib/tests/test_bbox_tight.py
diff --git a/doc/_templates/index.html b/doc/_templates/index.html
@@ -129,6 +129,10 @@ <h4>Other learning resources</h4>
 
   <h4>Need help?</h4>
 
+<p>matplotlib is a welcoming, inclusive project, and we try to follow
+the <a href="http://www.python.org/psf/codeofconduct/">Python Software
+Foundation Code of Conduct</a> in everything we do.</p>
+
 <p>Check the <a href="{{ pathto('faq/index') }}">faq</a>,
 the <a href="{{ pathto('api/index') }}">api</a> docs,
 <a href="http://matplotlib.1069221.n5.nabble.com/matplotlib-users-f3.html">mailing
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1038,6 +1038,7 @@ def rcdefaults():
     the rc file, but mpl's internal params.  See rc_file_defaults for
     reloading the default params from the rc file
     """
+    rcParams.clear()
     rcParams.update(rcParamsDefault)
 
 
diff --git a/lib/matplotlib/tests/__init__.py b/lib/matplotlib/tests/__init__.py
@@ -11,7 +11,12 @@
 
 
 def setup():
-    use('Agg', warn=False)  # use Agg backend for these tests
+    # 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')
+
+    use('Agg', warn=False) # use Agg backend for these tests
 
     # These settings *must* be hardcoded for running the comparison
     # tests and are not necessarily the default values as specified in
diff --git a/lib/matplotlib/tests/test_backend_pdf.py b/lib/matplotlib/tests/test_backend_pdf.py
@@ -13,27 +13,18 @@
 from matplotlib import pyplot as plt
 from matplotlib.testing.decorators import image_comparison, knownfailureif, cleanup
 
-
-# if 'TRAVIS' not in os.environ:
-#     @image_comparison(baseline_images=['pdf_use14corefonts'], extensions=['pdf'])
-#     def test_use14corefonts():
-#         rcParams['pdf.use14corefonts'] = True
-#         rcParams['font.family'] = 'sans-serif'
-#         rcParams['font.size'] = 8
-#         rcParams['font.sans-serif'] = ['Helvetica']
-
-#         title = 'Test PDF backend with option use14corefonts=True'
-
-#         text = '''A three-line text positioned just above a blue line
-#         and containing some French characters and the euro symbol:
-#         "Merci pépé pour les 10 €"'''
-
-#         plt.figure()
-#         plt.title(title)
-#         plt.text(0.5, 0.5, text, horizontalalignment='center',
-#                  verticalalignment='bottom',
-#                  fontsize=24)
-#         plt.axhline(0.5, linewidth=0.5)
+if 'TRAVIS' not in os.environ:
+    @image_comparison(baseline_images=['pdf_use14corefonts'], extensions=['pdf'])
+    def test_use14corefonts():
+        rcParams['pdf.use14corefonts'] = True
+        rcParams['font.family'] = 'sans-serif'
+        rcParams['font.size'] = 8
+        rcParams['font.sans-serif'] = ['Helvetica']
+        rcParams['pdf.compression'] = 0
+
+        text = u'''A three-line text positioned just above a blue line
+    and containing some French characters and the euro symbol:
+    "Merci pépé pour les 10 €"'''
 
 
 @cleanup
diff --git a/lib/matplotlib/tests/test_bbox_tight.py b/lib/matplotlib/tests/test_bbox_tight.py
@@ -5,7 +5,7 @@
 
 import numpy as np
 
-from matplotlib import rcParams, rcParamsDefault
+from matplotlib import rcParams
 from matplotlib.testing.decorators import image_comparison
 import matplotlib.pyplot as plt
 import matplotlib.path as mpath
@@ -17,8 +17,6 @@
                   savefig_kwarg=dict(bbox_inches='tight'), tol=15)
 def test_bbox_inches_tight():
     #: Test that a figure saved using bbox_inches='tight' is clipped right
-    rcParams.update(rcParamsDefault)
-
     data = [[ 66386, 174296,  75131, 577908,  32015],
             [ 58230, 381139,  78045,  99308, 160454],
             [ 89135,  80552, 152558, 497981, 603535],
diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py
@@ -7,7 +7,7 @@
 import matplotlib
 from matplotlib.testing.decorators import image_comparison, knownfailureif
 import matplotlib.pyplot as plt
-from matplotlib import rcParams, rcParamsDefault
+from matplotlib import rcParams
 from matplotlib.colors import BoundaryNorm
 from matplotlib.cm import get_cmap
 from matplotlib.colorbar import ColorbarBase
@@ -102,8 +102,6 @@ def _colorbar_extension_length(spacing):
         extensions=['png'])
 def test_colorbar_extension_shape():
     '''Test rectangular colorbar extensions.'''
-    # Use default params so matplotlibrc doesn't cause the test to fail.
-    rcParams.update(rcParamsDefault)
     # Create figures for uniform and proportionally spaced colorbars.
     fig1 = _colorbar_extension_shape('uniform')
     fig2 = _colorbar_extension_shape('proportional')
@@ -114,8 +112,6 @@ def test_colorbar_extension_shape():
                   extensions=['png'])
 def test_colorbar_extension_length():
     '''Test variable length colorbar extensions.'''
-    # Use default params so matplotlibrc doesn't cause the test to fail.
-    rcParams.update(rcParamsDefault)
     # Create figures for uniform and proportionally spaced colorbars.
     fig1 = _colorbar_extension_length('uniform')
     fig2 = _colorbar_extension_length('proportional')
diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
@@ -267,7 +267,7 @@ def test_image_composite_alpha():
     ax.set_ylim([5, 0])
 
 
-@image_comparison(baseline_images=['rasterize_10dpi'], extensions=['pdf','svg'], tol=1.5e-3, remove_text=True)
+@image_comparison(baseline_images=['rasterize_10dpi'], extensions=['pdf','svg'], tol=5e-2, remove_text=True)
 def test_rasterize_dpi():
     # This test should check rasterized rendering with high output resolution.
     # It plots a rasterized line and a normal image with implot. So it will catch
