Merge pull request #6361 from theotherjimmy/unicode-options

Convert option list to unicode

tools/utils.py

@@ -393,6 +393,8 @@ def argparse_force_type(case):
     """
     def middle(lst, type_name):
         """ The parser type generator"""
+        if not isinstance(lst[0], unicode):
+            lst = [o.decode() for o in lst]
         def parse_type(string):
             """ The parser type"""
             if not isinstance(string, unicode):