Merge branch 'issue176' of https://github.com/quintusdias/glymur into issue176

Conflicts:
	glymur/test/fixtures.py

docs/source/changelog.rst

@@ -5,6 +5,7 @@ ChangeLog
 0.6.0 (pending)
 ===============
 
+      * Added lxml requirement.
       * added set_printoptions, get_printoptions function
       * dropped support for Python 2.6, added support for Python 3.4
       * dropped windows support

docs/source/detailed_installation.rst

@@ -68,8 +68,8 @@ For python 3.3, you should install the following set of ports:
 
       * python33
       * py33-numpy
+      * py33-lxml
       * py33-distribute
-      * py33-matplotlib (optional, for running certain tests)
       * py33-Pillow (optional, for running certain tests)
 
 MacPorts supplies both OpenJPEG 1.5.0 and OpenJPEG 2.0.0.
@@ -85,6 +85,7 @@ packages may also need to be installed.  Consult your package manager
 documentation or use pip.
 
       * setuptools
+      * python-lxml
       * matplotlib
       * pillow
       * contextlib2 (2.7 only)

docs/source/how_do_i.rst

@@ -131,7 +131,6 @@ From within Python, it is as simple as printing the Jp2k object, i.e. ::
             </rdf:Description>
           </rdf:RDF>
         </ns0:xmpmeta>
-        
     Contiguous Codestream Box (jp2c) @ (3223, 1132296)
         Main header:
             SOC marker segment @ (3231, 0)
@@ -228,7 +227,6 @@ The :py:meth:`append` method can add an XML box as shown below::
     >>> import shutil
     >>> import glymur
     >>> shutil.copyfile(glymur.data.nemo(), 'myfile.jp2')
-    >>> from xml.etree import cElementTree as ET
     >>> jp2 = glymur.Jp2k('myfile.jp2')
     >>> xmlbox = glymur.jp2box.XMLBox(filename='data.xml')
     >>> jp2.append(xmlbox)
@@ -408,12 +406,12 @@ The example JP2 file shipped with glymur has an XMP UUID. ::
           .
     </ns0:xmpmeta>
 
-Since the UUID data in this case is returned as an ElementTree instance,
+Since the UUID data in this case is returned as an lxml ElementTree
-one can use ElementTree from the standard library to access the data.
+instance, one can use lxml to access the data.  For example, to
-For example, to extract the **CreatorTool** attribute value, one could do the
+extract the **CreatorTool** attribute value, one could do the
 following
 
-    >>> xmp = j.box[3].data.packet
+    >>> xmp = j.box[3].data
     >>> rdf = '{http://www.w3.org/1999/02/22-rdf-syntax-ns#}'
     >>> ns2 = '{http://ns.adobe.com/xap/1.0/}'
     >>> name = '{0}RDF/{0}Description/{1}CreatorTool'.format(rdf, ns2)

glymur/test/fixtures.py

@@ -272,6 +272,11 @@ nemo_xmp_box = """UUID Box (uuid) @ (77, 3146)
     UUID Data:
 {0}""".format(textwrap.indent(nemo_xmp, '    '))
 
+nemo_xmp_box = """UUID Box (uuid) @ (77, 3146)
+    UUID:  be7acfcb-97a9-42e8-9c71-999491e3afac (XMP)
+    UUID Data:
+{0}""".format(textwrap.indent(nemo_xmp, '    '))
+
 SimpleRDF = """<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
   <rdf:Description rdf:about='Test:XMPCoreCoverage/kSimpleRDF'
                    xmlns:ns1='ns:test1/' xmlns:ns2='ns:test2/'>

glymur/test/test_printing.py

@@ -119,7 +119,6 @@ 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):
@@ -211,7 +210,6 @@ 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):
@@ -631,7 +629,6 @@ class TestPrinting(unittest.TestCase):
         with patch('sys.stdout', new=StringIO()) as fake_out:
             print(j.box[2])
             actual = fake_out.getvalue().strip()
-        self.maxDiff = None
         self.assertEqual(actual, fixtures.file1_xml)
 
     @unittest.skipIf(sys.hexversion < 0x03000000,

setup.py

@@ -16,7 +16,7 @@ kwargs = {'name': 'Glymur',
           'license': 'MIT',
           'test_suite': 'glymur.test'}
 
-instllrqrs = ['lxml>=3.2.3', 'numpy>=1.4.1']
+instllrqrs = ['numpy>=1.4.1', 'lxml>=2.3.2']
 if sys.hexversion < 0x03030000:
     instllrqrs.append('contextlib2>=0.4')
     instllrqrs.append('mock>=1.0.1')