Modernize execute function

Author: syrusakbary

graphql/execution/executor.py

@@ -2,6 +2,7 @@
 import functools
 import logging
 import sys
+import warnings
 from rx import Observable
 
 from six import string_types
@@ -28,9 +29,31 @@ def subscribe(*args, **kwargs):
  return execute(*args, allow_subscriptions=allow_subscriptions, **kwargs)
 
 
-def execute(schema, document_ast, root_value=None, context_value=None,
- variable_values=None, operation_name=None, executor=None,
- return_promise=False, middleware=None, allow_subscriptions=False):
+def execute(schema, document_ast, root=None, context=None,
+ variables=None, operation_name=None, executor=None,
+ return_promise=False, middleware=None, allow_subscriptions=False, **options):
+
+ if root is None and 'root_value' in options:
+ warnings.warn(
+ 'root_value has been deprecated. Please use root=... instead.',
+ category=DeprecationWarning,
+ stacklevel=2
+ )
+ root = options['root_value']
+ if context is None and 'context_value' in options:
+ warnings.warn(
+ 'context_value has been deprecated. Please use context=... instead.',
+ category=DeprecationWarning,
+ stacklevel=2
+ )
+ context = options['context_value']
+ if variables is None and 'variable_values' in options:
+ warnings.warn(
+ 'variable_values has been deprecated. Please use values=... instead.',
+ category=DeprecationWarning,
+ stacklevel=2
+ )
+ variables = options['variable_values']
  assert schema, 'Must provide schema'
  assert isinstance(schema, GraphQLSchema), (
  'Schema must be an instance of GraphQLSchema. Also ensure that there are ' +
@@ -49,38 +72,38 @@ def execute(schema, document_ast, root_value=None, context_value=None,
  if executor is None:
  executor = SyncExecutor()
 
- context = ExecutionContext(
+ exe_context = ExecutionContext(
  schema,
  document_ast,
- root_value,
- context_value,
- variable_values,
+ root,
+ context,
+ variables or {},
  operation_name,
  executor,
  middleware,
  allow_subscriptions
  )
 
  def executor(v):
- return execute_operation(context, context.operation, root_value)
+ return execute_operation(exe_context, exe_context.operation, root)
 
  def on_rejected(error):
- context.errors.append(error)
+ exe_context.errors.append(error)
  return None
 
  def on_resolve(data):
  if isinstance(data, Observable):
  return data
 
- if not context.errors:
+ if not exe_context.errors:
  return ExecutionResult(data=data)
 
- return ExecutionResult(data=data, errors=context.errors)
+ return ExecutionResult(data=data, errors=exe_context.errors)
 
  promise = Promise.resolve(None).then(executor).catch(on_rejected).then(on_resolve)
 
  if not return_promise:
- context.executor.wait_until_finished()
+ exe_context.executor.wait_until_finished()
  return promise.get()
 
  return promise

graphql/graphql.py

@@ -38,9 +38,9 @@ def graphql(*args, **kwargs):
  return execute_graphql(*args, **kwargs)
 
 
-def execute_graphql(schema, request_string='', root_value=None, context_value=None,
- variable_values=None, operation_name=None, executor=None,
- return_promise=False, middleware=None, allow_subscriptions=False):
+def execute_graphql(schema, request_string='', root=None, context=None,
+ variables=None, operation_name=None, executor=None,
+ return_promise=False, middleware=None, allow_subscriptions=False, **old_options):
  try:
  if isinstance(request_string, Document):
  ast = request_string
@@ -56,14 +56,15 @@ def execute_graphql(schema, request_string='', root_value=None, context_value=No
  return execute(
  schema,
  ast,
- root_value,
- context_value,
+ root=root,
+ context=context,
  operation_name=operation_name,
- variable_values=variable_values or {},
+ variables=variables,
  executor=executor,
  middleware=middleware,
  return_promise=return_promise,
  allow_subscriptions=allow_subscriptions,
+ **old_options
  )
  except Exception as e:
  return ExecutionResult(