Skip to content

[FW][16.0][Backport] [FIX] safe_eval: 3.11 compatibility#156713

Closed
fw-bot wants to merge 1 commit intoodoo:saas-16.2from
odoo-dev:saas-16.2-16.0-missing-3.11-opcodes-Dc7j-fw
Closed

[FW][16.0][Backport] [FIX] safe_eval: 3.11 compatibility#156713
fw-bot wants to merge 1 commit intoodoo:saas-16.2from
odoo-dev:saas-16.2-16.0-missing-3.11-opcodes-Dc7j-fw

Conversation

@fw-bot
Copy link
Copy Markdown
Contributor

@fw-bot fw-bot commented Mar 6, 2024

Backport of #136943 to 16.0 branch

Description of the issue/feature this PR addresses: This fixes the issue #149524

Current behavior before PR: When creating a server action with 16.0 branch throws the error:

forbidden opcode(s) in 'lambda': POP_JUMP_FORWARD_IF_NOT_NONE, POP_JUMP_FORWARD_IF_NONE

Desired behavior after PR is merged: Server actions created without problemas


I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr

Forward-Port-Of: #156438

Complement on 1e35315 (odoo#112450):
alongside the split between forwards and backwards jump we missed that
3.11 has a specialized version of each for the `is None` and `is not
None` cases. A use of that was added in standard in 16.5 (odoo#120446) but
more generally it makes sense that server actions would support
conditional tests against `None`, probably...

X-original-commit: 22ad0a3
@robodoo
Copy link
Copy Markdown
Contributor

robodoo commented Mar 6, 2024

Pull request status dashboard.

@fw-bot
Copy link
Copy Markdown
Contributor Author

fw-bot commented Mar 6, 2024

@hugosantosred @xmo-odoo cherrypicking of pull request #156438 failed.

stdout:

On branch saas-16.2-16.0-missing-3.11-opcodes-Dc7j-fw
You are currently cherry-picking commit ba7b449a09b1.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean

stderr:

14:36:36.084449 git.c:463               trace: built-in: git cherry-pick ba7b449a09b1643218c85e5b4913b2bfc425cb74
14:36:36.187653 run-command.c:659       trace: run_command: GIT_REFLOG_ACTION=cherry-pick git commit -n --no-gpg-sign -F .git/MERGE_MSG --cleanup=verbatim --allow-empty-message
14:36:36.190214 git.c:463               trace: built-in: git commit -n --no-gpg-sign -F .git/MERGE_MSG --cleanup=verbatim --allow-empty-message
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Mar 6, 2024
@C3POdoo C3POdoo added the RD research & development, internal work label Mar 6, 2024
@xmo-odoo
Copy link
Copy Markdown
Collaborator

xmo-odoo commented Mar 6, 2024

whoopsie forgot to set a forward port limit.

@xmo-odoo xmo-odoo closed this Mar 6, 2024
@xmo-odoo xmo-odoo deleted the saas-16.2-16.0-missing-3.11-opcodes-Dc7j-fw branch March 6, 2024 14:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot RD research & development, internal work

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants