Merge pull request #7881 from QuLogic/freetype-version

anntzer · web-flow · commit fb3a2eb9a55d · 2017-01-23T13:30:22.000-08:00
[MRG+1] Fix inverted expected/found FreeType version warning.
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1565,8 +1565,8 @@ def _init_tests():
             "Expected freetype version {0}. "
             "Found freetype version {1}. "
             "Freetype build type is {2}local".format(
-                ft2font.__freetype_version__,
                 LOCAL_FREETYPE_VERSION,
+                ft2font.__freetype_version__,
                 "" if ft2font.__freetype_build_type__ == 'local' else "not "
             )
         )

Original file line number	Diff line number	Diff line change
`@@ -1565,8 +1565,8 @@ def _init_tests():`
`1565`	`1565`	`"Expected freetype version {0}. "`
`1566`	`1566`	`"Found freetype version {1}. "`
`1567`	`1567`	`"Freetype build type is {2}local".format(`
`1568`		`- ft2font.__freetype_version__,`
`1569`	`1568`	`LOCAL_FREETYPE_VERSION,`
	`1569`	`+ ft2font.__freetype_version__,`
`1570`	`1570`	`"" if ft2font.__freetype_build_type__ == 'local' else "not "`
`1571`	`1571`	`)`
`1572`	`1572`	`)`