TST: tweak and whitelist test

tacaswell · tacaswell · commit 7cdab8873a03 · 2017-03-13T16:03:08.000-04:00
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1472,6 +1472,7 @@ def tk_window_focus():
 
 default_test_modules = [
     'matplotlib.tests.test_agg',
+    'matplotlib.tests.test_afm',
     'matplotlib.tests.test_animation',
     'matplotlib.tests.test_arrow_patches',
     'matplotlib.tests.test_artist',
diff --git a/lib/matplotlib/tests/test_afm.py b/lib/matplotlib/tests/test_afm.py
@@ -8,9 +8,8 @@
 def test_nonascii_str():
     # This tests that we also decode bytes as utf-8 properly.
     # Else, font files with non ascii caracters fail to load.
+    inp_str = "привет"
+    byte_str = inp_str.encode("utf8")
 
-    if six.PY3:
-        string = "привет".encode("utf8")
-    else:
-        string = "привет"
-    afm._to_str(string)
+    ret = afm._to_str(byte_str)
+    assert ret == inp_str
