Merge branch 'issue75' into devel

README.md

@@ -3,6 +3,7 @@ glymur: a Python interface for JPEG 2000
 
 **glymur** contains a Python interface to the OpenJPEG library
 which allows linux and mac users to read and write JPEG 2000 files.  
-**glymur** works on Python 2.7 and 3.3.  Python 3.3 is strongly recommended.
+**glymur** works on Python 2.6, 2.7 and 3.3.  Python 3.3 is strongly 
+recommended.
 
 Please read the docs, https://glymur.readthedocs.org/en/latest/

docs/source/introduction.rst

@@ -14,7 +14,7 @@ some very limited support for reading JPX metadata.  For instance,
 **asoc** and **labl** boxes are recognized, so GMLJP2 metadata can
 be retrieved from such JPX files.
 
-Glymur works on Python 2.7 and 3.3.  Python 3.3 is strongly recommended.
+Glymur works on Python 2.6, 2.7, and 3.3.  Python 3.3 is strongly recommended.
 
 OpenJPEG Installation
 =====================
@@ -27,8 +27,8 @@ about OpenJPEG, please consult http://www.openjpeg.org.
 If you use MacPorts on the mac or if you have a sufficiently recent version of
 Linux, your package manager should already provide you with at least version
 1.5.1 of OpenJPEG, which means that glymur can be installed ready to read JPEG
-2000 images.  If you use windows, I suggest using the 1.5.1 windows installer
+2000 images.  If your platform is windows, I suggest using the 1.5.1 windows 
-provided to you by the OpenJPEG folks at
+installer provided to you by the OpenJPEG folks at
 https://code.google.com/p/openjpeg/downloads/list .
 
 Glymur Installation

glymur/jp2box.py

@@ -13,7 +13,6 @@ References
 
 # pylint: disable=C0302,R0903,R0913
 
-import collections
 import copy
 import datetime
 import math
@@ -23,6 +22,12 @@ import sys
 import uuid
 import warnings
 import xml.etree.cElementTree as ET
+if sys.hexversion < 0x02070000:
+    from ordereddict import OrderedDict
+    from xml.etree.cElementTree import XMLParserError as ParseError
+else:
+    from xml.etree.cElementTree import ParseError
+    from collections import OrderedDict
 
 import numpy as np
 
@@ -342,7 +347,7 @@ class _ICCProfile(object):
 
     def __init__(self, read_buffer):
         self._raw_buffer = read_buffer
-        header = collections.OrderedDict()
+        header = OrderedDict()
 
         data = struct.unpack('>IIBB', self._raw_buffer[0:10])
         header['Size'] = data[0]
@@ -1012,8 +1017,9 @@ class JPEG2000SignatureBox(Jp2kBox):
 
     def __str__(self):
         msg = Jp2kBox.__str__(self)
-        msg += '\n    Signature:  {:02x}{:02x}{:02x}{:02x}'
+        msg += '\n    Signature:  {0:02x}{1:02x}{2:02x}{3:02x}'
-        msg = msg.format(*self.signature)
+        msg = msg.format(self.signature[0], self.signature[1],
+                         self.signature[2], self.signature[3])
         return msg
 
     def write(self, fptr):
@@ -1634,7 +1640,8 @@ class XMLBox(Jp2kBox):
         """
         try:
             read_buffer = ET.tostring(self.xml, encoding='utf-8')
-        except AttributeError:
+        except (AttributeError, AssertionError):
+            # AssertionError on 2.6
             read_buffer = ET.tostring(self.xml.getroot(), encoding='utf-8')
 
         fptr.write(struct.pack('>I', len(read_buffer) + 8))
@@ -1667,7 +1674,7 @@ class XMLBox(Jp2kBox):
 
         try:
             xml = ET.fromstring(text)
-        except ET.ParseError as parse_error:
+        except ParseError as parse_error:
             msg = 'A problem was encountered while parsing an XML box:  "{0}"'
             msg = msg.format(str(parse_error))
             warnings.warn(msg, UserWarning)
@@ -1910,14 +1917,16 @@ class UUIDBox(Jp2kBox):
             # XMP data.  Parse as XML.  Seems to be a difference between
             # ElementTree in version 2.7 and 3.3.
             if sys.hexversion < 0x03000000:
-                parser = ET.XMLParser(encoding='utf-8')
+                #parser = ET.XMLParser(encoding='utf-8')
-                self.data = ET.fromstringlist(raw_data, parser=parser)
+                #import pdb; pdb.set_trace()
+                #self.data = ET.fromstringlist(raw_data, parser=parser)
+                self.data = ET.fromstring(raw_data)
             else:
                 text = raw_data.decode('utf-8')
                 self.data = ET.fromstring(text)
         elif the_uuid.bytes == b'JpgTiffExif->JP2':
             exif_obj = Exif(raw_data)
-            ifds = collections.OrderedDict()
+            ifds = OrderedDict()
             ifds['Image'] = exif_obj.exif_image
             ifds['Photo'] = exif_obj.exif_photo
             ifds['GPSInfo'] = exif_obj.exif_gpsinfo
@@ -2067,7 +2076,7 @@ class _Ifd(object):
     def __init__(self, endian, read_buffer, offset):
         self.endian = endian
         self.read_buffer = read_buffer
-        self.processed_ifd = collections.OrderedDict()
+        self.processed_ifd = OrderedDict()
 
         self.num_tags, = struct.unpack(endian + 'H',
                                        read_buffer[offset:offset + 2])
@@ -2075,7 +2084,7 @@ class _Ifd(object):
         fmt = self.endian + 'HHII' * self.num_tags
         ifd_buffer = read_buffer[offset + 2:offset + 2 + self.num_tags * 12]
         data = struct.unpack(fmt, ifd_buffer)
-        self.raw_ifd = collections.OrderedDict()
+        self.raw_ifd = OrderedDict()
         for j, tag in enumerate(data[0::4]):
             # The offset to the tag offset/payload is the offset to the IFD
             # plus 2 bytes for the number of tags plus 12 bytes for each

glymur/lib/test/test_openjp2.py

@@ -6,7 +6,11 @@ import shutil
 import struct
 import sys
 import tempfile
-import unittest
+
+if sys.hexversion < 0x02070000:
+    import unittest2 as unittest
+else:
+    import unittest
 
 import numpy as np
 

glymur/lib/test/test_openjpeg.py

@@ -1,6 +1,11 @@
 #pylint:  disable-all
 import ctypes
-import unittest
+import sys
+
+if sys.hexversion < 0x02070000:
+    import unittest2 as unittest
+else:
+    import unittest
 
 import glymur
 

glymur/test/test_callbacks.py

@@ -4,7 +4,6 @@ import pkg_resources
 import re
 import sys
 import tempfile
-import unittest
 import warnings
 
 if sys.hexversion < 0x03000000:
@@ -12,6 +11,11 @@ if sys.hexversion < 0x03000000:
 else:
     from io import StringIO
 
+if sys.hexversion < 0x02070000:
+    import unittest2 as unittest
+else:
+    import unittest
+
 import glymur
 
 

glymur/test/test_codestream.py

@@ -3,7 +3,11 @@ import os
 import struct
 import sys
 import tempfile
-import unittest
+
+if sys.hexversion < 0x02070000:
+    import unittest2 as unittest
+else:
+    import unittest
 
 import numpy as np
 import pkg_resources

glymur/test/test_config.py

@@ -7,7 +7,12 @@ import imp
 import os
 import sys
 import tempfile
-import unittest
+
+if sys.hexversion < 0x02070000:
+    import unittest2 as unittest
+else:
+    import unittest
+
 if sys.hexversion <= 0x03030000:
     from mock import patch
 else:

glymur/test/test_icc.py

@@ -4,7 +4,12 @@ import os
 import struct
 import sys
 import tempfile
-import unittest
+
+if sys.hexversion < 0x02070000:
+    import unittest2 as unittest
+else:
+    import unittest
+
 import warnings
 from xml.etree import cElementTree as ET
 

glymur/test/test_jp2box.py

@@ -1,9 +1,14 @@
 #pylint:  disable-all
 import doctest
 import os
+import sys
 import tempfile
 import xml.etree.cElementTree as ET
-import unittest
+
+if sys.hexversion < 0x02070000:
+    import unittest2 as unittest
+else:
+    import unittest
 
 import numpy as np
 import pkg_resources

glymur/test/test_jp2k.py

@@ -7,7 +7,12 @@ import struct
 import sys
 import tempfile
 import uuid
-import unittest
+
+if sys.hexversion < 0x02070000:
+    import unittest2 as unittest
+else:
+    import unittest
+
 if sys.hexversion <= 0x03030000:
     from mock import patch
 else:
@@ -34,6 +39,9 @@ def load_tests(loader, tests, ignore):
     if os.name == "nt":
         # Can't do it on windows, temporary file issue.
         return tests
+    if sys.hexversion < 0x02070000:
+        # Don't bother with doctests on 2.6 for the time being.
+        return tests
     if glymur.lib.openjp2.OPENJP2 is not None:
         tests.addTests(doctest.DocTestSuite('glymur.jp2k'))
     return tests

glymur/test/test_opj_suite.py

@@ -10,7 +10,12 @@ import platform
 import re
 import sys
 from xml.etree import cElementTree as ET
-import unittest
+
+if sys.hexversion < 0x02070000:
+    import unittest2 as unittest
+else:
+    import unittest
+
 import warnings
 
 if sys.hexversion <= 0x03030000:

glymur/test/test_opj_suite_neg.py

@@ -6,7 +6,12 @@ seem like logical negative tests to add.
 import os
 import sys
 import tempfile
-import unittest
+
+if sys.hexversion < 0x02070000:
+    import unittest2 as unittest
+else:
+    import unittest
+
 import warnings
 
 import numpy as np

glymur/test/test_opj_suite_write.py

@@ -7,7 +7,12 @@ import os
 import platform
 import sys
 import tempfile
-import unittest
+
+if sys.hexversion < 0x02070000:
+    import unittest2 as unittest
+else:
+    import unittest
+
 import warnings
 
 import numpy as np

glymur/test/test_printing.py

@@ -4,7 +4,11 @@ import pkg_resources
 import struct
 import sys
 import tempfile
-import unittest
+
+if sys.hexversion < 0x02070000:
+    import unittest2 as unittest
+else:
+    import unittest
 
 if sys.hexversion < 0x03000000:
     from StringIO import StringIO
@@ -577,6 +581,8 @@ class TestPrinting(unittest.TestCase):
         expected = '\n'.join(lines)
         self.assertEqual(actual, expected)
 
+    @unittest.skipIf(sys.hexversion < 0x02070000,
+                     "Differences in XML printing between 2.6 and 2.7")
     def test_xmp(self):
         # Verify the printing of a UUID/XMP box.
         j = glymur.Jp2k(self.jp2file)
@@ -645,6 +651,8 @@ class TestPrinting(unittest.TestCase):
         self.maxDiff = None
         self.assertEqual(actual, expected)
 
+    @unittest.skipIf(sys.hexversion < 0x02070000,
+                     "Differences in XML printing between 2.6 and 2.7")
     @unittest.skipIf(data_root is None,
                      "OPJ_DATA_ROOT environment variable not set")
     def test_xml(self):

setup.py

@@ -19,9 +19,13 @@ instllrqrs = ['numpy>1.6.2']
 if sys.hexversion < 0x03030000:
     instllrqrs.append('contextlib2>=0.4')
     instllrqrs.append('mock>=1.0.1')
+if sys.hexversion < 0x02070000:
+    instllrqrs.append('ordereddict>=1.1')
+    instllrqrs.append('unittest2>=0.5.1')
 kwargs['install_requires'] = instllrqrs
 
 clssfrs = ["Programming Language :: Python",
+           "Programming Language :: Python :: 2.6",
            "Programming Language :: Python :: 2.7",
            "Programming Language :: Python :: 3.3",
            "Programming Language :: Python :: Implementation :: CPython",