Merge pull request #286 from CybOXProject/next-release

Next release, incorporating namespaces_integration.

Author: clenk

.gitignore

@@ -7,5 +7,7 @@ dist/
 .pydevproject
 .settings
 .tox
+.idea
+.idea/
 
 docs/_build

cybox/__init__.py

@@ -23,15 +23,14 @@ def value(self):
     def value(self, value):
         self._value = six.text_type(value)
 
-    def to_obj(self, return_obj=None, ns_info=None):
-        self._collect_ns_info(ns_info)
+    def to_obj(self, ns_info=None):
         return self.value
 
     def to_dict(self):
         return self.value
 
-    @staticmethod
-    def from_obj(cls_obj):
-        return Unicode(cls_obj)
+    @classmethod
+    def from_obj(cls, cls_obj):
+        return cls(cls_obj)
 
     from_dict = from_obj

cybox/bindings/account_object.py

@@ -76,6 +76,7 @@ def exportChildren(self, lwrite, level, namespace_='AccountObj:', name_='Authent
         if self.Structured_Authentication_Mechanism is not None:
             self.Structured_Authentication_Mechanism.export(lwrite, level, 'AccountObj:', name_='Structured_Authentication_Mechanism', pretty_print=pretty_print)
     def build(self, node):
+        self.__sourcenode__ = node
         already_processed = set()
         self.buildAttributes(node, node.attrib, already_processed)
         for child in node:
@@ -156,6 +157,7 @@ def exportChildren(self, lwrite, level, namespace_='AccountObj:', name_='Structu
         if self.Description is not None:
             self.Description.export(lwrite, level, 'AccountObj:', name_='Description', pretty_print=pretty_print)
     def build(self, node):
+        self.__sourcenode__ = node
         already_processed = set()
         self.buildAttributes(node, node.attrib, already_processed)
         for child in node:
@@ -274,6 +276,7 @@ def exportChildren(self, lwrite, level, namespace_='AccountObj:', name_='Account
         if self.Last_Accessed_Time is not None:
             self.Last_Accessed_Time.export(lwrite, level, 'AccountObj:', name_='Last_Accessed_Time', pretty_print=pretty_print)
     def build(self, node):
+        self.__sourcenode__ = node
         already_processed = set()
         self.buildAttributes(node, node.attrib, already_processed)
         for child in node:

cybox/bindings/address_object.py

@@ -104,6 +104,7 @@ def exportChildren(self, lwrite, level, namespace_='AddressObj:', name_='Address
         if self.VLAN_Num is not None:
             self.VLAN_Num.export(lwrite, level, 'AddressObj:', name_='VLAN_Num', pretty_print=pretty_print)
     def build(self, node):
+        self.__sourcenode__ = node
         already_processed = set()
         self.buildAttributes(node, node.attrib, already_processed)
         for child in node:
@@ -112,7 +113,6 @@ def build(self, node):
     def buildAttributes(self, node, attrs, already_processed):
         value = find_attr_value_('category', node)
         if value is not None:
-
             self.category = value
         value = find_attr_value_('is_source', node)
         if value is not None:

cybox/bindings/api_object.py

@@ -89,6 +89,7 @@ def exportChildren(self, lwrite, level, namespace_='APIObj:', name_='APIObjectTy
         if self.Address is not None:
             self.Address.export(lwrite, level, 'APIObj:', name_='Address', pretty_print=pretty_print)
     def build(self, node):
+        self.__sourcenode__ = node
         already_processed = set()
         self.buildAttributes(node, node.attrib, already_processed)
         for child in node:

cybox/bindings/archive_file_object.py

@@ -58,6 +58,7 @@ def exportChildren(self, lwrite, level, namespace_='ArchiveFileObj:', name_='Arc
         super(ArchiveFileFormatType, self).exportChildren(lwrite, level, 'ArchiveFileObj:', name_, True, pretty_print=pretty_print)
         pass
     def build(self, node):
+        self.__sourcenode__ = node
         already_processed = set()
         self.buildAttributes(node, node.attrib, already_processed)
         self.valueOf_ = get_all_text_(node)
@@ -175,6 +176,7 @@ def exportChildren(self, lwrite, level, namespace_='ArchiveFileObj:', name_='Arc
         for Archived_File_ in self.Archived_File:
             Archived_File_.export(lwrite, level, 'ArchiveFileObj:', name_='Archived_File', pretty_print=pretty_print)
     def build(self, node):
+        self.__sourcenode__ = node
         already_processed = set()
         self.buildAttributes(node, node.attrib, already_processed)
         for child in node:

cybox/bindings/arp_cache_object.py

@@ -82,6 +82,7 @@ def exportChildren(self, lwrite, level, namespace_='ARPCacheObj:', name_='ARPCac
         if self.Network_Interface is not None:
             self.Network_Interface.export(lwrite, level, 'ARPCacheObj:', name_='Network_Interface', pretty_print=pretty_print)
     def build(self, node):
+        self.__sourcenode__ = node
         already_processed = set()
         self.buildAttributes(node, node.attrib, already_processed)
         for child in node:
@@ -165,6 +166,7 @@ def exportChildren(self, lwrite, level, namespace_='ARPCacheObj:', name_='ARPCac
         super(ARPCacheEntryTypeType, self).exportChildren(lwrite, level, 'ARPCacheObj:', name_, True, pretty_print=pretty_print)
         pass
     def build(self, node):
+        self.__sourcenode__ = node
         already_processed = set()
         self.buildAttributes(node, node.attrib, already_processed)
         self.valueOf_ = get_all_text_(node)
@@ -238,6 +240,7 @@ def exportChildren(self, lwrite, level, namespace_='ARPCacheObj:', name_='ARPCac
         for ARP_Cache_Entry_ in self.ARP_Cache_Entry:
             ARP_Cache_Entry_.export(lwrite, level, 'ARPCacheObj:', name_='ARP_Cache_Entry', pretty_print=pretty_print)
     def build(self, node):
+        self.__sourcenode__ = node
         already_processed = set()
         self.buildAttributes(node, node.attrib, already_processed)
         for child in node:

cybox/bindings/artifact_object.py

@@ -56,6 +56,7 @@ def exportChildren(self, lwrite, level, namespace_='ArtifactObj:', name_='RawArt
         super(RawArtifactType, self).exportChildren(lwrite, level, 'ArtifactObj:', name_, True, pretty_print=pretty_print)
         pass
     def build(self, node):
+        self.__sourcenode__ = node
         already_processed = set()
         self.buildAttributes(node, node.attrib, already_processed)
         self.valueOf_ = get_all_text_(node)
@@ -163,6 +164,7 @@ def exportChildren(self, lwrite, level, namespace_='ArtifactObj:', name_='Packag
         for Encoding_ in self.Encoding:
             Encoding_.export(lwrite, level, 'ArtifactObj:', name_='Encoding', pretty_print=pretty_print)
     def build(self, node):
+        self.__sourcenode__ = node
         already_processed = set()
         self.buildAttributes(node, node.attrib, already_processed)
         for child in node:
@@ -259,6 +261,7 @@ def exportAttributes(self, lwrite, level, already_processed, namespace_='Artifac
     def exportChildren(self, lwrite, level, namespace_='ArtifactObj:', name_='CompressionType', fromsubclass_=False, pretty_print=True):
         pass
     def build(self, node):
+        self.__sourcenode__ = node
         already_processed = set()
         self.buildAttributes(node, node.attrib, already_processed)
         for child in node:
@@ -350,6 +353,7 @@ def exportAttributes(self, lwrite, level, already_processed, namespace_='Artifac
     def exportChildren(self, lwrite, level, namespace_='ArtifactObj:', name_='EncryptionType', fromsubclass_=False, pretty_print=True):
         pass
     def build(self, node):
+        self.__sourcenode__ = node
         already_processed = set()
         self.buildAttributes(node, node.attrib, already_processed)
         for child in node:
@@ -440,6 +444,7 @@ def exportAttributes(self, lwrite, level, already_processed, namespace_='Artifac
     def exportChildren(self, lwrite, level, namespace_='ArtifactObj:', name_='EncodingType', fromsubclass_=False, pretty_print=True):
         pass
     def build(self, node):
+        self.__sourcenode__ = node
         already_processed = set()
         self.buildAttributes(node, node.attrib, already_processed)
         for child in node:
@@ -570,6 +575,7 @@ def exportChildren(self, lwrite, level, namespace_='ArtifactObj:', name_='Artifa
             showIndent(lwrite, level, pretty_print)
             lwrite('<%sRaw_Artifact_Reference>%s</%sRaw_Artifact_Reference>%s' % ('ArtifactObj:', self.gds_format_string(quote_xml(self.Raw_Artifact_Reference), input_name='Raw_Artifact_Reference'), 'ArtifactObj:', eol_))
     def build(self, node):
+        self.__sourcenode__ = node
         already_processed = set()
         self.buildAttributes(node, node.attrib, already_processed)
         for child in node:

cybox/bindings/as_object.py

@@ -85,6 +85,7 @@ def exportChildren(self, lwrite, level, namespace_='ASObj:', name_='ASObjectType
         if self.Regional_Internet_Registry is not None:
             self.Regional_Internet_Registry.export(lwrite, level, 'ASObj:', name_='Regional_Internet_Registry', pretty_print=pretty_print)
     def build(self, node):
+        self.__sourcenode__ = node
         already_processed = set()
         self.buildAttributes(node, node.attrib, already_processed)
         for child in node:

cybox/bindings/code_object.py

@@ -65,6 +65,7 @@ def exportChildren(self, lwrite, level, namespace_='CodeObj:', name_='CodeSegmen
         super(CodeSegmentXORType, self).exportChildren(lwrite, level, 'CodeObj:', name_, True, pretty_print=pretty_print)
         pass
     def build(self, node):
+        self.__sourcenode__ = node
         already_processed = set()
         self.buildAttributes(node, node.attrib, already_processed)
         self.valueOf_ = get_all_text_(node)
@@ -74,7 +75,6 @@ def build(self, node):
     def buildAttributes(self, node, attrs, already_processed):
         value = find_attr_value_('xor_pattern', node)
         if value is not None:
-
             self.xor_pattern = value
         super(CodeSegmentXORType, self).buildAttributes(node, attrs, already_processed)
     def buildChildren(self, child_, node, nodeName_, fromsubclass_=False):
@@ -134,6 +134,7 @@ def exportChildren(self, lwrite, level, namespace_='CodeObj:', name_='TargetedPl
         for Targeted_Platform_ in self.Targeted_Platform:
             Targeted_Platform_.export(lwrite, level, 'CodeObj:', name_='Targeted_Platform', pretty_print=pretty_print)
     def build(self, node):
+        self.__sourcenode__ = node
         already_processed = set()
         self.buildAttributes(node, node.attrib, already_processed)
         for child in node:
@@ -205,6 +206,7 @@ def exportChildren(self, lwrite, level, namespace_='CodeObj:', name_='ProcessorT
         super(ProcessorTypeType, self).exportChildren(lwrite, level, 'CodeObj:', name_, True, pretty_print=pretty_print)
         pass
     def build(self, node):
+        self.__sourcenode__ = node
         already_processed = set()
         self.buildAttributes(node, node.attrib, already_processed)
         self.valueOf_ = get_all_text_(node)
@@ -278,6 +280,7 @@ def exportChildren(self, lwrite, level, namespace_='CodeObj:', name_='CodeLangua
         super(CodeLanguageType, self).exportChildren(lwrite, level, 'CodeObj:', name_, True, pretty_print=pretty_print)
         pass
     def build(self, node):
+        self.__sourcenode__ = node
         already_processed = set()
         self.buildAttributes(node, node.attrib, already_processed)
         self.valueOf_ = get_all_text_(node)
@@ -351,6 +354,7 @@ def exportChildren(self, lwrite, level, namespace_='CodeObj:', name_='CodePurpos
         super(CodePurposeType, self).exportChildren(lwrite, level, 'CodeObj:', name_, True, pretty_print=pretty_print)
         pass
     def build(self, node):
+        self.__sourcenode__ = node
         already_processed = set()
         self.buildAttributes(node, node.attrib, already_processed)
         self.valueOf_ = get_all_text_(node)
@@ -424,6 +428,7 @@ def exportChildren(self, lwrite, level, namespace_='CodeObj:', name_='CodeTypeTy
         super(CodeTypeType, self).exportChildren(lwrite, level, 'CodeObj:', name_, True, pretty_print=pretty_print)
         pass
     def build(self, node):
+        self.__sourcenode__ = node
         already_processed = set()
         self.buildAttributes(node, node.attrib, already_processed)
         self.valueOf_ = get_all_text_(node)
@@ -580,6 +585,7 @@ def exportChildren(self, lwrite, level, namespace_='CodeObj:', name_='CodeObject
         if self.Extracted_Features is not None:
             self.Extracted_Features.export(lwrite, level, 'CodeObj:', name_='Extracted_Features', pretty_print=pretty_print)
     def build(self, node):
+        self.__sourcenode__ = node
         already_processed = set()
         self.buildAttributes(node, node.attrib, already_processed)
         for child in node: