Fix star-imports from stix2.v20 and v21 #404
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
star-imports from those modules get the right symbols. "base" was a problem because it was getting imported via stix2/__init__.py and overwriting stix2.base, making the actual stix2/base.py module inaccessible.
Codecov Report
@@ Coverage Diff @@
## master #404 +/- ##
=======================================
Coverage 98.44% 98.44%
=======================================
Files 127 127
Lines 14634 14636 +2
=======================================
+ Hits 14406 14408 +2
Misses 228 228
Continue to review full report at Codecov.
|
|
Thanks @chisholm! |
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.
Fixes #399 .
stix2/__init__.py currently does a star-import from stix2.v20. Unfortunately that brings in a "base" symbol which becomes stix2.base, and hides the actual stix2/base.py module. This PR adds
__all__s to the v20 and v21 modules which explicitly lists what symbols should be imported, so we don't get "base" by mistake from them.(Impl note: the text block split() technique makes it easier to keep the __all__ lists up-to-date, because you can just copy-paste the symbol lists from the imports above.)