Include ID namespace by default on export.

Author: gtback

cybox/__init__.py

@@ -8,6 +8,7 @@
 import json
 from StringIO import StringIO
 
+import cybox.utils.idgen
 from cybox.utils import Namespace, NamespaceParser, META
 
 
@@ -228,6 +229,10 @@ def _get_namespace_def(self, additional_ns_dict=None):
             for ns, prefix in additional_ns_dict.iteritems():
                 namespaces.update([Namespace(ns, prefix)])
 
+        # TODO: For now, always add the ID namespace. Later we can figure out
+        # how to intelligently do it only when necessary
+        namespaces.update([cybox.utils.idgen._get_generator().namespace])
+
         # if there are any other namepaces, include xsi for "schemaLocation"
         if namespaces:
             namespaces.update([META.lookup_prefix('xsi')])

examples/artifact_instance.py

@@ -32,7 +32,7 @@ def main():
                      "captured in a PCAP file and then base64 encoded for "
                      "transport.")
 
-    print Observables(o).to_xml(namespace_dict={NS.name: NS.prefix})
+    print Observables(o).to_xml()
 
 
 if __name__ == "__main__":

examples/simple_email_instance.py

@@ -25,7 +25,7 @@ def main():
 
     m.add_related(a, "Received_From", inline=False)
 
-    print Observables([m, a]).to_xml(namespace_dict={NS.name: NS.prefix})
+    print Observables([m, a]).to_xml()
 
 
 if __name__ == "__main__":

examples/simple_email_pattern.py

@@ -23,7 +23,7 @@ def main():
     m.subject = "New modifications to the specification"
     m.subject.condition = "Equals"
 
-    print Observables(m).to_xml(namespace_dict={NS.name: NS.prefix})
+    print Observables(m).to_xml()
 
 if __name__ == "__main__":
     main()

examples/simple_file_instance.py

@@ -28,7 +28,7 @@ def main():
     o = Observable(f)
     o.description = "This observable specifies a specific file observation."
 
-    print Observables(o).to_xml(namespace_dict={NS.name: NS.prefix})
+    print Observables(o).to_xml()
 
 if __name__ == "__main__":
     main()

examples/url_instance.py

@@ -22,7 +22,7 @@ def main():
     u.value = v
     u.type_ = URI.TYPE_URL
 
-    print Observables(u).to_xml(namespace_dict={NS.name: NS.prefix})
+    print Observables(u).to_xml()
 
 if __name__ == "__main__":
     main()

examples/url_pattern.py

@@ -23,7 +23,7 @@ def main():
     u.value = v
     u.type_ = URI.TYPE_URL
 
-    print Observables(u).to_xml(namespace_dict={NS.name: NS.prefix})
+    print Observables(u).to_xml()
 
 if __name__ == "__main__":
     main()