pep8 compliance: E302 expected 2 blank lines, found 1

This commit is contained in:
David Sowder 2012-02-19 18:56:52 -06:00
parent c2499bbd80
commit cd013bb852

18
png.py
View File

@ -194,11 +194,13 @@ _adam7 = ((0, 0, 8, 8),
(1, 0, 2, 2),
(0, 1, 1, 2))
def group(s, n):
# See
# http://www.python.org/doc/2.6/library/functions.html#zip
return zip(*[iter(s)] * n)
def isarray(x):
"""Same as ``isinstance(x, array)`` except on Python 2.2, where it
always returns ``False``. This helps PyPNG work on Python 2.2.
@ -252,6 +254,7 @@ def interleave_planes(ipixels, apixels, ipsize, apsize):
out[i + ipsize:newtotal:newpsize] = apixels[i:atotal:apsize]
return out
def check_palette(palette):
"""Check a palette argument (to the :class:`Writer` class) for validity.
Returns the palette as a list if okay; raises an exception otherwise.
@ -280,11 +283,13 @@ def check_palette(palette):
"palette entry %d: values must be integer: 0 <= x <= 255" % i)
return p
class Error(Exception):
prefix = 'Error'
def __str__(self):
return self.prefix + ': ' + ' '.join(self.args)
class FormatError(Error):
"""Problem with input file format. In other words, PNG file does
not conform to the specification in some way and is invalid.
@ -292,6 +297,7 @@ class FormatError(Error):
prefix = 'FormatError'
class ChunkError(FormatError):
prefix = 'ChunkError'
@ -945,6 +951,7 @@ class Writer:
pixels[offset + i:end_offset:skip]
yield row
def write_chunk(outfile, tag, data=''):
"""
Write a PNG chunk to the output file, including length and
@ -959,6 +966,7 @@ def write_chunk(outfile, tag, data=''):
checksum = zlib.crc32(data, checksum)
outfile.write(struct.pack("!i", checksum))
def write_chunks(out, chunks):
"""Create a PNG file by writing out the chunks."""
@ -966,6 +974,7 @@ def write_chunks(out, chunks):
for chunk in chunks:
write_chunk(out, *chunk)
def filter_scanline(type, line, fo, prev=None):
"""Apply a scanline filter to a scanline. `type` specifies the
filter type (0 to 4); `line` specifies the current (unfiltered)
@ -2061,6 +2070,7 @@ import unittest
def test():
unittest.main(__name__)
def topngbytes(name, rows, x, y, **k):
"""Convenience function for creating a PNG file "in memory" as a
string. Creates a :class:`Writer` instance using the keyword arguments,
@ -2081,6 +2091,7 @@ def topngbytes(name, rows, x, y, **k):
w.close()
return f.getvalue()
def testWithIO(inp, out, f):
"""Calls the function `f` with ``sys.stdin`` changed to `inp`
and ``sys.stdout`` changed to `out`. They are restored when `f`
@ -2095,6 +2106,7 @@ def testWithIO(inp, out, f):
sys.stdout = oldout
return x
class Test(unittest.TestCase):
# This member is used by the superclass. If we don't define a new
# class here then when we use self.assertRaises() and the PyPNG code
@ -2443,6 +2455,7 @@ class Test(unittest.TestCase):
# === Command Line Support ===
def _dehex(s):
"""Liberally convert from hex string to binary string."""
import re
@ -2956,6 +2969,7 @@ acf0c6211c036f14a239703741740adc7da227edd7e56b833d0ae92549b4d357
"""),
}
def test_suite(options, args):
"""
Create a PNG test image and write the file to stdout.
@ -3137,6 +3151,7 @@ def test_suite(options, args):
interlace=options.interlace)
writer.write_array(sys.stdout, pixels)
def read_pam_header(infile):
"""
Read (the rest of a) PAM header. `infile` should be positioned
@ -3177,6 +3192,7 @@ def read_pam_header(infile):
'WIDTH, HEIGHT, DEPTH, MAXVAL must all be positive integers')
return 'P7', width, height, depth, maxval
def read_pnm_header(infile, supported=('P5', 'P6')):
"""
Read a PNM header, returning (format,width,height,depth,maxval).
@ -3254,6 +3270,7 @@ def read_pnm_header(infile, supported=('P5', 'P6')):
depth = (1, 3)[type == 'P6']
return header[0], header[1], header[2], depth, header[3]
def write_pnm(file, width, height, pixels, meta):
"""Write a Netpbm PNM/PAM file."""
@ -3298,6 +3315,7 @@ def write_pnm(file, width, height, pixels, meta):
file.write(struct.pack(fmt, *row))
file.flush()
def color_triple(color):
"""
Convert a command line colour value to a RGB triple of integers.