Merge pull request #6601 from matthew-brett/protect-against-locale

tacaswell · tacaswell · commit 76fd818efdde · 2016-07-09T22:10:48.000-04:00
BF: protect against locale in sphinext text

Conflicts:
	lib/matplotlib/sphinxext/tests/test_tinypages.py
	    backport minimal changes
diff --git a/lib/matplotlib/sphinxext/tests/test_tinypages.py b/lib/matplotlib/sphinxext/tests/test_tinypages.py
@@ -80,6 +80,6 @@ def plot_file(num):
         # Plot 13 shows close-figs in action
         assert_true(file_same(range_4, plot_file(13)))
         # Plot 14 has included source
-        with open(pjoin(self.html_dir, 'some_plots.html'), 'rt') as fobj:
+        with open(pjoin(self.html_dir, 'some_plots.html'), 'rb') as fobj:
             html_contents = fobj.read()
-        assert_true('# Only a comment' in html_contents)
+        assert_true(b'# Only a comment' in html_contents)
