Namespaces integration #90
Merged
Conversation
This file contains hidden or 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
python-cybox and mixbox repositories. The comparator_example seems to not work properly yet.
…python-cybox and mixbox methods/properties.
* Swapped out some string concatenation code for format() and % formatted strings. * Replaced some list comprehensions with generator comprehensions since the lists weren't being used ever. * Modified some if/elif/else chains to remove redundant "if foo and <actual condition>" by adding a top-level "if not foo: return/continue/break" statement.
I updated it. maec/__init__.py contains a custom mixbox.Entity subclass which no longer worked. I think the root cause was that it assumed mixbox.namespaces.lookup_name() returned a Namespace object, but it now returns a prefix. That messed up the namespace handling in this class. It's now fixed to use the mixbox NamespaceSet class. Some wonky code is cleaned up too.
test dict (i.e. a dict with a value and xsi:type) round-trips to a plain string. I switched it to a plain string in the test dict.
Typedfields branch fixes to nosetests
Contributor
|
Yay, this is passing! Thanks, @clenk |
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.
Merge in the namespaces_integration branch, require the latest versions of mixbox and cybox, and fix a couple bugs.