fix: remove return from finally block to resolve Python 3.14 SyntaxWa…#759
Open
Melissajwomack wants to merge 1 commit intoDataDog:mainfrom
Open
Conversation
…rning Python 3.14 raises a SyntaxWarning for inside a block. Move the blocking_response return to after the try/except/finally in _LambdaDecorator.__call__, preserving all AppSec blocking execution paths. Add a regression test confirming handler exceptions still propagate when AppSec is enabled and no blocking response is active.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Removes
return self.blocking_responsefrom thefinallyblock in_LambdaDecorator.__call__and defers it to after thetry/except/finallyblock, eliminating theSyntaxWarning: 'return' in a 'finally' blockemitted by Python 3.14 at cold start.Motivation
Python 3.14 introduced a
SyntaxWarningforreturn/break/continueinsidefinallyblocks because areturninfinallysilently suppresses any exception actively propagating through thetry/except. This warning was firing on every Lambda cold start and polluting CloudWatch logs for anyone running on the Python 3.14 runtime.Closes #758
Testing Guidelines
BlockingException, block after via_after, and normal/no-blocking)tests/test_wrapper.py, includingTestLambdaWrapperAppsecBlocking, pass without modificationSyntaxWarningno longer appears in CloudWatch logs at cold startAdditional Notes
The
returninfinallywas originally needed so that when_after()setsself.blocking_response(the "block after response" AppSec path), that value could override the tentativereturn self.responsefrom thetryblock. The fix preserves this behavior by deferring both returns to after thefinally, using a simpleif self.blocking_responsecheck.Types of Changes
Check all that apply