-
-
Notifications
You must be signed in to change notification settings - Fork 30.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
bpo-32888: Improve exception message in ast.literal_eval #340
Conversation
This looks good, do you mind opening a bugs.python.org ticket and adding a news entry? |
When a non-literal is given to literal_eval, attempt to be more helpful with the message, rather than calling it 'malformed'.
b9b6e9d
to
26ba98e
Compare
Rebased onto current master, which includes shifting where the actual change happens. NEWS entry added, issue number added. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add a special test in test_ast.
@@ -52,6 +52,8 @@ def _convert_num(node): | |||
return node.value | |||
elif isinstance(node, Num): | |||
return node.n | |||
elif isinstance(node, AST): | |||
raise ValueError('%s not allowed in literal' % type(node).__name__) | |||
raise ValueError('malformed node or string: ' + repr(node)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In what cases this exception is raised? Is it covered by tests?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The easiest way to trigger it is to use something that isn't permitted in literal_eval, but is valid syntax. There's already one such test - proving that f-strings aren't literal_evallable - and I guess there could be more, but since this is a whitelist, the error is basically "anything else, raise". The only difference in this patch is that the message is different for "syntactically valid but not acceptable by literal_eval" and "syntactically invalid".
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I meant what input triggers the "malformed node or string" error now?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Calling literal_eval with an AST node that has non-AST children in it. I don't think it's possible (post-patch) to trigger this error by calling literal_eval with a string, but I can't say for sure, so I don't want to say just "malformed node".
@@ -0,0 +1,2 @@ | |||
Improve wording of error messages from ast.literal_eval, distinguishing | |||
valid-but-unacceptable nodes from those that are actually malformed. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add "Patch by..."
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should that be done by amending the current commit, or adding an additional commit?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is better for review to add a new commit. In any case all commits are squashed before merging into the repository.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Overall this looks good, just one suggestion on the test implementation.
ast.BinOp(ast.Num(1), ast.Add(), 'oops'): "malformed node or string: 'oops'", | ||
} | ||
for test, message in tests.items(): | ||
with self.assertRaises(ValueError) as cm: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A helpful thing to use in between lines 594 and 595 would be with self.subTest(test=test, message=message):
and then indent the parts below it. That way each of these end up being tested independently rather than potentially having the items loop have a case fail and cause the rest of the cases to fail to execute.
Check out https://docs.python.org/3/library/unittest.html#distinguishing-test-iterations-using-subtests
A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated. Once you have made the requested changes, please leave a comment on this pull request containing the phrase |
@Rosuav, please address the last change request by @briancurtin and also rebase to fix the conflict. Thanks! |
BPO cites another couple of issues, one of which is still open, as dependencies. And it's not really a high priority - it's nothing more than a nice-to-have. There are a lot of barriers to getting patches accepted and it's often not worth the effort unless you REALLY care about the patch. |
(Note that you can rebase or do a regular merge, which is often easier! All PRs are squash merged in the end @csabella) |
@serhiy-storchaka Should this wait for bpo-32893 per your last message on the ticket or could it be merged soon? (when conflicts are resolved + suggestion from Brian) |
A different approach using ast.dump(): PR #16620. |
What's the status of this PR? @Rosuav: Are you still working on this?
Oh, I just closed it since it could produce very long error message: https://bugs.python.org/issue38396#msg354132 |
No, I'm not. It was a nice-to-have but between the pushback (no core dev seemed to want it to happen) and the constant need to fix merge conflicts meant that I abandoned this proposal ages ago. If someone else wants to champion this fix, then sure, but I don't have the energy to push everything, and this one wasn't worth it. |
@isidentical: Are you interested to take over this change? I'm not the good candidate to review it. Maybe @pablogsal or @serhiy-storchaka. |
Sure. |
Closing this pull request as it is now GH-17662. |
Bumps [celery](https://github.com/celery/celery) from 4.4.3 to 4.4.4. - [Release notes](https://github.com/celery/celery/releases) - [Changelog](https://github.com/celery/celery/blob/master/Changelog.rst) - [Commits](celery/celery@4.4.3...v4.4.4) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
When a non-literal is given to literal_eval, attempt to be more
helpful with the message, rather than calling it 'malformed'.
https://bugs.python.org/issue32888