Merge branch 'master' into move-tests-require-to-extras-require

Author: syrusakbary

.gitignore

@@ -4,6 +4,7 @@
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
+venv
 
 # C extensions
 *.so
@@ -61,6 +62,7 @@ target/
 
 # IntelliJ
 .idea
+*.iml
 
 # OS X
 .DS_Store

.travis.yml

@@ -6,36 +6,43 @@ python:
 - 3.4
 - 3.5
 - pypy
-cache: pip
 before_install:
-  - |
-      if [ "$TRAVIS_PYTHON_VERSION" = "pypy" ]; then
-        export PYENV_ROOT="$HOME/.pyenv"
-        if [ -f "$PYENV_ROOT/bin/pyenv" ]; then
-          cd "$PYENV_ROOT" && git pull
-        else
-          rm -rf "$PYENV_ROOT" && git clone --depth 1 https://github.com/yyuu/pyenv.git "$PYENV_ROOT"
-        fi
-        export PYPY_VERSION="4.0.1"
-        "$PYENV_ROOT/bin/pyenv" install "pypy-$PYPY_VERSION"
-        virtualenv --python="$PYENV_ROOT/versions/pypy-$PYPY_VERSION/bin/python" "$HOME/virtualenvs/pypy-$PYPY_VERSION"
-        source "$HOME/virtualenvs/pypy-$PYPY_VERSION/bin/activate"
-      fi
+- |
+  if [ "$TRAVIS_PYTHON_VERSION" = "pypy" ]; then
+    export PYENV_ROOT="$HOME/.pyenv"
+    if [ -f "$PYENV_ROOT/bin/pyenv" ]; then
+      cd "$PYENV_ROOT" && git pull
+    else
+      rm -rf "$PYENV_ROOT" && git clone --depth 1 https://github.com/yyuu/pyenv.git "$PYENV_ROOT"
+    fi
+    export PYPY_VERSION="4.0.1"
+    "$PYENV_ROOT/bin/pyenv" install "pypy-$PYPY_VERSION"
+    virtualenv --python="$PYENV_ROOT/versions/pypy-$PYPY_VERSION/bin/python" "$HOME/virtualenvs/pypy-$PYPY_VERSION"
+    source "$HOME/virtualenvs/pypy-$PYPY_VERSION/bin/activate"
+  fi
 install:
-- pip install --cache-dir $HOME/.cache/pip pytest-cov pytest-mock coveralls flake8 isort==3.9.6 gevent==1.1b5 six>=1.10.0 promise>=0.4.2
-- pip install --cache-dir $HOME/.cache/pip pytest>=2.7.3 --upgrade
+- pip install pytest-cov pytest-mock coveralls flake8 gevent==1.1b5 six>=1.10.0 promise>=0.4.2
+  pytest-benchmark
+- pip install pytest==2.9.2
 - pip install -e .
 script:
-- flake8
 - py.test --cov=graphql graphql tests
 after_success:
 - coveralls
 matrix:
   include:
-    - python: "3.5"
-      after_install:
-        - pip install pytest-asyncio
-      script:
-        - flake8
-        - isort --check-only graphql/ -rc
-        - py.test --cov=graphql graphql tests tests_py35
+  - python: '3.5'
+    after_install:
+    - pip install pytest-asyncio
+    script:
+    - py.test --cov=graphql graphql tests tests_py35
+  - python: '2.7'
+    script:
+    - flake8
+deploy:
+  provider: pypi
+  user: syrusakbary
+  on:
+    tags: true
+  password:
+    secure: q7kMxnJQ5LWr8fxVbQPm3pAXKRfYa1d2defM1UXKTQ+Gi6ZQ+QEOAOSbX1SKzYH62+hNRY2JGTeLkTQBeEYn05GJRh+WOkFzIFV1EnsgFbimSb6B83EmM57099GjJnO2nRUU4jyuNGU1joTeaD/g08ede072Es1I7DTuholNbYIq+brL/LQMJycuqZMoWUW4+pP8dE9SmjThMNYHlqNhzdXSE3BlZU0xcw7F2Ea384DNcekIIcapZuPjL167VouuSH/oMQMxBJo+ExEHdbqn5zsA9xcoF931XCgz4ag8U3jHhE48ZXM/xwdQt+S8JnOZcuv3MoAAioMbh+bYXUt2lmENWXCKK1kMDz2bJymwEUeZLA6lFxJQwvlVShowdi7xeyDYLIbeF7yG90Hd+5BqCZn5imzlcQxpjanaQq6xLwAzo6AHssWtd5bBOjDydknPxd1t3QGDoDvtfRdqrfOhlVX5813Hmd/vAopBAba7msKPMLxhsqDZKkwsVrLJLJDjGdpHNl/bbVaMsYcPrsFxa2W8PuddQFviHbL4HDNqHn5SpRwJcQ18YL1X5StQnUz1J+4E0W4mLrU3YW1k8RGlKTes/GeTH4sU+Sh3I9vrDv7849A8U9sSFyB2PT4Jyy8O2R5UyjoqnZDrkYYbLdn/caVo3ThrubTpwdPBmNwcDLA=

README.md

@@ -2,7 +2,7 @@
 
 GraphQL for Python.
 
-*This library is a port of [graphql-js](https://github.com/graphql/graphql-js) to Python.*
+*This library is a port of [graphql-js](https://github.com/graphql/graphql-js) to Python and currently is up-to-date with release [0.6.0](https://github.com/graphql/graphql-js/releases/tag/v0.6.0).*
 
 
 [![PyPI version](https://badge.fury.io/py/graphql-core.svg)](https://badge.fury.io/py/graphql-core)
@@ -20,7 +20,8 @@ For questions, ask [Stack Overflow](http://stackoverflow.com/questions/tagged/gr
 An overview of the GraphQL language is available in the 
 [README](https://github.com/facebook/graphql/blob/master/README.md) for the
 [Specification for GraphQL](https://github.com/facebook/graphql). 
-The overview describes a simple set of GraphQL examples that exist as [tests](tests/starwars)
+
+The overview describes a simple set of GraphQL examples that exist as [tests](https://github.com/graphql-python/graphql-core/tree/master/tests/)
 in this repository. A good way to get started is to walk through that README and the corresponding tests
 in parallel. 
 
@@ -62,7 +63,7 @@ schema = GraphQLSchema(
 This defines a simple schema with one type and one field, that resolves
 to a fixed value. The `resolve` function can return a value, a promise,
 or an array of promises. A more complex example is included in the top
-level [tests](tests) directory.
+level [tests](https://github.com/graphql-python/graphql-core/tree/master/tests/) directory.
 
 Then, serve the result of a query against that type schema.
 

graphql/__init__.py

@@ -33,7 +33,7 @@
     __GRAPHQL_SETUP__ = False
 
 
-VERSION = (0, 5, 3, 'final', 0)
+VERSION = (1, 0, 1, 'final', 0)
 
 __version__ = get_version(VERSION)
 
@@ -58,15 +58,49 @@
         GraphQLList,
         GraphQLNonNull,
         GraphQLField,
+        GraphQLInputObjectField,
         GraphQLArgument,
 
+        # "Enum" of Type Kinds
+        TypeKind,
+
+        # "Enum" of Directive locations
+        DirectiveLocation,
+
         # Scalars
         GraphQLInt,
         GraphQLFloat,
         GraphQLString,
         GraphQLBoolean,
         GraphQLID,
 
+        # Directive definition
+        GraphQLDirective,
+
+        # Built-in directives defined by the Spec
+        specified_directives,
+        GraphQLSkipDirective,
+        GraphQLIncludeDirective,
+        GraphQLDeprecatedDirective,
+
+        # Constant Deprecation Reason
+        DEFAULT_DEPRECATION_REASON,
+
+        # GraphQL Types for introspection.
+        __Schema,
+        __Directive,
+        __DirectiveLocation,
+        __Type,
+        __Field,
+        __InputValue,
+        __EnumValue,
+        __TypeKind,
+
+        # Meta-field definitions.
+        SchemaMetaFieldDef,
+        TypeMetaFieldDef,
+        TypeNameMetaFieldDef,
+
         # Predicates
         is_type,
         is_input_type,
@@ -102,6 +136,8 @@
     # Execute GraphQL queries.
     from .execution import (  # no import order
         execute,
+        MiddlewareManager,
+        middlewares
     )
 
     # Validate GraphQL queries.
@@ -180,12 +216,32 @@
         'GraphQLList',
         'GraphQLNonNull',
         'GraphQLField',
+        'GraphQLInputObjectField',
         'GraphQLArgument',
         'GraphQLObjectType',
         'GraphQLScalarType',
         'GraphQLSchema',
         'GraphQLString',
         'GraphQLUnionType',
+        'GraphQLDirective',
+        'specified_directives',
+        'GraphQLSkipDirective',
+        'GraphQLIncludeDirective',
+        'GraphQLDeprecatedDirective',
+        'DEFAULT_DEPRECATION_REASON',
+        'TypeKind',
+        'DirectiveLocation',
+        '__Schema',
+        '__Directive',
+        '__DirectiveLocation',
+        '__Type',
+        '__Field',
+        '__InputValue',
+        '__EnumValue',
+        '__TypeKind',
+        'SchemaMetaFieldDef',
+        'TypeMetaFieldDef',
+        'TypeNameMetaFieldDef',
         'get_named_type',
         'get_nullable_type',
         'is_abstract_type',
@@ -204,6 +260,8 @@
         'print_ast',
         'visit',
         'execute',
+        'MiddlewareManager',
+        'middlewares',
         'specified_rules',
         'validate',
         'GraphQLError',

graphql/error/base.py

@@ -1,3 +1,4 @@
+import six
 from ..language.location import get_location
 
 
@@ -29,6 +30,12 @@ def positions(self):
             if any(node_positions):
                 return node_positions
 
+    def reraise(self):
+        if self.stack:
+            six.reraise(type(self), self, self.stack)
+        else:
+            raise self
+
     @property
     def locations(self):
         source = self.source

graphql/error/located_error.py

@@ -9,7 +9,10 @@ class GraphQLLocatedError(GraphQLError):
 
     def __init__(self, nodes, original_error=None):
         if original_error:
-            message = str(original_error)
+            try:
+                message = str(original_error)
+            except UnicodeEncodeError:
+                message = original_error.message.encode('utf-8')
         else:
             message = 'An unknown error occurred.'
 

graphql/error/tests/__init__.py

@@ -0,0 +1,50 @@
+import pytest
+import traceback
+
+from graphql.execution import execute
+from graphql.language.parser import parse
+from graphql.type import (GraphQLField, GraphQLObjectType, GraphQLSchema,
+                          GraphQLString)
+
+
+def test_raise():
+    ast = parse('query Example { a }')
+
+    def resolver(context, *_):
+        raise Exception('Failed')
+
+    Type = GraphQLObjectType('Type', {
+        'a': GraphQLField(GraphQLString, resolver=resolver),
+    })
+
+    result = execute(GraphQLSchema(Type), ast)
+    assert str(result.errors[0]) == 'Failed'
+
+
+def test_reraise():
+    ast = parse('query Example { a }')
+
+    def resolver(context, *_):
+        raise Exception('Failed')
+
+    Type = GraphQLObjectType('Type', {
+        'a': GraphQLField(GraphQLString, resolver=resolver),
+    })
+
+    result = execute(GraphQLSchema(Type), ast)
+    with pytest.raises(Exception) as exc_info:
+        result.errors[0].reraise()
+
+    extracted = traceback.extract_tb(exc_info.tb)
+    formatted_tb = [row[2:] for row in extracted]
+    if formatted_tb[2][0] == 'reraise':
+        formatted_tb[2:] = formatted_tb[3:]
+    
+    assert formatted_tb == [
+        ('test_reraise', 'result.errors[0].reraise()'),
+        ('reraise', 'six.reraise(type(self), self, self.stack)'),
+        # ('reraise', 'raise value.with_traceback(tb)'),
+        ('resolve_or_error', 'return executor.execute(resolve_fn, source, args, context, info)'),
+        ('execute', 'return fn(*args, **kwargs)'), ('resolver', "raise Exception('Failed')")
+    ]
+    assert str(exc_info.value) == 'Failed'

graphql/error/tests/test_base.py

@@ -20,6 +20,7 @@
 """
 from .executor import execute
 from .base import ExecutionResult
+from .middleware import middlewares, MiddlewareManager
 
 
-__all__ = ['execute', 'ExecutionResult']
+__all__ = ['execute', 'ExecutionResult', 'MiddlewareManager', 'middlewares']

graphql/execution/__init__.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from ..error import GraphQLError
 from ..language import ast
+from ..pyutils.default_ordered_dict import DefaultOrderedDict
 from ..type.definition import GraphQLInterfaceType, GraphQLUnionType
 from ..type.directives import GraphQLIncludeDirective, GraphQLSkipDirective
 from ..type.introspection import (SchemaMetaFieldDef, TypeMetaFieldDef,
@@ -18,9 +19,9 @@ class ExecutionContext(object):
     and the fragments defined in the query document"""
 
     __slots__ = 'schema', 'fragments', 'root_value', 'operation', 'variable_values', 'errors', 'context_value', \
-                'argument_values_cache', 'executor'
+                'argument_values_cache', 'executor', 'middleware', '_subfields_cache'
 
-    def __init__(self, schema, document_ast, root_value, context_value, variable_values, operation_name, executor):
+    def __init__(self, schema, document_ast, root_value, context_value, variable_values, operation_name, executor, middleware):
         """Constructs a ExecutionContext object from the arguments passed
         to execute, which we will pass throughout the other execution
         methods."""
@@ -63,6 +64,13 @@ def __init__(self, schema, document_ast, root_value, context_value, variable_val
         self.context_value = context_value
         self.argument_values_cache = {}
         self.executor = executor
+        self.middleware = middleware
+        self._subfields_cache = {}
+
+    def get_field_resolver(self, field_resolver):
+        if not self.middleware:
+            return field_resolver
+        return self.middleware.get_field_resolver(field_resolver)
 
     def get_argument_values(self, field_def, field_ast):
         k = field_def, field_ast
@@ -74,6 +82,21 @@ def get_argument_values(self, field_def, field_ast):
 
         return result
 
+    def get_sub_fields(self, return_type, field_asts):
+        k = return_type, tuple(field_asts)
+        if k not in self._subfields_cache:
+            subfield_asts = DefaultOrderedDict(list)
+            visited_fragment_names = set()
+            for field_ast in field_asts:
+                selection_set = field_ast.selection_set
+                if selection_set:
+                    subfield_asts = collect_fields(
+                        self, return_type, selection_set,
+                        subfield_asts, visited_fragment_names
+                    )
+            self._subfields_cache[k] = subfield_asts
+        return self._subfields_cache[k]
+
 
 class ExecutionResult(object):
     """The result of execution. `data` is the result of executing the
@@ -245,6 +268,8 @@ def get_field_entry_key(node):
 
 
 class ResolveInfo(object):
+    __slots__ = ('field_name', 'field_asts', 'return_type', 'parent_type',
+                 'schema', 'fragments', 'root_value', 'operation', 'variable_values')
 
     def __init__(self, field_name, field_asts, return_type, parent_type,
                  schema, fragments, root_value, operation, variable_values):
@@ -277,10 +302,10 @@ def get_field_def(schema, parent_type, field_name):
     are allowed, like on a Union. __schema could get automatically
     added to the query type, but that would require mutating type
     definitions, which would cause issues."""
-    if field_name == SchemaMetaFieldDef.name and schema.get_query_type() == parent_type:
+    if field_name == '__schema' and schema.get_query_type() == parent_type:
         return SchemaMetaFieldDef
-    elif field_name == TypeMetaFieldDef.name and schema.get_query_type() == parent_type:
+    elif field_name == '__type' and schema.get_query_type() == parent_type:
         return TypeMetaFieldDef
-    elif field_name == TypeNameMetaFieldDef.name:
+    elif field_name == '__typename':
         return TypeNameMetaFieldDef
-    return parent_type.get_fields().get(field_name)
+    return parent_type.fields.get(field_name)