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

Conflicts:
	setup.py

.travis.yml

@@ -11,8 +11,8 @@ before_install:
 
 # command to install dependencies
 install:
-  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install --use-mirrors contextlib2 mock; fi
-  - if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then pip install --use-mirrors numpy; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install --use-mirrors lxml contextlib2 mock; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then pip install --use-mirrors lxml numpy; fi
 
 # command to run tests
 script:

glymur/core.py

@@ -76,45 +76,3 @@ _CAPABILITIES_DISPLAY = {
     1: '0',
     2: '1',
     3: '3'}
-
-
-def _pretty_print_xml(xml, level=0):
-    """Pretty print XML data.
-    """
-    #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')]
-    try:
-        xml = '\n'.join(lst)
-        return '\n{0}'.format(xml)
-    except UnicodeEncodeError:
-        # This can happen on python 2.x if the character set contains certain
-        # non-ascii characters.  Just print out the corresponding xml char
-        # entities instead.
-        xml = u'\n'.join(lst)
-        text = u'\n{0}'.format(xml)
-        text = text.encode('ascii', 'xmlcharrefreplace')
-        return text
-
-
-def _indent(elem, level=0):
-    """Recipe for pretty printing XML.  Please see
-
-    http://effbot.org/zone/element-lib.htm#prettyprint
-    """
-    i = "\n" + level * "  "
-    if len(elem):
-        if not elem.text or not elem.text.strip():
-            elem.text = i + "  "
-        if not elem.tail or not elem.tail.strip():
-            elem.tail = i
-        for elem in elem:
-            _indent(elem, level + 1)
-        if not elem.tail or not elem.tail.strip():
-            elem.tail = i
-    else:
-        if level and (not elem.tail or not elem.tail.strip()):
-            elem.tail = i

glymur/jp2box.py

@@ -32,7 +32,6 @@ from .core import _COLOR_TYPE_MAP_DISPLAY
 from .core import SRGB, GREYSCALE, YCC
 from .core import ENUMERATED_COLORSPACE, RESTRICTED_ICC_PROFILE
 from .core import ANY_ICC_PROFILE, VENDOR_COLOR_METHOD
-from .core import _pretty_print_xml
 
 from . import _uuid_io