Support Python 3.4 (fix #17)

Author: dittos

.travis.yml

@@ -2,6 +2,7 @@ language: python
 sudo: false
 python:
 - 2.7
+- 3.4
 install:
 - pip install pytest pytest-cov coveralls flake8
 - pip install -e .

graphql/core/compat.py

@@ -0,0 +1,19 @@
+try:
+    str_type = basestring
+    str_is_unicode = False
+except NameError:
+    str_type = str
+    str_is_unicode = True
+
+try:
+    unichr = unichr
+except NameError:
+    unichr = chr
+
+
+if str_is_unicode:
+    def native_str(s, errors=None):
+        return s
+else:
+    def native_str(s, errors=None):
+        return s.encode(errors=errors)

graphql/core/error.py

@@ -8,6 +8,7 @@ class Error(Exception):
 class GraphQLError(Error):
     def __init__(self, message, nodes=None, stack=None, source=None, positions=None):
         super(GraphQLError, self).__init__(message)
+        self.message = message
         self.nodes = nodes
         self.stack = stack or message
         self._source = source

graphql/core/execution/__init__.py

@@ -71,7 +71,7 @@ def __init__(self, schema, root, document_ast, operation_name, args):
             raise GraphQLError(
                 'Must provide operation name '
                 'if query contains multiple operations')
-        op_name = operation_name or operations.keys()[0]
+        op_name = operation_name or next(iter(operations.keys()))
         operation = operations.get(op_name)
         if not operation:
             raise GraphQLError('Unknown operation name: {}'.format(op_name))
@@ -106,7 +106,8 @@ def execute(schema, root, ast, operation_name='', args=None):
         data = None
     if not ctx.errors:
         return ExecutionResult(data)
-    return ExecutionResult(data, map(format_error, ctx.errors))
+    formatted_errors = list(map(format_error, ctx.errors))
+    return ExecutionResult(data, formatted_errors)
 
 
 def execute_operation(ctx, root, operation):

graphql/core/execution/values.py

@@ -1,4 +1,5 @@
 import collections
+from ..compat import str_type
 from ..error import GraphQLError
 from ..language import ast
 from ..language.printer import print_ast
@@ -85,7 +86,7 @@ def is_valid_value(type, value):
 
     if isinstance(type, GraphQLList):
         item_type = type.of_type
-        if not isinstance(value, basestring) and \
+        if not isinstance(value, str_type) and \
                 isinstance(value, collections.Iterable):
             return all(is_valid_value(item_type, item) for item in value)
         else:
@@ -125,7 +126,7 @@ def coerce_value(type, value):
 
     if isinstance(type, GraphQLList):
         item_type = type.of_type
-        if not isinstance(value, basestring) and isinstance(value, collections.Iterable):
+        if not isinstance(value, str_type) and isinstance(value, collections.Iterable):
             return [coerce_value(item_type, item) for item in value]
         else:
             return [coerce_value(item_type, value)]

graphql/core/language/error.py

@@ -1,3 +1,4 @@
+from ..compat import native_str
 from ..error import Error
 from .location import get_location
 
@@ -11,18 +12,14 @@ def __init__(self, source, position, description):
         self.description = description
 
     def __str__(self):
-        # FIXME
-        return unicode(self).encode(errors='replace')
-
-    def __unicode__(self):
         location = get_location(self.source, self.position)
-        return u'Syntax Error {} ({}:{}) {}\n\n{}'.format(
+        return native_str(u'Syntax Error {} ({}:{}) {}\n\n{}'.format(
             self.source.name,
             location.line,
             location.column,
             self.description,
             highlight_source_at_location(self.source, location),
-        )
+        ), errors='replace')
 
 
 def highlight_source_at_location(source, location):

graphql/core/language/lexer.py

@@ -1,3 +1,5 @@
+import json
+from ..compat import unichr
 from .error import LanguageError
 
 __all__ = ['Token', 'Lexer', 'TokenKind',
@@ -101,7 +103,7 @@ def get_token_kind_desc(kind):
 def char_code_at(s, pos):
     if 0 <= pos < len(s):
         return ord(s[pos])
-    return None
+    return 0
 
 
 PUNCT_CODE_TO_KIND = {
@@ -153,7 +155,7 @@ def read_token(source, from_position):
 
     raise LanguageError(
         source, position,
-        u'Unexpected character "{}"'.format(body[position]))
+        u'Unexpected character {}'.format(json.dumps(body[position])))
 
 
 def position_after_whitespace(body, start_position):
@@ -176,7 +178,7 @@ def position_after_whitespace(body, start_position):
             position += 1
             while position < body_length:
                 code = char_code_at(body, position)
-                if code is None or code in (10, 13, 0x2028, 0x2029):
+                if not code or code in (10, 13, 0x2028, 0x2029):
                     break
                 position += 1
         else:
@@ -273,7 +275,7 @@ def read_string(source, start):
 
     while position < len(body):
         code = char_code_at(body, position)
-        if code is None or code in (34, 10, 13, 0x2028, 0x2029):
+        if not code or code in (34, 10, 13, 0x2028, 0x2029):
             break
         position += 1
         if code == 92:  # \
@@ -349,7 +351,7 @@ def read_name(source, position):
     code = None
     while end != body_length:
         code = char_code_at(body, end)
-        if code is None or not (
+        if not code or not (
             code == 95 or  # _
             48 <= code <= 57 or  # 0-9
             65 <= code <= 90 or  # A-Z

graphql/core/language/parser.py

@@ -1,3 +1,4 @@
+from ..compat import str_type
 from .source import Source
 from .error import LanguageError
 from .lexer import Lexer, TokenKind, get_token_kind_desc, get_token_desc
@@ -11,7 +12,7 @@ def parse(source, **kwargs):
     options = {'no_location': False, 'no_source': False}
     options.update(kwargs)
     source_obj = source
-    if isinstance(source, basestring):
+    if isinstance(source, str_type):
         source_obj = Source(source)
     parser = Parser(source_obj, options)
     return parse_document(parser)

graphql/core/type/schema.py

@@ -1,3 +1,4 @@
+from functools import reduce
 from .definition import (
     GraphQLObjectType,
     GraphQLInterfaceType,

graphql/core/utils.py

@@ -107,7 +107,7 @@ def enter(self, node):
             arg_type = None
             field_or_directive = self.get_directive() or self.get_field_def()
             if field_or_directive:
-                arg_def = filter(lambda arg: arg.name == node.name.value, field_or_directive.args)
+                arg_def = [arg for arg in field_or_directive.args if arg.name == node.name.value]
                 if arg_def:
                     arg_def = arg_def[0]
                     arg_type = arg_def.type