unicode test passes

katyhuff · katyhuff · commit 1976db58cf4d · 2013-06-29T22:25:52.000-05:00
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -144,6 +144,7 @@ def validate_backend(s):
     else:
         return _validate_standard_backends(s)
 
+
 validate_qt4 = ValidateInStrings('backend.qt4', ['PyQt4', 'PySide'])
 
 
@@ -264,13 +265,14 @@ def validate_string(s):
     assert isinstance(s, basestring)
     return s.strip("'").strip()
 
+
 def validate_stringlist(s):
     'return a list'
     if isinstance(s, basestring):
         return [validate_string(v) for v in s.split(',')]
     else :
         assert type(s) in [list, tuple]
-        return [str(v) for v in s]
+        return [validate_string(v) for v in s]
 
 
 validate_orientation = ValidateInStrings(
diff --git a/lib/matplotlib/tests/test_rcsetup.py b/lib/matplotlib/tests/test_rcsetup.py
@@ -25,12 +25,15 @@ def test_template():
                     assert mpl.rcParams[k] == v[0]
 
 def test_unicode():
-    # unicode formatted valid strings should validate.
+    # unicode formatted valid strings should validate successfully
     for k, v in mpl.rcsetup.defaultParams.iteritems():
-        if v[0] != v[1](unicode(v[0])):
-            print "Expected : ", v[0]
-            print "Actual : ", v[1](unicode(v[0]))
-        assert v[0] == v[1](unicode(v[0]))
+        if k not in deprecated:
+            if isinstance(v[0], basestring):
+                u = v[1](unicode(v[0]))
+                if u not in [v[0], v[0].lower()] :
+                    print "Expected : ", v[0]
+                    print "Actual : ", u
+                assert u in [v[0], v[0].lower()]
 
 
 if __name__ == '__main__':
