Added xmlconst.py. Fixed import issue in STIXPackage.from_xml()

stix/base.py

@@ -11,7 +11,7 @@
 import lxml
 
 # internal
-import stix.bindings as bindings
+from . import bindings
 
 # lazy imports
 cybox = None
@@ -243,9 +243,8 @@ def dict_from_object(cls, entity_obj):
         return cls.from_obj(entity_obj).to_dict()
 
     def walk(self):
-        from stix.utils import walk
-        return walk.iterwalk(self)
-
+        _load_lazy_mods()
+        return utils.walk.iterwalk(self)
 
     def find(self, id_):
         """Searches the children of a :class:`Entity` implementation for an

stix/core/stix_package.py

@@ -7,6 +7,8 @@
 # internal
 import stix
 import stix.utils as utils
+import stix.utils.parser as parser
+
 from stix.campaign import Campaign
 from stix.coa import CourseOfAction
 from stix.exploit_target import ExploitTarget
@@ -454,7 +456,7 @@ def from_xml(cls, xml_file, encoding=None):
             An instance of :class:`STIXPackage`.
 
         """
-        entity_parser = utils.parser.EntityParser()
+        entity_parser = parser.EntityParser()
         return entity_parser.parse_xml(xml_file, encoding=encoding)
 
 

stix/utils/__init__.py

@@ -93,6 +93,7 @@ def is_entity(entity):
 def is_entitylist(entity):
     return isinstance(entity, (cybox.EntityList, stix.EntityList))
 
+
 def attr_name(name):
     if name.startswith("_"):
         name = name[1:]

stix/utils/parser.py

@@ -1,14 +1,17 @@
 # Copyright (c) 2015, The MITRE Corporation. All rights reserved.
 # See LICENSE.txt for complete terms.
 
-import stix
-from lxml import etree
+# stdlib
 from distutils.version import StrictVersion
+
+# external
+from lxml import etree
+
+# internal
+import stix
+import stix.xmlconst as xmlconst
 from stix.utils import ignored
 
-NS_XSI = "http://www.w3.org/2001/XMLSchema-instance"
-TAG_XSI_TYPE = "{%s}type" % NS_XSI
-TAG_SCHEMALOCATION = "{%s}schemaLocation" % NS_XSI
 
 class UnknownVersionError(Exception):
     pass
@@ -86,7 +89,7 @@ def get_schemaloc_pairs(node):
         KeyError: If `node` does not have an xsi:schemaLocation attribute.
 
     """
-    schemalocs = node.attrib[TAG_SCHEMALOCATION]
+    schemalocs = node.attrib[xmlconst.TAG_SCHEMALOCATION]
     l = schemalocs.split()
     return zip(l[::2], l[1::2])
 

stix/xmlconst.py

@@ -0,0 +1,6 @@
+# Copyright (c) 2015, The MITRE Corporation. All rights reserved.
+# See LICENSE.txt for complete terms.
+
+NS_XSI = "http://www.w3.org/2001/XMLSchema-instance"
+TAG_XSI_TYPE = "{%s}type" % NS_XSI
+TAG_SCHEMALOCATION = "{%s}schemaLocation" % NS_XSI