Ensure that all messages passed to LanguageError is unicode

Author: jhgg

graphql/core/language/lexer.py

@@ -14,11 +14,11 @@ def __init__(self, kind, start, end, value=None):
         self.value = value
 
     def __repr__(self):
-        return '<Token kind={} at {}..{} value={}>'.format(
+        return u'<Token kind={} at {}..{} value={}>'.format(
             get_token_kind_desc(self.kind),
             self.start,
             self.end,
-            self.value if self.value is not None else 'None'
+            repr(self.value)
         )
 
     def __eq__(self, other):
@@ -65,7 +65,7 @@ class TokenKind(object):
 
 def get_token_desc(token):
     if token.value:
-        return '{} "{}"'.format(
+        return u'{} "{}"'.format(
             get_token_kind_desc(token.kind),
             token.value
         )

graphql/core/language/parser.py

@@ -77,7 +77,7 @@ def expect(parser, kind):
     raise LanguageError(
         parser.source,
         token.start,
-        'Expected {}, found {}'.format(
+        u'Expected {}, found {}'.format(
             get_token_kind_desc(kind),
             get_token_desc(token)
         )
@@ -95,7 +95,7 @@ def expect_keyword(parser, value):
     raise LanguageError(
         parser.source,
         token.start,
-        'Expected "{}", found {}'.format(value, get_token_desc(token))
+        u'Expected "{}", found {}'.format(value, get_token_desc(token))
     )
 
 
@@ -106,7 +106,7 @@ def unexpected(parser, at_token=None):
     return LanguageError(
         parser.source,
         token.start,
-        'Unexpected {}'.format(get_token_desc(token))
+        u'Unexpected {}'.format(get_token_desc(token))
     )
 
 
@@ -393,7 +393,7 @@ def parse_object_field(parser, is_const, field_names):
         raise LanguageError(
             parser.source,
             start,
-            "Duplicate input object field {}.".format(name.value)
+            u"Duplicate input object field {}.".format(name.value)
         )
     field_names.add(name.value)
     return ast.ObjectField(