merged unicode solution

katyhuff · katyhuff · commit cda758d9648f · 2013-06-29T22:04:58.000-05:00
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -71,7 +71,7 @@ def validate_path_exists(s):
 
 def validate_bool(b):
     """Convert b to a boolean or raise"""
-    if type(b) is str:
+    if isinstance(b, basestring):
         b = b.lower()
     if b in ('t', 'y', 'yes', 'on', 'true', '1', 1, True):
         return True
@@ -82,8 +82,8 @@ def validate_bool(b):
 
 
 def validate_bool_maybe_none(b):
-    'Convert b to a boolean or raise'
-    if type(b) is str:
+    """Convert b to a boolean, None, or raise"""
+    if isinstance(b, basestring):
         b = b.lower()
     if b == 'none':
         return None
@@ -177,7 +177,7 @@ def __init__(self, n):
 
     def __call__(self, s):
         """return a seq of n floats or raise"""
-        if type(s) is str:
+        if isinstance(s, basestring):
             ss = s.split(',')
             if len(ss) != self.n:
                 raise ValueError(
@@ -200,7 +200,7 @@ def __init__(self, n):
 
     def __call__(self, s):
         """return a seq of n ints or raise"""
-        if type(s) is str:
+        if isinstance(s, basestring):
             ss = s.split(',')
             if len(ss) != self.n:
                 raise ValueError(
@@ -252,7 +252,7 @@ def validate_color(s):
 
 def validate_colorlist(s):
     'return a list of colorspecs'
-    if type(s) is str:
+    if isinstance(s, basestring):
         return [validate_color(c.strip()) for c in s.split(',')]
     else:
         assert type(s) in [list, tuple]
@@ -266,9 +266,9 @@ def validate_string(s):
 
 def validate_stringlist(s):
     'return a list'
-    if type(s) in (str, unicode):
+    if isinstance(s, basestring):
         return [validate_string(v) for v in s.split(',')]
-    else:
+    else :
         assert type(s) in [list, tuple]
         return [str(v) for v in s]
 
@@ -287,7 +287,7 @@ def validate_aspect(s):
 
 
 def validate_fontsize(s):
-    if type(s) is str:
+    if isinstance(s, basestring):
         s = s.lower()
     if s in ['xx-small', 'x-small', 'small', 'medium', 'large', 'x-large',
              'xx-large', 'smaller', 'larger']:
@@ -340,7 +340,7 @@ def update_savefig_format(value):
 
 
 def validate_ps_distiller(s):
-    if type(s) is str:
+    if isinstance(s, basestring):
         s = s.lower()
 
     if s in ('none', None):
@@ -429,7 +429,7 @@ def validate_hinting(s):
 
 
 def validate_bbox(s):
-    if type(s) is str:
+    if isinstance(s, basestring):
         s = s.lower()
         if s == 'tight':
             return s
