Skip to content
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

with contextlib.suppress(ImportError) weakens imports (Cherry-pick of #19293) #19789

Merged
merged 6 commits into from Sep 8, 2023

Conversation

thejcannon
Copy link
Member

fixes #17691 and fixes #19751

also:

  • fixes the case of nested weakenings
  • bumps tree-sitter-python to an unreleased version (last release was a year ago)
  • rebuilds the generation of tree-sitter node types to support multiple symbols for a name

fixes #17691

also:
- fixes the case of nested weakenings
- bumps tree-sitter-python to an unreleased version (last release was a
year ago)
- rebuilds the generation of tree-sitter node types to support multiple
symbols for a name
@@ -172,19 +172,20 @@ testutil_mock = { package = "mock", path = "testutil/mock" }
time = "0.3.20"
tokio = { version = "1.28", features = ["macros", "rt", "rt-multi-thread"] }
tokio-retry = "0.3"
tokio-util = { version = "0.7", features = ["io"] }
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this diff is right...

@thejcannon thejcannon merged commit 7ac75c2 into 2.17.x Sep 8, 2023
49 checks passed
@thejcannon thejcannon deleted the cherry-pick-19293-to-2.17.x branch September 8, 2023 21:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants