Move missing data files message inside error #391
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 Report
@@ Coverage Diff @@
## develop #391 +/- ##
===========================================
- Coverage 48.29% 48.28% -0.01%
===========================================
Files 14 14
Lines 5721 5718 -3
===========================================
- Hits 2763 2761 -2
+ Misses 2958 2957 -1
Continue to review full report at Codecov.
|
mperrin
approved these changes
Jan 5, 2021
webbpsf/utils.py
Outdated
| @@ -201,15 +201,14 @@ def get_webbpsf_data_path(data_version_min=None, return_version=False): | |||
| if path_from_config == 'from_environment_variable': | |||
| path = os.getenv('WEBBPSF_PATH') | |||
| if path is None: | |||
| sys.stderr.write(MISSING_WEBBPSF_DATA_MESSAGE) | |||
| raise EnvironmentError("Environment variable $WEBBPSF_PATH is not set!") | |||
| raise EnvironmentError("{}\nEnvironment variable $WEBBPSF_PATH is not set!".format( | |||
There was a problem hiding this comment.
Minor: maybe put the lengthy error message text at the end of the exception messages instead of the front? Also, now that we're only supporting recent Pythons we can do all the string formatting with f-strings, so like:
raise EnvironmentError(f"Environment variable $WEBBPSF_PATH is not set!\n{MISSING_WEBBPSF_DATA_MESSAGE}"
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.
Closes #380
Moves missing data files print out inside the
IOError/EnvironmentErrorcall so it can be caught by users if necessary