Skip to content

Edge7 v1.1.1.3#300

Closed
dandye wants to merge 20 commits intoSTIXProject:masterfrom
Soltra:edge7_v1.1.1.3
Closed

Edge7 v1.1.1.3#300
dandye wants to merge 20 commits intoSTIXProject:masterfrom
Soltra:edge7_v1.1.1.3

Conversation

@dandye
Copy link

@dandye dandye commented Aug 29, 2016

QA

[root@localhost python-stix]# python2.7 ../../repository/manage.py test stix.test.campaign_test
...
----------------------------------------------------------------------
Ran 2 tests in 0.031s
OK

usrlocalben and others added 20 commits September 14, 2014 10:48
Since the idgen namespace settings are at the module-level, they could
cause thread-safety issues, depending on the use.

This patch moves the idgen gathering up to the to_xml() and out of
nsparser, and optional by using the include_idgen=T/F parameter to
to_xml.

To implement a thread-safe to_xml() call, the caller should disable the
include_idgen, and provide the needed namespaces using the ns_dict
parameter.
Conflicts:
	stix/base.py
	stix/utils/nsparser.py
@dandye dandye closed this Aug 29, 2016
@dandye dandye deleted the edge7_v1.1.1.3 branch August 29, 2016 10:02
@dandye dandye restored the edge7_v1.1.1.3 branch August 29, 2016 10:08
@dandye dandye deleted the edge7_v1.1.1.3 branch August 29, 2016 12:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants