Fix lint

Author: patrick91

strawberry/extensions/mask_errors.py

@@ -56,7 +56,7 @@ def on_operation(self) -> Iterator[None]:
 
         if isinstance(result, ExecutionResult):
             self._process_result(result)
-        else:
+        elif result:
             self._process_result(result.initial_result)
 
 

strawberry/schema/_graphql_core.py

@@ -1,7 +1,7 @@
 from typing import Union
 
 from graphql.execution import ExecutionContext as GraphQLExecutionContext
-from graphql.execution import ExecutionResult as GraphQLExecutionResult
+from graphql.execution import ExecutionResult as OriginalGraphQLExecutionResult
 from graphql.execution import execute, subscribe
 
 from strawberry.types import ExecutionResult
@@ -25,25 +25,27 @@
     )
 
     GraphQLExecutionResult = Union[
-        GraphQLExecutionResult, InitialIncrementalExecutionResult
+        OriginalGraphQLExecutionResult, InitialIncrementalExecutionResult
     ]
 
 except ImportError:
     GraphQLIncrementalExecutionResults = type(None)
+    GraphQLExecutionResult = OriginalGraphQLExecutionResult  # type: ignore
 
     incremental_execution_directives = ()  # type: ignore
     experimental_execute_incrementally = None
 
 
 # TODO: give this a better name, maybe also a better place
 ResultType = Union[
-    GraphQLExecutionResult,
+    OriginalGraphQLExecutionResult,
     GraphQLIncrementalExecutionResults,
     ExecutionResult,
 ]
 
 __all__ = [
     "GraphQLExecutionContext",
+    "GraphQLExecutionResult",
     "GraphQLIncrementalExecutionResults",
     "ResultType",
     "execute",

strawberry/schema/schema.py

@@ -546,7 +546,7 @@ async def _handle_execution_result(
         if isinstance(result, GraphQLExecutionResult):
             result = ExecutionResult(data=result.data, errors=result.errors)
         result.extensions = await extensions_runner.get_extensions_results(context)
-        context.result = result  # type: ignore  # mypy failed to deduce correct type.
+        context.result = result
         return result
 
     async def execute(