Merge branch 'issue277' into devel

glymur/__init__.py

@@ -7,8 +7,10 @@ from glymur import version
 __version__ = version.version
 
 from .jp2k import Jp2k
-from .jp2box import get_printoptions, set_printoptions
+from .jp2box import (
-from .jp2box import get_parseoptions, set_parseoptions
+        get_printoptions, set_printoptions,
+        get_parseoptions, set_parseoptions
+)
 
 from . import data
 

glymur/codestream.py

@@ -24,10 +24,11 @@ import warnings
 
 import numpy as np
 
-from .core import LRCP, RLCP, RPCL, PCRL, CPRL
+from .core import (
-from .core import WAVELET_XFORM_9X7_IRREVERSIBLE
+        LRCP, RLCP, RPCL, PCRL, CPRL,
-from .core import WAVELET_XFORM_5X3_REVERSIBLE
+        WAVELET_XFORM_9X7_IRREVERSIBLE, WAVELET_XFORM_5X3_REVERSIBLE,
-from .core import _Keydefaultdict
+        _Keydefaultdict
+)
 from .lib import openjp2 as opj2
 
 _factory = lambda x:  '{0} (invalid)'.format(x)

glymur/jp2box.py

@@ -29,12 +29,13 @@ import lxml.etree as ET
 import numpy as np
 
 from .codestream import Codestream
-from .core import _COLORSPACE_MAP_DISPLAY
+from .core import (
-from .core import _COLOR_TYPE_MAP_DISPLAY
+        _COLORSPACE_MAP_DISPLAY, _COLOR_TYPE_MAP_DISPLAY,
-from .core import SRGB, GREYSCALE, YCC
+        SRGB, GREYSCALE, YCC,
-from .core import ENUMERATED_COLORSPACE, RESTRICTED_ICC_PROFILE
+        ENUMERATED_COLORSPACE, RESTRICTED_ICC_PROFILE,
-from .core import ANY_ICC_PROFILE, VENDOR_COLOR_METHOD
+        ANY_ICC_PROFILE, VENDOR_COLOR_METHOD,
-from .core import _Keydefaultdict
+        _Keydefaultdict
+)
 
 from . import _uuid_io
 

glymur/jp2k.py

@@ -30,15 +30,12 @@ import warnings
 import numpy as np
 
 from .codestream import Codestream
-from . import core
+from . import core, version
-from .jp2box import Jp2kBox
+from .jp2box import (
-from .jp2box import JPEG2000SignatureBox, FileTypeBox, JP2HeaderBox
+        Jp2kBox, JPEG2000SignatureBox, FileTypeBox, JP2HeaderBox,
-from .jp2box import ColourSpecificationBox, ContiguousCodestreamBox
+        ColourSpecificationBox, ContiguousCodestreamBox, ImageHeaderBox
-from .jp2box import ImageHeaderBox
+)
-from .lib import openjpeg as opj
+from .lib import openjpeg as opj, openjp2 as opj2, c as libc
-from .lib import openjp2 as opj2
-from . import version
-from .lib import c as libc
 
 JP2_IDS = ['colr', 'cdef', 'cmap', 'jp2c', 'ftyp', 'ihdr', 'jp2h', 'jP  ',
            'pclr', 'res ', 'resc', 'resd', 'xml ', 'ulst', 'uinf', 'url ',

glymur/lib/openjp2.py

@@ -9,6 +9,7 @@ import re
 import sys
 
 from .config import glymur_config
+
 OPENJP2, OPENJPEG = glymur_config()
 
 def version():

glymur/lib/openjpeg.py

@@ -9,6 +9,7 @@ import sys
 import numpy as np
 
 from .config import glymur_config
+
 _, OPENJPEG = glymur_config()
 
 # Maximum number of tile parts expected by JPWL: increase at your will

glymur/version.py

@@ -14,8 +14,7 @@ from distutils.version import LooseVersion
 import lxml.etree
 import numpy as np
 
-from .lib import openjpeg as opj
+from .lib import openjpeg as opj, openjp2 as opj2
-from .lib import openjp2 as opj2
 
 # Do not change the format of this next line!  Doing so risks breaking
 # setup.py