pep8, pylint work. closes #94.

This commit is contained in:
jevans 2013-08-01 18:08:42 -04:00
commit 586e810a7f

View file

@ -78,65 +78,63 @@ class Codestream(object):
Supplying False may impose a large performance penalty.
"""
# Map each of the known markers to a method that processes them.
process_marker_segment = {
0xff00: self._parse_reserved_segment,
0xff01: self._parse_reserved_segment,
0xff30: self._parse_reserved_marker,
0xff31: self._parse_reserved_marker,
0xff32: self._parse_reserved_marker,
0xff33: self._parse_reserved_marker,
0xff34: self._parse_reserved_marker,
0xff35: self._parse_reserved_marker,
0xff36: self._parse_reserved_marker,
0xff37: self._parse_reserved_marker,
0xff38: self._parse_reserved_marker,
0xff39: self._parse_reserved_marker,
0xff3a: self._parse_reserved_marker,
0xff3b: self._parse_reserved_marker,
0xff3c: self._parse_reserved_marker,
0xff3d: self._parse_reserved_marker,
0xff3e: self._parse_reserved_marker,
0xff3f: self._parse_reserved_marker,
0xff4f: self._parse_reserved_segment,
0xff50: self._parse_reserved_segment,
0xff51: self._parse_siz_segment,
0xff52: self._parse_cod_segment,
0xff53: self._parse_coc_segment,
0xff54: self._parse_reserved_segment,
0xff55: self._parse_tlm_segment,
0xff56: self._parse_reserved_segment,
0xff57: self._parse_reserved_segment,
0xff58: self._parse_plt_segment,
0xff59: self._parse_reserved_segment,
0xff5a: self._parse_reserved_segment,
0xff5b: self._parse_reserved_segment,
0xff5c: self._parse_qcd_segment,
0xff5d: self._parse_qcc_segment,
0xff5e: self._parse_rgn_segment,
0xff5f: self._parse_pod_segment,
0xff60: self._parse_ppm_segment,
0xff61: self._parse_ppt_segment,
0xff62: self._parse_reserved_segment,
0xff63: self._parse_crg_segment,
0xff64: self._parse_cme_segment,
0xff65: self._parse_reserved_segment,
0xff66: self._parse_reserved_segment,
0xff67: self._parse_reserved_segment,
0xff68: self._parse_reserved_segment,
0xff69: self._parse_reserved_segment,
0xff6a: self._parse_reserved_segment,
0xff6b: self._parse_reserved_segment,
0xff6c: self._parse_reserved_segment,
0xff6d: self._parse_reserved_segment,
0xff6e: self._parse_reserved_segment,
0xff6f: self._parse_reserved_segment,
0xff79: self._parse_unrecognized_segment,
0xff90: self._parse_sot_segment,
0xff91: self._parse_unrecognized_segment,
0xff92: self._parse_unrecognized_segment,
0xff93: self._parse_sod_segment,
0xffd9: self._parse_eoc_segment,
}
process_marker_segment = {0xff00: self._parse_reserved_segment,
0xff01: self._parse_reserved_segment,
0xff30: self._parse_reserved_marker,
0xff31: self._parse_reserved_marker,
0xff32: self._parse_reserved_marker,
0xff33: self._parse_reserved_marker,
0xff34: self._parse_reserved_marker,
0xff35: self._parse_reserved_marker,
0xff36: self._parse_reserved_marker,
0xff37: self._parse_reserved_marker,
0xff38: self._parse_reserved_marker,
0xff39: self._parse_reserved_marker,
0xff3a: self._parse_reserved_marker,
0xff3b: self._parse_reserved_marker,
0xff3c: self._parse_reserved_marker,
0xff3d: self._parse_reserved_marker,
0xff3e: self._parse_reserved_marker,
0xff3f: self._parse_reserved_marker,
0xff4f: self._parse_reserved_segment,
0xff50: self._parse_reserved_segment,
0xff51: self._parse_siz_segment,
0xff52: self._parse_cod_segment,
0xff53: self._parse_coc_segment,
0xff54: self._parse_reserved_segment,
0xff55: self._parse_tlm_segment,
0xff56: self._parse_reserved_segment,
0xff57: self._parse_reserved_segment,
0xff58: self._parse_plt_segment,
0xff59: self._parse_reserved_segment,
0xff5a: self._parse_reserved_segment,
0xff5b: self._parse_reserved_segment,
0xff5c: self._parse_qcd_segment,
0xff5d: self._parse_qcc_segment,
0xff5e: self._parse_rgn_segment,
0xff5f: self._parse_pod_segment,
0xff60: self._parse_ppm_segment,
0xff61: self._parse_ppt_segment,
0xff62: self._parse_reserved_segment,
0xff63: self._parse_crg_segment,
0xff64: self._parse_cme_segment,
0xff65: self._parse_reserved_segment,
0xff66: self._parse_reserved_segment,
0xff67: self._parse_reserved_segment,
0xff68: self._parse_reserved_segment,
0xff69: self._parse_reserved_segment,
0xff6a: self._parse_reserved_segment,
0xff6b: self._parse_reserved_segment,
0xff6c: self._parse_reserved_segment,
0xff6d: self._parse_reserved_segment,
0xff6e: self._parse_reserved_segment,
0xff6f: self._parse_reserved_segment,
0xff79: self._parse_unrecognized_segment,
0xff90: self._parse_sot_segment,
0xff91: self._parse_unrecognized_segment,
0xff92: self._parse_unrecognized_segment,
0xff93: self._parse_sod_segment,
0xffd9: self._parse_eoc_segment}
self.offset = fptr.tell()
self.length = length
@ -150,9 +148,8 @@ class Codestream(object):
self.segment = []
# First two bytes are the SOC marker
# First two bytes are the SOC marker. We already know that.
read_buffer = fptr.read(2)
marker_id, = struct.unpack('>H', read_buffer)
segment = SOCsegment(offset=fptr.tell() - 2, length=0)
self.segment.append(segment)
@ -208,7 +205,6 @@ class Codestream(object):
fptr.seek(self._tile_offset[-1] + self._tile_length[-1])
def _parse_unrecognized_segment(self, fptr):
"""Looks like a valid marker, but not sure from reading the specs.
"""
@ -227,7 +223,6 @@ class Codestream(object):
segment = self._parse_reserved_segment(fptr)
return segment
def _parse_reserved_marker(self, fptr):
"""Marker range between 0xff30 and 0xff39.
"""
@ -235,7 +230,6 @@ class Codestream(object):
segment = Segment(marker_id=the_id, offset=self._offset, length=0)
return segment
def _parse_reserved_segment(self, fptr):
"""Parse valid marker segment, segment description is unknown.
@ -258,7 +252,6 @@ class Codestream(object):
offset=offset, length=length, data=data)
return segment
def _parse_tile_part_bit_stream(self, fptr, sod_marker, tile_length):
"""Parse the tile part bit stream for SOP, EPH marker segments."""
read_buffer = fptr.read(tile_length)
@ -296,6 +289,7 @@ class Codestream(object):
msg += ''.join(strs)
return msg
# pylint: disable=R0201
def _parse_cme_segment(self, fptr):
"""Parse the CME marker segment.
@ -318,7 +312,6 @@ class Codestream(object):
return CMEsegment(rcme, ccme, length, offset)
def _parse_coc_segment(self, fptr):
"""Parse the COC marker segment.
@ -357,7 +350,6 @@ class Codestream(object):
return COCsegment(ccoc, scoc, spcoc, length, offset)
def _parse_cod_segment(self, fptr):
"""Parse the COD segment.
@ -388,10 +380,8 @@ class Codestream(object):
else:
self._parse_tpart_flag = False
return CODsegment(scod, spcod, length, offset)
def _parse_crg_segment(self, fptr):
"""Parse the CRG marker segment.
@ -416,7 +406,6 @@ class Codestream(object):
return CRGsegment(xcrg, ycrg, length, offset)
def _parse_eoc_segment(self, fptr):
"""Parse the EOC (end-of-codestream) marker segment.
@ -434,7 +423,6 @@ class Codestream(object):
return EOCsegment(length, offset)
def _parse_plt_segment(self, fptr):
"""Parse the PLT segment.
@ -474,7 +462,6 @@ class Codestream(object):
return PLTsegment(zplt, iplt, length, offset)
def _parse_pod_segment(self, fptr):
"""Parse the POD segment.
@ -527,7 +514,6 @@ class Codestream(object):
return PPMsegment(zppm, read_buffer, length, offset)
def _parse_ppt_segment(self, fptr):
"""Parse the PPT segment.
@ -555,7 +541,6 @@ class Codestream(object):
return PPTsegment(zppt, ippt, length, offset)
def _parse_qcc_segment(self, fptr):
"""Parse the QCC segment.
@ -674,7 +659,6 @@ class Codestream(object):
return segment
def _parse_sod_segment(self, fptr):
"""Parse the SOD (start-of-data) segment.
@ -692,7 +676,6 @@ class Codestream(object):
return SODsegment(length, offset)
def _parse_sot_segment(self, fptr):
"""Parse the SOT segment.
@ -731,7 +714,6 @@ class Codestream(object):
return segment
def _parse_tlm_segment(self, fptr):
"""Parse the TLM segment.
@ -785,7 +767,6 @@ class Codestream(object):
return TLMsegment(length, offset, ztlm, ttlm, ptlm)
class Segment(object):
"""Segment information.