Minor typing and linting fixes

graphql-python · Jul 7, 2024 · 331c7bc · 331c7bc
1 parent 9f19b40
commit 331c7bc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/src/graphql/execution/collect_fields.py b/src/graphql/execution/collect_fields.py
@@ -281,10 +281,7 @@ def should_include_node(
         return False
 
     include = get_directive_values(GraphQLIncludeDirective, node, variable_values)
-    if include and not include["if"]:
-        return False
-
-    return True
+    return not (include and not include["if"])
 
 
 def does_fragment_condition_match(

diff --git a/src/graphql/execution/execute.py b/src/graphql/execution/execute.py
@@ -354,7 +354,7 @@ class ExecutionContext(IncrementalPublisherMixin):
     middleware_manager: MiddlewareManager | None
 
     is_awaitable: Callable[[Any], TypeGuard[Awaitable]] = staticmethod(
-        default_is_awaitable  # type: ignore
+        default_is_awaitable
     )
 
     def __init__(
@@ -1113,13 +1113,13 @@ async def get_completed_results() -> list[Any]:
                 index = awaitable_indices[0]
                 completed_results[index] = await completed_results[index]
             else:
-                for index, result in zip(
+                for index, sub_result in zip(
                     awaitable_indices,
                     await gather(
                         *(completed_results[index] for index in awaitable_indices)
                     ),
                 ):
-                    completed_results[index] = result
+                    completed_results[index] = sub_result
             return completed_results
 
         return get_completed_results()

diff --git a/src/graphql/language/block_string.py b/src/graphql/language/block_string.py
@@ -97,7 +97,7 @@ def is_printable_as_block_string(value: str) -> bool:
     if is_empty_line:
         return False  # has trailing empty lines
 
-    if has_common_indent and seen_non_empty_line:
+    if has_common_indent and seen_non_empty_line:  # noqa: SIM103
         return False  # has internal indent
 
     return True

diff --git a/src/graphql/type/definition.py b/src/graphql/type/definition.py
@@ -783,7 +783,7 @@ def fields(self) -> GraphQLFieldMap:
         """Get provided fields, wrapping them as GraphQLFields if needed."""
         try:
             fields = resolve_thunk(self._fields)
-        except Exception as error:  # noqa: BLE001
+        except Exception as error:
             cls = GraphQLError if isinstance(error, GraphQLError) else TypeError
             msg = f"{self.name} fields cannot be resolved. {error}"
             raise cls(msg) from error
@@ -801,7 +801,7 @@ def interfaces(self) -> tuple[GraphQLInterfaceType, ...]:
             interfaces: Collection[GraphQLInterfaceType] = resolve_thunk(
                 self._interfaces  # type: ignore
             )
-        except Exception as error:  # noqa: BLE001
+        except Exception as error:
             cls = GraphQLError if isinstance(error, GraphQLError) else TypeError
             msg = f"{self.name} interfaces cannot be resolved. {error}"
             raise cls(msg) from error
@@ -888,7 +888,7 @@ def fields(self) -> GraphQLFieldMap:
         """Get provided fields, wrapping them as GraphQLFields if needed."""
         try:
             fields = resolve_thunk(self._fields)
-        except Exception as error:  # noqa: BLE001
+        except Exception as error:
             cls = GraphQLError if isinstance(error, GraphQLError) else TypeError
             msg = f"{self.name} fields cannot be resolved. {error}"
             raise cls(msg) from error
@@ -906,7 +906,7 @@ def interfaces(self) -> tuple[GraphQLInterfaceType, ...]:
             interfaces: Collection[GraphQLInterfaceType] = resolve_thunk(
                 self._interfaces  # type: ignore
             )
-        except Exception as error:  # noqa: BLE001
+        except Exception as error:
             cls = GraphQLError if isinstance(error, GraphQLError) else TypeError
             msg = f"{self.name} interfaces cannot be resolved. {error}"
             raise cls(msg) from error
@@ -992,7 +992,7 @@ def types(self) -> tuple[GraphQLObjectType, ...]:
         """Get provided types."""
         try:
             types: Collection[GraphQLObjectType] = resolve_thunk(self._types)
-        except Exception as error:  # noqa: BLE001
+        except Exception as error:
             cls = GraphQLError if isinstance(error, GraphQLError) else TypeError
             msg = f"{self.name} types cannot be resolved. {error}"
             raise cls(msg) from error
@@ -1350,7 +1350,7 @@ def fields(self) -> GraphQLInputFieldMap:
         """Get provided fields, wrap them as GraphQLInputField if needed."""
         try:
             fields = resolve_thunk(self._fields)
-        except Exception as error:  # noqa: BLE001
+        except Exception as error:
             cls = GraphQLError if isinstance(error, GraphQLError) else TypeError
             msg = f"{self.name} fields cannot be resolved. {error}"
             raise cls(msg) from error