abstraction over ElementTree API, works with both lxml and py3k's xml…

….etree

collada/__init__.py

@@ -24,7 +24,6 @@
 import types
 import zipfile
 from datetime import datetime
-from lxml import etree as ElementTree
 
 from collada import animation
 from collada import asset
@@ -34,11 +33,16 @@
 from collada import light
 from collada import material
 from collada import scene
-from collada import schema
 from collada.common import E, tag
 from collada.common import DaeError
-from collada.util import IndexedList
 from collada.util import basestring, BytesIO
+from collada.util import IndexedList
+from collada.xmlutil import etree as ElementTree
+
+try:
+    from collada import schema
+except ImportError: # no lxml
+    schema = None
 
 
 class Collada(object):
@@ -114,7 +118,7 @@ def __init__(self, filename=None, ignore=None, aux_file_loader=None, zip_filenam
         self.scene = None
         """The default scene. This is either an instance of :class:`collada.scene.Scene` or `None`."""
 
-        if validate_output:
+        if validate_output and schema:
             self.validator = schema.ColladaValidator()
         else:
             self.validator = None
@@ -185,13 +189,12 @@ def __init__(self, filename=None, ignore=None, aux_file_loader=None, zip_filenam
         if aux_file_loader is not None:
             self.getFileData = aux_file_loader
 
-        etree_parser = ElementTree.XMLParser(remove_comments=True,
-                remove_blank_text=True)
+        etree_parser = ElementTree.XMLParser()
         try:
             self.xmlnode = ElementTree.ElementTree(element=None,
-                    file=BytesIO(data), parser=etree_parser)
-        except ElementTree.XMLSyntaxError as e:
-            raise DaeMalformedError("XML Syntax Parsing Error: %s" % e)
+                    file=BytesIO(data))
+        except ElementTree.ParseError as e:
+            raise DaeMalformedError("XML Parsing Error: %s" % e)
 
         self._loadAssetInfo()
         self._loadImages()
@@ -456,9 +459,8 @@ def save(self):
         self.assetInfo.save()
         assetnode = self.xmlnode.getroot().find(tag('asset'))
         if assetnode is not None:
-            self.xmlnode.getroot().replace(assetnode, self.assetInfo.xmlnode)
-        else:
-            self.xmlnode.getroot().insert(0, self.assetInfo.xmlnode)
+            self.xmlnode.getroot().remove(assetnode)
+        self.xmlnode.getroot().insert(0, self.assetInfo.xmlnode)
 
         library_loc = 0
         for i, node in enumerate(self.xmlnode.getroot()):
@@ -510,7 +512,7 @@ def write(self, fp):
         self.save()
         if isinstance(fp, basestring):
             fp = open(fp, 'wb')
-        self.xmlnode.write(fp, pretty_print=True)
+        self.xmlnode.write(fp)
 
     def __str__(self):
         return '<Collada geometries=%d>' % (len(self.geometries))

collada/asset.py

@@ -15,12 +15,12 @@
 import numpy
 import datetime
 import dateutil.parser
-from lxml import etree as ElementTree
 
 from collada.common import DaeObject, E, tag
 from collada.common import DaeIncompleteError, DaeBrokenRefError, \
         DaeMalformedError, DaeUnsupportedError
 from collada.util import _correctValInNode
+from collada.xmlutil import etree as ElementTree
 
 
 class UP_AXIS:

collada/camera.py

@@ -13,11 +13,11 @@
 """Contains objects for representing cameras"""
 
 import numpy
-from lxml import etree as ElementTree
 
 from collada.common import DaeObject, E, tag
 from collada.common import DaeIncompleteError, DaeBrokenRefError, \
         DaeMalformedError
+from collada.xmlutil import etree as ElementTree
 
 
 class Camera(DaeObject):

collada/common.py

@@ -1,5 +1,4 @@
-from lxml import etree
-from lxml.builder import ElementMaker
+from collada.xmlutil import etree, ElementMaker
 
 
 COLLADA_NS = 'http://www.collada.org/2005/11/COLLADASchema'

collada/controller.py

@@ -15,14 +15,14 @@
     experimental. More support will be added in version 0.4.**"""
 
 import numpy
-from lxml import etree as ElementTree
 
 from collada import source
 from collada.common import DaeObject, tag
 from collada.common import DaeIncompleteError, DaeBrokenRefError, \
         DaeMalformedError, DaeUnsupportedError
 from collada.geometry import Geometry
 from collada.util import checkSource
+from collada.xmlutil import etree as ElementTree
 
 
 class Controller(DaeObject):

collada/geometry.py

@@ -12,9 +12,8 @@
 
 """Contains objects for representing a geometry."""
 
-from lxml import etree as ElementTree
 import numpy
-import types
+
 from collada import source
 from collada import triangleset
 from collada import lineset
@@ -24,6 +23,7 @@
 from collada.common import DaeObject, E, tag
 from collada.common import DaeIncompleteError, DaeBrokenRefError, \
         DaeMalformedError, DaeUnsupportedError
+from collada.xmlutil import etree as ElementTree
 
 
 class Geometry(DaeObject):

collada/light.py

@@ -13,11 +13,12 @@
 """Contains objects for representing lights."""
 
 import numpy
-from lxml import etree as ElementTree
+
 from collada.common import DaeObject, E, tag
 from collada.common import DaeIncompleteError, DaeBrokenRefError, \
         DaeMalformedError, DaeUnsupportedError
 from collada.util import _correctValInNode
+from collada.xmlutil import etree as ElementTree
 
 
 class Light(DaeObject):

collada/lineset.py

@@ -13,13 +13,13 @@
 """Module containing classes and functions for the <lines> primitive."""
 
 import numpy
-from lxml import etree as ElementTree
 
 from collada import primitive
 from collada.util import toUnitVec, checkSource
 from collada.common import E, tag
 from collada.common import DaeIncompleteError, DaeBrokenRefError, \
         DaeMalformedError, DaeUnsupportedError
+from collada.xmlutil import etree as ElementTree
 
 
 class Line(object):

collada/material.py

@@ -21,12 +21,12 @@
 
 import copy
 import numpy
-from lxml import etree as ElementTree
 
 from collada.common import DaeObject, E, tag
 from collada.common import DaeIncompleteError, DaeBrokenRefError, \
         DaeMalformedError, DaeUnsupportedError
 from collada.util import falmostEqual, StringIO
+from collada.xmlutil import etree as ElementTree
 
 try:
     import Image as pil
@@ -642,7 +642,8 @@ def _loadShadingParam( collada, localscope, node ):
             else:
                 return None
         else:
-            raise DaeUnsupportedError('Unknown shading param definition ' + vnode.tag)
+            raise DaeUnsupportedError('Unknown shading param definition ' + \
+                    vnode.tag)
         return value
 
     def _fixColorValues(self):
@@ -670,7 +671,8 @@ def save(self):
         for param in self.params:
             param.save()
             if param.xmlnode not in profilenode.getchildren():
-                profilenode.insert(profilenode.index(tecnode), param.xmlnode)
+                profilenode.insert(list(profilenode).index(tecnode),
+                        param.xmlnode)
 
         deletenodes = []
         for oldparam in profilenode.findall( tag('newparam') ):

collada/polygons.py

@@ -13,15 +13,15 @@
 """Module containing classes and functions for the <polygons> primitive."""
 
 import numpy
-from lxml import etree as ElementTree
 
 from collada import primitive
 from collada import polylist
 from collada import triangleset
-from collada.util import toUnitVec, checkSource
 from collada.common import E, tag
 from collada.common import DaeIncompleteError, DaeBrokenRefError, \
         DaeMalformedError, DaeUnsupportedError
+from collada.util import toUnitVec, checkSource
+from collada.xmlutil import etree as ElementTree
 
 
 class Polygons(polylist.Polylist):

collada/polylist.py

@@ -13,14 +13,14 @@
 """Module containing classes and functions for the <polylist> primitive."""
 
 import numpy
-from lxml import etree as ElementTree
 
 from collada import primitive
 from collada import triangleset
 from collada.common import E, tag
 from collada.common import DaeIncompleteError, DaeBrokenRefError, \
         DaeMalformedError, DaeUnsupportedError
 from collada.util import toUnitVec, checkSource, xrange
+from collada.xmlutil import etree as ElementTree
 
 
 class Polygon(object):

collada/scene.py

@@ -25,12 +25,12 @@
 
 import copy
 import numpy
-from lxml import etree as ElementTree
 
-from collada.util import toUnitVec
 from collada.common import DaeObject, E, tag
 from collada.common import DaeError, DaeIncompleteError, DaeBrokenRefError, \
         DaeMalformedError, DaeUnsupportedError
+from collada.util import toUnitVec
+from collada.xmlutil import etree as ElementTree
 
 
 class DaeInstanceNotLoadedError(Exception):

collada/source.py

@@ -13,10 +13,10 @@
 """Module for managing data sources defined in geometry tags."""
 
 import numpy
-from lxml import etree as ElementTree
 
 from collada.common import DaeObject, E, tag
 from collada.common import DaeIncompleteError, DaeBrokenRefError, DaeMalformedError
+from collada.xmlutil import etree as ElementTree
 
 class InputList(object):
     """Used for defining input sources to a geometry."""

collada/tests/test_asset.py

@@ -1,8 +1,11 @@
 import datetime
-from lxml.etree import fromstring, tostring
 
 import collada
 from collada.util import unittest
+from collada.xmlutil import etree
+
+fromstring = etree.fromstring
+tostring = etree.tostring
 
 
 class TestAsset(unittest.TestCase):

collada/tests/test_camera.py

@@ -1,8 +1,10 @@
-from lxml.etree import fromstring, tostring
-
 import collada
 from collada.common import DaeMalformedError
 from collada.util import unittest
+from collada.xmlutil import etree
+
+fromstring = etree.fromstring
+tostring = etree.tostring
 
 
 class TestCamera(unittest.TestCase):

collada/tests/test_collada.py

@@ -1,10 +1,13 @@
 import os
 import numpy
 import dateutil.parser
-from lxml.etree import fromstring, tostring
 
 import collada
 from collada.util import unittest, BytesIO
+from collada.xmlutil import etree
+
+fromstring = etree.fromstring
+tostring = etree.tostring
 
 
 class TestCollada(unittest.TestCase):
@@ -268,7 +271,7 @@ def test_collada_saving(self):
 
         loaded_mesh.save()
 
-        strdata = tostring(loaded_mesh.xmlnode)
+        strdata = tostring(loaded_mesh.xmlnode.getroot())
         indata = BytesIO(strdata)
         loaded_mesh2 = collada.Collada(indata, validate_output=True)
 

collada/tests/test_geometry.py

@@ -1,8 +1,11 @@
 import numpy
-from lxml.etree import fromstring, tostring
 
 import collada
 from collada.util import unittest
+from collada.xmlutil import etree
+
+fromstring = etree.fromstring
+tostring = etree.tostring
 
 
 class TestGeometry(unittest.TestCase):

collada/tests/test_light.py

@@ -1,7 +1,9 @@
-from lxml.etree import fromstring, tostring
-
 import collada
 from collada.util import unittest
+from collada.xmlutil import etree
+
+fromstring = etree.fromstring
+tostring = etree.tostring
 
 
 class TestLight(unittest.TestCase):

collada/tests/test_material.py

@@ -1,9 +1,12 @@
 import os
 import sys
-from lxml.etree import fromstring, tostring
 
 import collada
 from collada.util import unittest
+from collada.xmlutil import etree
+
+fromstring = etree.fromstring
+tostring = etree.tostring
 
 
 class TestMaterial(unittest.TestCase):

collada/tests/test_scene.py

@@ -1,8 +1,11 @@
 import numpy
-from lxml.etree import fromstring, tostring
 
 import collada
 from collada.util import unittest
+from collada.xmlutil import etree
+
+fromstring = etree.fromstring
+tostring = etree.tostring
 
 
 class TestScene(unittest.TestCase):

collada/tests/test_source.py

@@ -1,8 +1,11 @@
 import numpy
-from lxml.etree import fromstring, tostring
 
 import collada
 from collada.util import unittest
+from collada.xmlutil import etree
+
+fromstring = etree.fromstring
+tostring = etree.tostring
 
 
 class TestSource(unittest.TestCase):

collada/triangleset.py

@@ -13,13 +13,13 @@
 """Module containing classes and functions for the <triangles> primitive."""
 
 import numpy
-from lxml import etree as ElementTree
 
 from collada import primitive
 from collada.common import E, tag
 from collada.common import DaeIncompleteError, DaeBrokenRefError, \
         DaeMalformedError, DaeUnsupportedError
 from collada.util import toUnitVec, checkSource, normalize_v3, dot_v3, xrange
+from collada.xmlutil import etree as ElementTree
 
 
 class Triangle(object):