Skip to content

Commit 3fa0d0a

Browse files
committed
Improved naming and PEP8 issues.
1 parent 5cdc117 commit 3fa0d0a

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

graphql/execution/executor.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
from ..pyutils.ordereddict import OrderedDict
77

8-
from promise import Promise, is_thenable, promise_for_dict, promisify
8+
from promise import Promise, promise_for_dict, promisify
99

1010
from ..error import GraphQLError, GraphQLLocatedError
1111
from ..pyutils.default_ordered_dict import DefaultOrderedDict
@@ -21,7 +21,7 @@
2121
logger = logging.getLogger(__name__)
2222

2323

24-
def is_thenable(obj):
24+
def is_promise(obj):
2525
return type(obj) == Promise
2626

2727

@@ -98,7 +98,7 @@ def execute_field_callback(results, response_name):
9898
if result is Undefined:
9999
return results
100100

101-
if is_thenable(result):
101+
if is_promise(result):
102102
def collect_result(resolved_result):
103103
results[response_name] = resolved_result
104104
return results
@@ -125,7 +125,7 @@ def execute_fields(exe_context, parent_type, source_value, fields):
125125
continue
126126

127127
final_results[response_name] = result
128-
if is_thenable(result):
128+
if is_promise(result):
129129
contains_promise = True
130130

131131
if not contains_promise:
@@ -204,7 +204,7 @@ def complete_value_catching_error(exe_context, return_type, field_asts, info, re
204204
# resolving a null value for this field if one is encountered.
205205
try:
206206
completed = complete_value(exe_context, return_type, field_asts, info, result)
207-
if is_thenable(completed):
207+
if is_promise(completed):
208208
def handle_error(error):
209209
exe_context.errors.append(error)
210210
return Promise.fulfilled(None)
@@ -238,7 +238,7 @@ def complete_value(exe_context, return_type, field_asts, info, result):
238238
"""
239239
# If field type is NonNull, complete for inner type, and throw field error if result is null.
240240

241-
if is_thenable(result):
241+
if is_promise(result):
242242
return promisify(result).then(
243243
lambda resolved: complete_value(
244244
exe_context,
@@ -290,7 +290,7 @@ def complete_list_value(exe_context, return_type, field_asts, info, result):
290290
contains_promise = False
291291
for item in result:
292292
completed_item = complete_value_catching_error(exe_context, item_type, field_asts, info, item)
293-
if not contains_promise and is_thenable(completed_item):
293+
if not contains_promise and is_promise(completed_item):
294294
contains_promise = True
295295

296296
completed_results.append(completed_item)

graphql/type/definition.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ def is_same_type(self, other):
9292
def none_func(x):
9393
None
9494

95+
9596
class GraphQLScalarType(GraphQLType):
9697
"""Scalar Type Definition
9798

0 commit comments

Comments
 (0)