Migrated from ElementTree to lxml. #176

2014-02-26 20:56:25 -05:00 · 2014-02-26 20:56:25 -05:00 · 63fdde230d
commit 63fdde230d
parent 15358326da
9 changed files with 296 additions and 281 deletions
--- a/glymur/_uuid_io.py
+++ b/glymur/_uuid_io.py
@ -7,7 +7,8 @@ import re
 import struct
 import sys
 import warnings
-import xml.etree.cElementTree as ET
+
+import lxml.etree as ET

 if sys.hexversion < 0x02070000:
    # pylint: disable=F0401,E0611
--- a/glymur/core.py
+++ b/glymur/core.py
@ -1,7 +1,7 @@
 """Core definitions to be shared amongst the modules.
 """
 import copy
-import xml.etree.cElementTree as ET
+import lxml.etree as ET

 # Progression order
 LRCP = 0
@ -81,9 +81,9 @@ _CAPABILITIES_DISPLAY = {
 def _pretty_print_xml(xml, level=0):
    """Pretty print XML data.
    """
-    xml = copy.deepcopy(xml)
-    _indent(xml.getroot(), level=level)
-    xmltext = ET.tostring(xml.getroot(), encoding='utf-8').decode('utf-8')
+    #xml = copy.deepcopy(xml)
+    #_indent(xml.getroot(), level=level)
+    xmltext = ET.tostring(xml, encoding='utf-8').decode('utf-8')

    # Indent it a bit.
    lst = [('    ' + x) for x in xmltext.split('\n')]
--- a/glymur/jp2box.py
+++ b/glymur/jp2box.py
@ -22,8 +22,8 @@ import struct
 import sys
 import uuid
 import warnings
-import xml.etree.cElementTree as ET

+import lxml.etree as ET
 import numpy as np

 from .codestream import Codestream
@ -2565,7 +2565,10 @@ class XMLBox(Jp2kBox):

        xml = self.xml
        if self.xml is not None:
-            msg += _pretty_print_xml(self.xml)
+            bstr = ET.tostring(self.xml,
+                               encoding='utf-8',
+                               pretty_print=True).decode('utf-8')
+            msg += '\n    {0}'.format(bstr)
        else:
            msg += '\n    {0}'.format(xml)
        return msg
@ -2971,8 +2974,10 @@ class UUIDBox(Jp2kBox):
            return msg

        if self.uuid == uuid.UUID('be7acfcb-97a9-42e8-9c71-999491e3afac'):
-            line = '\n    UUID Data:  {0}'
-            xmlstring = _pretty_print_xml(self.data)
+            line = '\n    UUID Data:\n{0}'
+            xmlstring = ET.tostring(self.data,
+                                    encoding='utf-8',
+                                    pretty_print=True).decode('utf-8')
            xmlstring = xmlstring.rstrip()
            msg += line.format(xmlstring)
        elif self.uuid.bytes == b'JpgTiffExif->JP2':
--- a/glymur/test/fixtures.py
+++ b/glymur/test/fixtures.py
@ -183,90 +183,92 @@ def read_pgx_header(pgx_file):

 nemo_xmp_box = """UUID Box (uuid) @ (77, 3146)
    UUID:  be7acfcb-97a9-42e8-9c71-999491e3afac (XMP)
-    UUID Data:  
-    <ns0:xmpmeta xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:ns0="adobe:ns:meta/" xmlns:ns2="http://ns.adobe.com/xap/1.0/" xmlns:ns3="http://ns.adobe.com/tiff/1.0/" xmlns:ns4="http://ns.adobe.com/exif/1.0/" xmlns:ns5="http://ns.adobe.com/photoshop/1.0/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" ns0:xmptk="Exempi + XMP Core 5.1.2">
-      <rdf:RDF>
-        <rdf:Description rdf:about="">
-          <ns2:CreatorTool>Google</ns2:CreatorTool>
-          <ns2:CreateDate>2013-02-09T14:47:53</ns2:CreateDate>
-        </rdf:Description>
-        <rdf:Description rdf:about="">
-          <ns3:YCbCrPositioning>1</ns3:YCbCrPositioning>
-          <ns3:XResolution>72/1</ns3:XResolution>
-          <ns3:YResolution>72/1</ns3:YResolution>
-          <ns3:ResolutionUnit>2</ns3:ResolutionUnit>
-          <ns3:Make>HTC</ns3:Make>
-          <ns3:Model>HTC Glacier</ns3:Model>
-          <ns3:ImageWidth>2592</ns3:ImageWidth>
-          <ns3:ImageLength>1456</ns3:ImageLength>
-          <ns3:BitsPerSample>
-            <rdf:Seq>
-              <rdf:li>8</rdf:li>
-              <rdf:li>8</rdf:li>
-              <rdf:li>8</rdf:li>
-            </rdf:Seq>
-          </ns3:BitsPerSample>
-          <ns3:PhotometricInterpretation>2</ns3:PhotometricInterpretation>
-          <ns3:SamplesPerPixel>3</ns3:SamplesPerPixel>
-          <ns3:WhitePoint>
-            <rdf:Seq>
-              <rdf:li>1343036288/4294967295</rdf:li>
-              <rdf:li>1413044224/4294967295</rdf:li>
-            </rdf:Seq>
-          </ns3:WhitePoint>
-          <ns3:PrimaryChromaticities>
-            <rdf:Seq>
-              <rdf:li>2748779008/4294967295</rdf:li>
-              <rdf:li>1417339264/4294967295</rdf:li>
-              <rdf:li>1288490240/4294967295</rdf:li>
-              <rdf:li>2576980480/4294967295</rdf:li>
-              <rdf:li>644245120/4294967295</rdf:li>
-              <rdf:li>257698032/4294967295</rdf:li>
-            </rdf:Seq>
-          </ns3:PrimaryChromaticities>
-        </rdf:Description>
-        <rdf:Description rdf:about="">
-          <ns4:ColorSpace>1</ns4:ColorSpace>
-          <ns4:PixelXDimension>2528</ns4:PixelXDimension>
-          <ns4:PixelYDimension>1424</ns4:PixelYDimension>
-          <ns4:FocalLength>353/100</ns4:FocalLength>
-          <ns4:GPSAltitudeRef>0</ns4:GPSAltitudeRef>
-          <ns4:GPSAltitude>0/1</ns4:GPSAltitude>
-          <ns4:GPSMapDatum>WGS-84</ns4:GPSMapDatum>
-          <ns4:DateTimeOriginal>2013-02-09T14:47:53</ns4:DateTimeOriginal>
-          <ns4:ISOSpeedRatings>
-            <rdf:Seq>
-              <rdf:li>76</rdf:li>
-            </rdf:Seq>
-          </ns4:ISOSpeedRatings>
-          <ns4:ExifVersion>0220</ns4:ExifVersion>
-          <ns4:FlashpixVersion>0100</ns4:FlashpixVersion>
-          <ns4:ComponentsConfiguration>
-            <rdf:Seq>
-              <rdf:li>1</rdf:li>
-              <rdf:li>2</rdf:li>
-              <rdf:li>3</rdf:li>
-              <rdf:li>0</rdf:li>
-            </rdf:Seq>
-          </ns4:ComponentsConfiguration>
-          <ns4:GPSLatitude>42,20.56N</ns4:GPSLatitude>
-          <ns4:GPSLongitude>71,5.29W</ns4:GPSLongitude>
-          <ns4:GPSTimeStamp>2013-02-09T19:47:53Z</ns4:GPSTimeStamp>
-          <ns4:GPSProcessingMethod>NETWORK</ns4:GPSProcessingMethod>
-        </rdf:Description>
-        <rdf:Description rdf:about="">
-          <ns5:DateCreated>2013-02-09T14:47:53</ns5:DateCreated>
-        </rdf:Description>
-        <rdf:Description rdf:about="">
-          <dc:Creator>
-            <rdf:Seq>
-              <rdf:li>Glymur</rdf:li>
-              <rdf:li>Python XMP Toolkit</rdf:li>
-            </rdf:Seq>
-          </dc:Creator>
-        </rdf:Description>
-      </rdf:RDF>
-    </ns0:xmpmeta>"""
+    UUID Data:
+<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+<ns0:xmpmeta xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:ns0="adobe:ns:meta/" xmlns:ns2="http://ns.adobe.com/xap/1.0/" xmlns:ns3="http://ns.adobe.com/tiff/1.0/" xmlns:ns4="http://ns.adobe.com/exif/1.0/" xmlns:ns5="http://ns.adobe.com/photoshop/1.0/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" ns0:xmptk="Exempi + XMP Core 5.1.2">
+ <rdf:RDF>
+  <rdf:Description rdf:about="">
+   <ns2:CreatorTool>Google</ns2:CreatorTool>
+   <ns2:CreateDate>2013-02-09T14:47:53</ns2:CreateDate>
+  </rdf:Description>
+  <rdf:Description rdf:about="">
+   <ns3:YCbCrPositioning>1</ns3:YCbCrPositioning>
+   <ns3:XResolution>72/1</ns3:XResolution>
+   <ns3:YResolution>72/1</ns3:YResolution>
+   <ns3:ResolutionUnit>2</ns3:ResolutionUnit>
+   <ns3:Make>HTC</ns3:Make>
+   <ns3:Model>HTC Glacier</ns3:Model>
+   <ns3:ImageWidth>2592</ns3:ImageWidth>
+   <ns3:ImageLength>1456</ns3:ImageLength>
+   <ns3:BitsPerSample>
+    <rdf:Seq>
+     <rdf:li>8</rdf:li>
+     <rdf:li>8</rdf:li>
+     <rdf:li>8</rdf:li>
+    </rdf:Seq>
+   </ns3:BitsPerSample>
+   <ns3:PhotometricInterpretation>2</ns3:PhotometricInterpretation>
+   <ns3:SamplesPerPixel>3</ns3:SamplesPerPixel>
+   <ns3:WhitePoint>
+    <rdf:Seq>
+     <rdf:li>1343036288/4294967295</rdf:li>
+     <rdf:li>1413044224/4294967295</rdf:li>
+    </rdf:Seq>
+   </ns3:WhitePoint>
+   <ns3:PrimaryChromaticities>
+    <rdf:Seq>
+     <rdf:li>2748779008/4294967295</rdf:li>
+     <rdf:li>1417339264/4294967295</rdf:li>
+     <rdf:li>1288490240/4294967295</rdf:li>
+     <rdf:li>2576980480/4294967295</rdf:li>
+     <rdf:li>644245120/4294967295</rdf:li>
+     <rdf:li>257698032/4294967295</rdf:li>
+    </rdf:Seq>
+   </ns3:PrimaryChromaticities>
+  </rdf:Description>
+  <rdf:Description rdf:about="">
+   <ns4:ColorSpace>1</ns4:ColorSpace>
+   <ns4:PixelXDimension>2528</ns4:PixelXDimension>
+   <ns4:PixelYDimension>1424</ns4:PixelYDimension>
+   <ns4:FocalLength>353/100</ns4:FocalLength>
+   <ns4:GPSAltitudeRef>0</ns4:GPSAltitudeRef>
+   <ns4:GPSAltitude>0/1</ns4:GPSAltitude>
+   <ns4:GPSMapDatum>WGS-84</ns4:GPSMapDatum>
+   <ns4:DateTimeOriginal>2013-02-09T14:47:53</ns4:DateTimeOriginal>
+   <ns4:ISOSpeedRatings>
+    <rdf:Seq>
+     <rdf:li>76</rdf:li>
+    </rdf:Seq>
+   </ns4:ISOSpeedRatings>
+   <ns4:ExifVersion>0220</ns4:ExifVersion>
+   <ns4:FlashpixVersion>0100</ns4:FlashpixVersion>
+   <ns4:ComponentsConfiguration>
+    <rdf:Seq>
+     <rdf:li>1</rdf:li>
+     <rdf:li>2</rdf:li>
+     <rdf:li>3</rdf:li>
+     <rdf:li>0</rdf:li>
+    </rdf:Seq>
+   </ns4:ComponentsConfiguration>
+   <ns4:GPSLatitude>42,20.56N</ns4:GPSLatitude>
+   <ns4:GPSLongitude>71,5.29W</ns4:GPSLongitude>
+   <ns4:GPSTimeStamp>2013-02-09T19:47:53Z</ns4:GPSTimeStamp>
+   <ns4:GPSProcessingMethod>NETWORK</ns4:GPSProcessingMethod>
+  </rdf:Description>
+  <rdf:Description rdf:about="">
+   <ns5:DateCreated>2013-02-09T14:47:53</ns5:DateCreated>
+  </rdf:Description>
+  <rdf:Description rdf:about="">
+   <dc:Creator>
+    <rdf:Seq>
+     <rdf:li>Glymur</rdf:li>
+     <rdf:li>Python XMP Toolkit</rdf:li>
+    </rdf:Seq>
+   </dc:Creator>
+  </rdf:Description>
+ </rdf:RDF>
+</ns0:xmpmeta>
+<?xpacket end="w"?>"""

 SimpleRDF = """<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
  <rdf:Description rdf:about='Test:XMPCoreCoverage/kSimpleRDF'
@ -371,90 +373,92 @@ JP2 Header Box (jp2h) @ (32, 45)
        Colorspace:  sRGB
 UUID Box (uuid) @ (77, 3146)
    UUID:  be7acfcb-97a9-42e8-9c71-999491e3afac (XMP)
-    UUID Data:  
-    <ns0:xmpmeta xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:ns0="adobe:ns:meta/" xmlns:ns2="http://ns.adobe.com/xap/1.0/" xmlns:ns3="http://ns.adobe.com/tiff/1.0/" xmlns:ns4="http://ns.adobe.com/exif/1.0/" xmlns:ns5="http://ns.adobe.com/photoshop/1.0/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" ns0:xmptk="Exempi + XMP Core 5.1.2">
-      <rdf:RDF>
-        <rdf:Description rdf:about="">
-          <ns2:CreatorTool>Google</ns2:CreatorTool>
-          <ns2:CreateDate>2013-02-09T14:47:53</ns2:CreateDate>
-        </rdf:Description>
-        <rdf:Description rdf:about="">
-          <ns3:YCbCrPositioning>1</ns3:YCbCrPositioning>
-          <ns3:XResolution>72/1</ns3:XResolution>
-          <ns3:YResolution>72/1</ns3:YResolution>
-          <ns3:ResolutionUnit>2</ns3:ResolutionUnit>
-          <ns3:Make>HTC</ns3:Make>
-          <ns3:Model>HTC Glacier</ns3:Model>
-          <ns3:ImageWidth>2592</ns3:ImageWidth>
-          <ns3:ImageLength>1456</ns3:ImageLength>
-          <ns3:BitsPerSample>
-            <rdf:Seq>
-              <rdf:li>8</rdf:li>
-              <rdf:li>8</rdf:li>
-              <rdf:li>8</rdf:li>
-            </rdf:Seq>
-          </ns3:BitsPerSample>
-          <ns3:PhotometricInterpretation>2</ns3:PhotometricInterpretation>
-          <ns3:SamplesPerPixel>3</ns3:SamplesPerPixel>
-          <ns3:WhitePoint>
-            <rdf:Seq>
-              <rdf:li>1343036288/4294967295</rdf:li>
-              <rdf:li>1413044224/4294967295</rdf:li>
-            </rdf:Seq>
-          </ns3:WhitePoint>
-          <ns3:PrimaryChromaticities>
-            <rdf:Seq>
-              <rdf:li>2748779008/4294967295</rdf:li>
-              <rdf:li>1417339264/4294967295</rdf:li>
-              <rdf:li>1288490240/4294967295</rdf:li>
-              <rdf:li>2576980480/4294967295</rdf:li>
-              <rdf:li>644245120/4294967295</rdf:li>
-              <rdf:li>257698032/4294967295</rdf:li>
-            </rdf:Seq>
-          </ns3:PrimaryChromaticities>
-        </rdf:Description>
-        <rdf:Description rdf:about="">
-          <ns4:ColorSpace>1</ns4:ColorSpace>
-          <ns4:PixelXDimension>2528</ns4:PixelXDimension>
-          <ns4:PixelYDimension>1424</ns4:PixelYDimension>
-          <ns4:FocalLength>353/100</ns4:FocalLength>
-          <ns4:GPSAltitudeRef>0</ns4:GPSAltitudeRef>
-          <ns4:GPSAltitude>0/1</ns4:GPSAltitude>
-          <ns4:GPSMapDatum>WGS-84</ns4:GPSMapDatum>
-          <ns4:DateTimeOriginal>2013-02-09T14:47:53</ns4:DateTimeOriginal>
-          <ns4:ISOSpeedRatings>
-            <rdf:Seq>
-              <rdf:li>76</rdf:li>
-            </rdf:Seq>
-          </ns4:ISOSpeedRatings>
-          <ns4:ExifVersion>0220</ns4:ExifVersion>
-          <ns4:FlashpixVersion>0100</ns4:FlashpixVersion>
-          <ns4:ComponentsConfiguration>
-            <rdf:Seq>
-              <rdf:li>1</rdf:li>
-              <rdf:li>2</rdf:li>
-              <rdf:li>3</rdf:li>
-              <rdf:li>0</rdf:li>
-            </rdf:Seq>
-          </ns4:ComponentsConfiguration>
-          <ns4:GPSLatitude>42,20.56N</ns4:GPSLatitude>
-          <ns4:GPSLongitude>71,5.29W</ns4:GPSLongitude>
-          <ns4:GPSTimeStamp>2013-02-09T19:47:53Z</ns4:GPSTimeStamp>
-          <ns4:GPSProcessingMethod>NETWORK</ns4:GPSProcessingMethod>
-        </rdf:Description>
-        <rdf:Description rdf:about="">
-          <ns5:DateCreated>2013-02-09T14:47:53</ns5:DateCreated>
-        </rdf:Description>
-        <rdf:Description rdf:about="">
-          <dc:Creator>
-            <rdf:Seq>
-              <rdf:li>Glymur</rdf:li>
-              <rdf:li>Python XMP Toolkit</rdf:li>
-            </rdf:Seq>
-          </dc:Creator>
-        </rdf:Description>
-      </rdf:RDF>
-    </ns0:xmpmeta>
+    UUID Data:
+<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+<ns0:xmpmeta xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:ns0="adobe:ns:meta/" xmlns:ns2="http://ns.adobe.com/xap/1.0/" xmlns:ns3="http://ns.adobe.com/tiff/1.0/" xmlns:ns4="http://ns.adobe.com/exif/1.0/" xmlns:ns5="http://ns.adobe.com/photoshop/1.0/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" ns0:xmptk="Exempi + XMP Core 5.1.2">
+ <rdf:RDF>
+  <rdf:Description rdf:about="">
+   <ns2:CreatorTool>Google</ns2:CreatorTool>
+   <ns2:CreateDate>2013-02-09T14:47:53</ns2:CreateDate>
+  </rdf:Description>
+  <rdf:Description rdf:about="">
+   <ns3:YCbCrPositioning>1</ns3:YCbCrPositioning>
+   <ns3:XResolution>72/1</ns3:XResolution>
+   <ns3:YResolution>72/1</ns3:YResolution>
+   <ns3:ResolutionUnit>2</ns3:ResolutionUnit>
+   <ns3:Make>HTC</ns3:Make>
+   <ns3:Model>HTC Glacier</ns3:Model>
+   <ns3:ImageWidth>2592</ns3:ImageWidth>
+   <ns3:ImageLength>1456</ns3:ImageLength>
+   <ns3:BitsPerSample>
+    <rdf:Seq>
+     <rdf:li>8</rdf:li>
+     <rdf:li>8</rdf:li>
+     <rdf:li>8</rdf:li>
+    </rdf:Seq>
+   </ns3:BitsPerSample>
+   <ns3:PhotometricInterpretation>2</ns3:PhotometricInterpretation>
+   <ns3:SamplesPerPixel>3</ns3:SamplesPerPixel>
+   <ns3:WhitePoint>
+    <rdf:Seq>
+     <rdf:li>1343036288/4294967295</rdf:li>
+     <rdf:li>1413044224/4294967295</rdf:li>
+    </rdf:Seq>
+   </ns3:WhitePoint>
+   <ns3:PrimaryChromaticities>
+    <rdf:Seq>
+     <rdf:li>2748779008/4294967295</rdf:li>
+     <rdf:li>1417339264/4294967295</rdf:li>
+     <rdf:li>1288490240/4294967295</rdf:li>
+     <rdf:li>2576980480/4294967295</rdf:li>
+     <rdf:li>644245120/4294967295</rdf:li>
+     <rdf:li>257698032/4294967295</rdf:li>
+    </rdf:Seq>
+   </ns3:PrimaryChromaticities>
+  </rdf:Description>
+  <rdf:Description rdf:about="">
+   <ns4:ColorSpace>1</ns4:ColorSpace>
+   <ns4:PixelXDimension>2528</ns4:PixelXDimension>
+   <ns4:PixelYDimension>1424</ns4:PixelYDimension>
+   <ns4:FocalLength>353/100</ns4:FocalLength>
+   <ns4:GPSAltitudeRef>0</ns4:GPSAltitudeRef>
+   <ns4:GPSAltitude>0/1</ns4:GPSAltitude>
+   <ns4:GPSMapDatum>WGS-84</ns4:GPSMapDatum>
+   <ns4:DateTimeOriginal>2013-02-09T14:47:53</ns4:DateTimeOriginal>
+   <ns4:ISOSpeedRatings>
+    <rdf:Seq>
+     <rdf:li>76</rdf:li>
+    </rdf:Seq>
+   </ns4:ISOSpeedRatings>
+   <ns4:ExifVersion>0220</ns4:ExifVersion>
+   <ns4:FlashpixVersion>0100</ns4:FlashpixVersion>
+   <ns4:ComponentsConfiguration>
+    <rdf:Seq>
+     <rdf:li>1</rdf:li>
+     <rdf:li>2</rdf:li>
+     <rdf:li>3</rdf:li>
+     <rdf:li>0</rdf:li>
+    </rdf:Seq>
+   </ns4:ComponentsConfiguration>
+   <ns4:GPSLatitude>42,20.56N</ns4:GPSLatitude>
+   <ns4:GPSLongitude>71,5.29W</ns4:GPSLongitude>
+   <ns4:GPSTimeStamp>2013-02-09T19:47:53Z</ns4:GPSTimeStamp>
+   <ns4:GPSProcessingMethod>NETWORK</ns4:GPSProcessingMethod>
+  </rdf:Description>
+  <rdf:Description rdf:about="">
+   <ns5:DateCreated>2013-02-09T14:47:53</ns5:DateCreated>
+  </rdf:Description>
+  <rdf:Description rdf:about="">
+   <dc:Creator>
+    <rdf:Seq>
+     <rdf:li>Glymur</rdf:li>
+     <rdf:li>Python XMP Toolkit</rdf:li>
+    </rdf:Seq>
+   </dc:Creator>
+  </rdf:Description>
+ </rdf:RDF>
+</ns0:xmpmeta>
+<?xpacket end="w"?>
 Contiguous Codestream Box (jp2c) @ (3223, 1132296)
    Main header:
        SOC marker segment @ (3231, 0)
@ -575,90 +579,92 @@ JP2 Header Box (jp2h) @ (32, 45)
        Colorspace:  sRGB
 UUID Box (uuid) @ (77, 3146)
    UUID:  be7acfcb-97a9-42e8-9c71-999491e3afac (XMP)
-    UUID Data:  
-    <ns0:xmpmeta xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:ns0="adobe:ns:meta/" xmlns:ns2="http://ns.adobe.com/xap/1.0/" xmlns:ns3="http://ns.adobe.com/tiff/1.0/" xmlns:ns4="http://ns.adobe.com/exif/1.0/" xmlns:ns5="http://ns.adobe.com/photoshop/1.0/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" ns0:xmptk="Exempi + XMP Core 5.1.2">
-      <rdf:RDF>
-        <rdf:Description rdf:about="">
-          <ns2:CreatorTool>Google</ns2:CreatorTool>
-          <ns2:CreateDate>2013-02-09T14:47:53</ns2:CreateDate>
-        </rdf:Description>
-        <rdf:Description rdf:about="">
-          <ns3:YCbCrPositioning>1</ns3:YCbCrPositioning>
-          <ns3:XResolution>72/1</ns3:XResolution>
-          <ns3:YResolution>72/1</ns3:YResolution>
-          <ns3:ResolutionUnit>2</ns3:ResolutionUnit>
-          <ns3:Make>HTC</ns3:Make>
-          <ns3:Model>HTC Glacier</ns3:Model>
-          <ns3:ImageWidth>2592</ns3:ImageWidth>
-          <ns3:ImageLength>1456</ns3:ImageLength>
-          <ns3:BitsPerSample>
-            <rdf:Seq>
-              <rdf:li>8</rdf:li>
-              <rdf:li>8</rdf:li>
-              <rdf:li>8</rdf:li>
-            </rdf:Seq>
-          </ns3:BitsPerSample>
-          <ns3:PhotometricInterpretation>2</ns3:PhotometricInterpretation>
-          <ns3:SamplesPerPixel>3</ns3:SamplesPerPixel>
-          <ns3:WhitePoint>
-            <rdf:Seq>
-              <rdf:li>1343036288/4294967295</rdf:li>
-              <rdf:li>1413044224/4294967295</rdf:li>
-            </rdf:Seq>
-          </ns3:WhitePoint>
-          <ns3:PrimaryChromaticities>
-            <rdf:Seq>
-              <rdf:li>2748779008/4294967295</rdf:li>
-              <rdf:li>1417339264/4294967295</rdf:li>
-              <rdf:li>1288490240/4294967295</rdf:li>
-              <rdf:li>2576980480/4294967295</rdf:li>
-              <rdf:li>644245120/4294967295</rdf:li>
-              <rdf:li>257698032/4294967295</rdf:li>
-            </rdf:Seq>
-          </ns3:PrimaryChromaticities>
-        </rdf:Description>
-        <rdf:Description rdf:about="">
-          <ns4:ColorSpace>1</ns4:ColorSpace>
-          <ns4:PixelXDimension>2528</ns4:PixelXDimension>
-          <ns4:PixelYDimension>1424</ns4:PixelYDimension>
-          <ns4:FocalLength>353/100</ns4:FocalLength>
-          <ns4:GPSAltitudeRef>0</ns4:GPSAltitudeRef>
-          <ns4:GPSAltitude>0/1</ns4:GPSAltitude>
-          <ns4:GPSMapDatum>WGS-84</ns4:GPSMapDatum>
-          <ns4:DateTimeOriginal>2013-02-09T14:47:53</ns4:DateTimeOriginal>
-          <ns4:ISOSpeedRatings>
-            <rdf:Seq>
-              <rdf:li>76</rdf:li>
-            </rdf:Seq>
-          </ns4:ISOSpeedRatings>
-          <ns4:ExifVersion>0220</ns4:ExifVersion>
-          <ns4:FlashpixVersion>0100</ns4:FlashpixVersion>
-          <ns4:ComponentsConfiguration>
-            <rdf:Seq>
-              <rdf:li>1</rdf:li>
-              <rdf:li>2</rdf:li>
-              <rdf:li>3</rdf:li>
-              <rdf:li>0</rdf:li>
-            </rdf:Seq>
-          </ns4:ComponentsConfiguration>
-          <ns4:GPSLatitude>42,20.56N</ns4:GPSLatitude>
-          <ns4:GPSLongitude>71,5.29W</ns4:GPSLongitude>
-          <ns4:GPSTimeStamp>2013-02-09T19:47:53Z</ns4:GPSTimeStamp>
-          <ns4:GPSProcessingMethod>NETWORK</ns4:GPSProcessingMethod>
-        </rdf:Description>
-        <rdf:Description rdf:about="">
-          <ns5:DateCreated>2013-02-09T14:47:53</ns5:DateCreated>
-        </rdf:Description>
-        <rdf:Description rdf:about="">
-          <dc:Creator>
-            <rdf:Seq>
-              <rdf:li>Glymur</rdf:li>
-              <rdf:li>Python XMP Toolkit</rdf:li>
-            </rdf:Seq>
-          </dc:Creator>
-        </rdf:Description>
-      </rdf:RDF>
-    </ns0:xmpmeta>
+    UUID Data:
+<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+<ns0:xmpmeta xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:ns0="adobe:ns:meta/" xmlns:ns2="http://ns.adobe.com/xap/1.0/" xmlns:ns3="http://ns.adobe.com/tiff/1.0/" xmlns:ns4="http://ns.adobe.com/exif/1.0/" xmlns:ns5="http://ns.adobe.com/photoshop/1.0/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" ns0:xmptk="Exempi + XMP Core 5.1.2">
+ <rdf:RDF>
+  <rdf:Description rdf:about="">
+   <ns2:CreatorTool>Google</ns2:CreatorTool>
+   <ns2:CreateDate>2013-02-09T14:47:53</ns2:CreateDate>
+  </rdf:Description>
+  <rdf:Description rdf:about="">
+   <ns3:YCbCrPositioning>1</ns3:YCbCrPositioning>
+   <ns3:XResolution>72/1</ns3:XResolution>
+   <ns3:YResolution>72/1</ns3:YResolution>
+   <ns3:ResolutionUnit>2</ns3:ResolutionUnit>
+   <ns3:Make>HTC</ns3:Make>
+   <ns3:Model>HTC Glacier</ns3:Model>
+   <ns3:ImageWidth>2592</ns3:ImageWidth>
+   <ns3:ImageLength>1456</ns3:ImageLength>
+   <ns3:BitsPerSample>
+    <rdf:Seq>
+     <rdf:li>8</rdf:li>
+     <rdf:li>8</rdf:li>
+     <rdf:li>8</rdf:li>
+    </rdf:Seq>
+   </ns3:BitsPerSample>
+   <ns3:PhotometricInterpretation>2</ns3:PhotometricInterpretation>
+   <ns3:SamplesPerPixel>3</ns3:SamplesPerPixel>
+   <ns3:WhitePoint>
+    <rdf:Seq>
+     <rdf:li>1343036288/4294967295</rdf:li>
+     <rdf:li>1413044224/4294967295</rdf:li>
+    </rdf:Seq>
+   </ns3:WhitePoint>
+   <ns3:PrimaryChromaticities>
+    <rdf:Seq>
+     <rdf:li>2748779008/4294967295</rdf:li>
+     <rdf:li>1417339264/4294967295</rdf:li>
+     <rdf:li>1288490240/4294967295</rdf:li>
+     <rdf:li>2576980480/4294967295</rdf:li>
+     <rdf:li>644245120/4294967295</rdf:li>
+     <rdf:li>257698032/4294967295</rdf:li>
+    </rdf:Seq>
+   </ns3:PrimaryChromaticities>
+  </rdf:Description>
+  <rdf:Description rdf:about="">
+   <ns4:ColorSpace>1</ns4:ColorSpace>
+   <ns4:PixelXDimension>2528</ns4:PixelXDimension>
+   <ns4:PixelYDimension>1424</ns4:PixelYDimension>
+   <ns4:FocalLength>353/100</ns4:FocalLength>
+   <ns4:GPSAltitudeRef>0</ns4:GPSAltitudeRef>
+   <ns4:GPSAltitude>0/1</ns4:GPSAltitude>
+   <ns4:GPSMapDatum>WGS-84</ns4:GPSMapDatum>
+   <ns4:DateTimeOriginal>2013-02-09T14:47:53</ns4:DateTimeOriginal>
+   <ns4:ISOSpeedRatings>
+    <rdf:Seq>
+     <rdf:li>76</rdf:li>
+    </rdf:Seq>
+   </ns4:ISOSpeedRatings>
+   <ns4:ExifVersion>0220</ns4:ExifVersion>
+   <ns4:FlashpixVersion>0100</ns4:FlashpixVersion>
+   <ns4:ComponentsConfiguration>
+    <rdf:Seq>
+     <rdf:li>1</rdf:li>
+     <rdf:li>2</rdf:li>
+     <rdf:li>3</rdf:li>
+     <rdf:li>0</rdf:li>
+    </rdf:Seq>
+   </ns4:ComponentsConfiguration>
+   <ns4:GPSLatitude>42,20.56N</ns4:GPSLatitude>
+   <ns4:GPSLongitude>71,5.29W</ns4:GPSLongitude>
+   <ns4:GPSTimeStamp>2013-02-09T19:47:53Z</ns4:GPSTimeStamp>
+   <ns4:GPSProcessingMethod>NETWORK</ns4:GPSProcessingMethod>
+  </rdf:Description>
+  <rdf:Description rdf:about="">
+   <ns5:DateCreated>2013-02-09T14:47:53</ns5:DateCreated>
+  </rdf:Description>
+  <rdf:Description rdf:about="">
+   <dc:Creator>
+    <rdf:Seq>
+     <rdf:li>Glymur</rdf:li>
+     <rdf:li>Python XMP Toolkit</rdf:li>
+    </rdf:Seq>
+   </dc:Creator>
+  </rdf:Description>
+ </rdf:RDF>
+</ns0:xmpmeta>
+<?xpacket end="w"?>
 Contiguous Codestream Box (jp2c) @ (3223, 1132296)"""

 nemo_dump_no_codestream_no_xml = r"""JPEG 2000 Signature Box (jP  ) @ (0, 12)
@ -691,10 +697,10 @@ file7_rreq = r"""Reader Requirements Box (rreq) @ (44, 24)
        Feature 043:  0x40 Deprecated - compositing layer uses restricted ICC profile
    Vendor Features:"""

-file1_xml = r"""XML Box (xml ) @ (36, 439)
-    <ns0:IMAGE_CREATION xmlns:ns0="http://www.jpeg.org/jpx/1.0/xml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jpeg.org/jpx/1.0/xml http://www.jpeg.org/metadata/15444-2.xsd">
-      <ns0:GENERAL_CREATION_INFO>
-        <ns0:CREATION_TIME>2001-11-01T13:45:00.000-06:00</ns0:CREATION_TIME>
-        <ns0:IMAGE_SOURCE>Professional 120 Image</ns0:IMAGE_SOURCE>
-      </ns0:GENERAL_CREATION_INFO>
-    </ns0:IMAGE_CREATION>"""
+file1_xml = """XML Box (xml ) @ (36, 439)
+    <IMAGE_CREATION xmlns="http://www.jpeg.org/jpx/1.0/xml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jpeg.org/jpx/1.0/xml http://www.jpeg.org/metadata/15444-2.xsd">
+\t<GENERAL_CREATION_INFO>
+\t\t<CREATION_TIME>2001-11-01T13:45:00.000-06:00</CREATION_TIME>
+\t\t<IMAGE_SOURCE>Professional 120 Image</IMAGE_SOURCE>
+\t</GENERAL_CREATION_INFO>
+</IMAGE_CREATION>"""
--- a/glymur/test/test_jp2box.py
+++ b/glymur/test/test_jp2box.py
@ -22,10 +22,10 @@ import sys
 import tempfile
 import uuid
 from uuid import UUID
-import xml.etree.cElementTree as ET
 import unittest
 import warnings

+import lxml.etree as ET
 import numpy as np

 import glymur
@ -1056,7 +1056,7 @@ class TestRepr(unittest.TestCase):
        box = glymur.jp2box.XMLBox(xml=tree)

        regexp = r"""glymur.jp2box.XMLBox"""
-        regexp += r"""\(xml=<(xml.etree.ElementTree.){0,1}ElementTree object """
+        regexp += r"""\(xml=<lxml.etree._ElementTree object """
        regexp += """at 0x([a-f0-9]*)>\)"""

        if sys.hexversion < 0x03000000:
--- a/glymur/test/test_jp2box_jpx.py
+++ b/glymur/test/test_jp2box_jpx.py
@ -8,7 +8,7 @@ import struct
 import sys
 import tempfile
 import unittest
-import xml.etree.cElementTree as ET
+import lxml.etree as ET

 import glymur
 from glymur import Jp2k
--- a/glymur/test/test_jp2box_uuid.py
+++ b/glymur/test/test_jp2box_uuid.py
@ -18,7 +18,6 @@ import sys
 import tempfile
 import uuid
 import warnings
-import xml.etree

 if sys.hexversion < 0x02070000:
    import unittest2 as unittest
@ -35,6 +34,8 @@ if sys.hexversion <= 0x03030000:
 else:
    from unittest.mock import patch

+import lxml.etree
+
 from .fixtures import HAS_PYTHON_XMP_TOOLKIT, OPJ_DATA_ROOT
 if HAS_PYTHON_XMP_TOOLKIT:
    from libxmp import XMPMeta
@ -71,7 +72,7 @@ class TestUUIDXMP(unittest.TestCase):
            # The data should be an XMP packet, which gets interpreted as
            # an ElementTree.
            self.assertTrue(isinstance(jp2.box[-1].data,
-                            xml.etree.ElementTree.ElementTree))
+                                       lxml.etree._ElementTree))

 class TestUUIDExif(unittest.TestCase):
    """Tests for UUIDs of Exif type."""
--- a/glymur/test/test_jp2box_xml.py
+++ b/glymur/test/test_jp2box_xml.py
@ -20,7 +20,6 @@ import sys
 import tempfile
 import unittest
 import warnings
-import xml.etree.cElementTree as ET

 if sys.hexversion < 0x03000000:
    from StringIO import StringIO
@ -32,6 +31,8 @@ if sys.hexversion <= 0x03030000:
 else:
    from unittest.mock import patch

+import lxml.etree as ET
+
 import glymur
 from glymur import Jp2k
 from glymur.jp2box import ColourSpecificationBox, ContiguousCodestreamBox
--- a/glymur/test/test_printing.py
+++ b/glymur/test/test_printing.py
@ -15,7 +15,6 @@ import struct
 import sys
 import tempfile
 import warnings
-from xml.etree import cElementTree as ET
 import unittest

 if sys.hexversion < 0x03000000:
@ -28,10 +27,12 @@ if sys.hexversion <= 0x03030000:
 else:
    from unittest.mock import patch

+import lxml.etree as ET
+
 import glymur
 from glymur import Jp2k
 from . import fixtures
-from .fixtures import OPJ_DATA_ROOT, opj_data_file, nemo_xmp_box
+from .fixtures import OPJ_DATA_ROOT, opj_data_file
 from .fixtures import text_gbr_27, text_gbr_33, text_gbr_34


@ -118,6 +119,7 @@ class TestPrinting(unittest.TestCase):
        lst = actual.split('\n')
        lst = lst[1:]
        actual = '\n'.join(lst)
+        self.maxDiff = None
        self.assertEqual(actual, fixtures.nemo_dump_no_codestream)

    def test_printoptions_no_xml(self):
@ -209,6 +211,7 @@ class TestPrinting(unittest.TestCase):
        lst = actual.split('\n')
        lst = lst[1:]
        actual = '\n'.join(lst)
+        self.maxDiff = None
        self.assertEqual(actual, fixtures.nemo_dump_full)

    def test_entire_file(self):
@ -567,7 +570,7 @@ class TestPrinting(unittest.TestCase):
            print(j.box[3])
            actual = fake_out.getvalue().strip()

-        expected = nemo_xmp_box
+        expected = fixtures.nemo_xmp_box
        self.assertEqual(actual, expected)

    def test_codestream(self):
@ -639,8 +642,7 @@ class TestPrinting(unittest.TestCase):
        #
        # 2.7.5 (fedora 19) prints xml entities.
        # 2.7.3 seems to want to print hex escapes.
-        text = u"""<?xml version="1.0" encoding="utf-8"?>
-        <flow>Strömung</flow>"""
+        text = u"""<flow>Strömung</flow>"""
        if sys.hexversion < 0x03000000:
            xml = ET.parse(StringIO(text.encode('utf-8')))
        else:
@ -668,8 +670,7 @@ class TestPrinting(unittest.TestCase):
        #
        # 2.7.5 (fedora 19) prints xml entities.
        # 2.7.3 seems to want to print hex escapes.
-        text = u"""<?xml version="1.0" encoding="utf-8"?>
-        <country>Россия</country>"""
+        text = u"""<country>Россия</country>"""
        if sys.hexversion < 0x03000000:
            xml = ET.parse(StringIO(text.encode('utf-8')))
        else: