Re-raise ModuleNotFoundError unless for guessed task #8660
Merged
Conversation
This file contains 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
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #8660 +/- ##
=======================================
Coverage 87.34% 87.34%
=======================================
Files 148 148
Lines 18519 18519
Branches 3164 3164
=======================================
Hits 16176 16176
Misses 2059 2059
Partials 284 284
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
johnjameswhitman
changed the title
johnjameswhitman
changed the title
Nusnus
approved these changes
Nov 22, 2023
auvipy
approved these changes
Nov 22, 2023
| @@ -271,7 +271,7 @@ def find_related_module(package, related_name): | |||
| except ModuleNotFoundError as e: | |||
| import_exc_name = getattr(e, 'name', None) | |||
| # If candidate does not exist, then return None. | |||
| if import_exc_name and module_name.startswith(import_exc_name): | |||
| if import_exc_name and module_name == import_exc_name: | |||
There was a problem hiding this comment.
should we adjust the unit tests as well? with this new change?
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.
Description
We just merged #8632, which should propagate import-errors that originate outside of the
importlib.import_modulecall. After reading through the code again today, I realized my change may swallow some other import errors that should fail.I've updated the integration test with clearer cases, and modified
celery.loaders.base.find_related_moduleso that it only returns none if the exact task-module being guessed is what caused theModuleNotFoundError.