Skip to content

Commit 0013ce7

Browse files
heuerheuer
committed
More PEP 8 fixes
1 parent 4c15059 commit 0013ce7

6 files changed

+57
-30
lines changed

‎tests/test_qrcode.py

+18-8
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ def test_eq2():
4242
assert qr == qr2
4343

4444

45-
@pytest.mark.parametrize('version, mode', [('M1', 'alphanumeric'), ('M1', 'byte'), ('M2', 'byte')])
45+
@pytest.mark.parametrize('version, mode', [('M1', 'alphanumeric'),
46+
('M1', 'byte'),
47+
('M2', 'byte')])
4648
def test_illegal_mode_micro(version, mode):
4749
with pytest.raises(ValueError) as ex:
4850
segno.make(1, version=version, mode=mode)
@@ -106,7 +108,8 @@ def test_illegal_error_level_micro():
106108
assert 'is not available' in str(ex.value)
107109

108110

109-
@pytest.mark.parametrize('data,version', [('abcdefghijklmnopqr', 1), (123456, 'M1')])
111+
@pytest.mark.parametrize('data,version', [('abcdefghijklmnopqr', 1),
112+
(123456, 'M1')])
110113
def test_data_too_large(data, version):
111114
with pytest.raises(segno.DataOverflowError) as ex:
112115
segno.make(data, version=version)
@@ -135,13 +138,18 @@ def test_symbol_size():
135138
border = 0
136139
assert (width, height) == qr.symbol_size(border=border)
137140
border = 1
138-
assert (_calc_size(width, border) == _calc_size(width, border)), qr.symbol_size(border=border)
141+
assert (_calc_size(width, border) == _calc_size(width, border)), \
142+
qr.symbol_size(border=border)
139143
border = 4 # (default border)
140-
assert (_calc_size(width, border) == _calc_size(width, border)), qr.symbol_size()
141-
assert (_calc_size(width, border) == _calc_size(width, border)), qr.symbol_size(scale=1)
142-
assert (_calc_size(width, border, 4), _calc_size(width, border, 4)) == qr.symbol_size(scale=4)
144+
assert (_calc_size(width, border) == _calc_size(width, border)), \
145+
qr.symbol_size()
146+
assert (_calc_size(width, border) == _calc_size(width, border)), \
147+
qr.symbol_size(scale=1)
148+
assert (_calc_size(width, border, 4), _calc_size(width, border, 4)) == \
149+
qr.symbol_size(scale=4)
143150
border = 0
144-
assert (_calc_size(width, border, 4), _calc_size(width, border, 4)) == qr.symbol_size(border=border, scale=4)
151+
assert (_calc_size(width, border, 4), _calc_size(width, border, 4)) == \
152+
qr.symbol_size(border=border, scale=4)
145153

146154

147155
def test_symbol_size_micro():
@@ -274,7 +282,9 @@ def test_matrix_iter_verbose_invalid_border(border):
274282

275283
def test_matrix_iter_verbose_border_zero():
276284
qr = segno.make('No border')
277-
res = [bytearray([bool(v >> 8) for v in row]) for row in qr.matrix_iter(border=0, verbose=True)]
285+
res = [bytearray([bool(v >> 8) for v in row]) for row in qr.matrix_iter(
286+
border=0,
287+
verbose=True)]
278288
assert qr.matrix == tuple(res)
279289

280290

‎tests/test_structured_append.py

+8-4
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
from segno import encoder
2020
try:
2121
from .tutils import read_matrix
22-
except (ValueError, SystemError, ImportError): # Attempted relative import in non-package
22+
# Attempted relative import in non-package
23+
except (ValueError, SystemError, ImportError):
2324
from tutils import read_matrix
2425

2526

@@ -199,15 +200,17 @@ def test_boosterror_noop():
199200

200201

201202
def test_boosterror():
202-
seq = segno.make_sequence('I read the news today oh boy / About a lucky man who made the grade', version=2)
203+
seq = segno.make_sequence('I read the news today oh boy / About a lucky man '
204+
'who made the grade', version=2)
203205
assert 3 == len(seq)
204206
assert 'M' == seq[0].error
205207
assert 'M' == seq[1].error
206208
assert 'M' == seq[2].error
207209

208210

209211
def test_boosterror2():
210-
seq = segno.make_sequence('I read the news today oh boy / About a lucky man who made the grade', symbol_count=4)
212+
seq = segno.make_sequence('I read the news today oh boy / About a lucky man '
213+
'who made the grade', symbol_count=4)
211214
assert 4 == len(seq)
212215
assert '2-Q' == seq[0].designator
213216
assert '2-Q' == seq[1].designator
@@ -223,7 +226,8 @@ def test_toomany_symbols():
223226
@pytest.mark.parametrize('symbol_count', [0, -1, 17])
224227
def test_illegal_symbolcount(symbol_count):
225228
with pytest.raises(ValueError):
226-
segno.make_sequence('I read the news today oh boy / About a lucky man who made the grade',
229+
segno.make_sequence('I read the news today oh boy / About a lucky man '
230+
'who made the grade',
227231
symbol_count=symbol_count)
228232

229233

‎tests/test_svg.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -553,14 +553,16 @@ def test_encoding_none():
553553
def test_draw_transparent():
554554
qr = segno.make_qr('test')
555555
out = io.BytesIO()
556-
qr.save(out, kind='svg', dark='green', finder_dark='green', dark_module='blue',
557-
alignment_light='yellow', quiet_zone='yellow', draw_transparent=False)
556+
qr.save(out, kind='svg', dark='green', finder_dark='green',
557+
dark_module='blue', alignment_light='yellow', quiet_zone='yellow',
558+
draw_transparent=False)
558559
root = _parse_xml(out)
559560
paths = root.findall('.//{%s}path' % _SVG_NS)
560561
assert 3 == len(paths)
561562
out = io.BytesIO()
562-
qr.save(out, kind='svg', dark='green', finder_dark='green', dark_module='blue',
563-
alignment_light='yellow', quiet_zone='yellow', draw_transparent=True)
563+
qr.save(out, kind='svg', dark='green', finder_dark='green',
564+
dark_module='blue', alignment_light='yellow', quiet_zone='yellow',
565+
draw_transparent=True)
564566
root = _parse_xml(out)
565567
paths = root.findall('.//{%s}path' % _SVG_NS)
566568
assert 4 == len(paths)

‎tests/test_svg_colorful.py

+11-7
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ def _parse_xml(buff):
3737
def test_merge_colors():
3838
qr = segno.make_qr('test')
3939
out = io.BytesIO()
40-
qr.save(out, kind='svg', dark='green', finder_dark='green', dark_module='green')
40+
qr.save(out, kind='svg', dark='green', finder_dark='green',
41+
dark_module='green')
4142
green = colors._color_to_webcolor('green')
4243
assert green in out.getvalue().decode('utf-8')
4344
root = _parse_xml(out)
@@ -48,8 +49,9 @@ def test_merge_colors():
4849
def test_merge_colors2():
4950
qr = segno.make_qr('test')
5051
out = io.BytesIO()
51-
qr.save(out, kind='svg', dark='green', finder_dark='green', dark_module='blue',
52-
alignment_light='yellow', quiet_zone='yellow')
52+
qr.save(out, kind='svg', dark='green', finder_dark='green',
53+
dark_module='blue', alignment_light='yellow',
54+
quiet_zone='yellow')
5355
green = colors._color_to_webcolor('green')
5456
yellow = colors._color_to_webcolor('yellow')
5557
blue = colors._color_to_webcolor('blue')
@@ -66,8 +68,9 @@ def test_merge_colors2():
6668
def test_nogroup():
6769
qr = segno.make_qr('test')
6870
out = io.BytesIO()
69-
qr.save(out, kind='svg', dark='green', finder_dark='green', dark_module='blue',
70-
alignment_light='yellow', quiet_zone='yellow', scale=1.0)
71+
qr.save(out, kind='svg', dark='green', finder_dark='green',
72+
dark_module='blue', alignment_light='yellow', quiet_zone='yellow',
73+
scale=1.0)
7174
root = _parse_xml(out)
7275
paths = root.findall('.//{%s}path' % _SVG_NS)
7376
assert 3 == len(paths)
@@ -79,8 +82,9 @@ def test_nogroup():
7982
def test_scale():
8083
qr = segno.make_qr('test')
8184
out = io.BytesIO()
82-
qr.save(out, kind='svg', dark='green', finder_dark='green', dark_module='blue',
83-
alignment_light='yellow', quiet_zone='yellow', scale=1.5)
85+
qr.save(out, kind='svg', dark='green', finder_dark='green',
86+
dark_module='blue', alignment_light='yellow', quiet_zone='yellow',
87+
scale=1.5)
8488
root = _parse_xml(out)
8589
paths = root.findall('.//{%s}path' % _SVG_NS)
8690
assert 3 == len(paths)

‎tests/test_txt.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ def txt_as_matrix(buff, border):
3434
code = buff.getvalue().splitlines()
3535
len_without_border = len(code) - border
3636
for line in islice(code, border, len_without_border):
37-
res.append([int(clr) for clr in islice(line, border, len_without_border)])
37+
res.append([int(clr) for clr in islice(line, border,
38+
len_without_border)])
3839
return res
3940

4041

‎tests/test_utils_iterverbose.py

+12-6
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ def test_finder_pattern_dark_and_light_qr():
5252
qr = encoder.encode('A', micro=False)
5353
res = []
5454
for row in utils.matrix_iter_verbose(qr.matrix, qr.version, border=0):
55-
res.append(bytearray([(0x2, 0x1)[v in (consts.TYPE_FINDER_PATTERN_DARK, consts.TYPE_FINDER_PATTERN_LIGHT)] for v in row])) # noqa: E501
55+
res.append(bytearray([(0x2, 0x1)[v in (consts.TYPE_FINDER_PATTERN_DARK,
56+
consts.TYPE_FINDER_PATTERN_LIGHT)] for v in row])) # noqa: E501
5657
expected = read_matrix('v1-finder-dark-and-light')
5758
assert expected == res
5859

@@ -79,7 +80,8 @@ def test_finder_pattern_dark_and_light_mqr():
7980
qr = encoder.encode('A', micro=True)
8081
res = []
8182
for row in utils.matrix_iter_verbose(qr.matrix, qr.version, border=0):
82-
res.append(bytearray([(0x2, 0x1)[v in (consts.TYPE_FINDER_PATTERN_DARK, consts.TYPE_FINDER_PATTERN_LIGHT)] for v in row])) # noqa: E501
83+
res.append(bytearray([(0x2, 0x1)[v in (consts.TYPE_FINDER_PATTERN_DARK,
84+
consts.TYPE_FINDER_PATTERN_LIGHT)] for v in row])) # noqa: E501
8385
expected = read_matrix('m2-finder-dark-and-light')
8486
assert expected == res
8587

@@ -160,7 +162,8 @@ def test_timing_dark_and_light_mqr():
160162
qr = encoder.encode('A', micro=True)
161163
res = []
162164
for row in utils.matrix_iter_verbose(qr.matrix, qr.version, border=0):
163-
res.append(bytearray([(0x2, 0x1)[v in (consts.TYPE_TIMING_DARK, consts.TYPE_TIMING_LIGHT)] for v in row]))
165+
res.append(bytearray([(0x2, 0x1)[v in (consts.TYPE_TIMING_DARK,
166+
consts.TYPE_TIMING_LIGHT)] for v in row]))
164167
expected = read_matrix('m2-timing-dark-and-light')
165168
assert expected == res
166169

@@ -187,7 +190,8 @@ def test_alignment_dark_and_light():
187190
qr = encoder.encode('A', version=12)
188191
res = []
189192
for row in utils.matrix_iter_verbose(qr.matrix, qr.version, border=0):
190-
res.append(bytearray([(0x2, 0x1)[v in (consts.TYPE_ALIGNMENT_PATTERN_LIGHT, consts.TYPE_ALIGNMENT_PATTERN_DARK)] for v in row])) # noqa: E501
193+
res.append(bytearray([(0x2, 0x1)[v in (consts.TYPE_ALIGNMENT_PATTERN_LIGHT,
194+
consts.TYPE_ALIGNMENT_PATTERN_DARK)] for v in row])) # noqa: E501
191195
expected = read_matrix('v12-alignment-dark-and-light')
192196
assert expected == res
193197

@@ -214,7 +218,8 @@ def test_version_dark_and_light():
214218
qr = encoder.encode('A', version=7)
215219
res = []
216220
for row in utils.matrix_iter_verbose(qr.matrix, qr.version, border=0):
217-
res.append(bytearray([(0x2, 0x1)[v in (consts.TYPE_VERSION_LIGHT, consts.TYPE_VERSION_DARK)] for v in row])) # noqa: E501
221+
res.append(bytearray([(0x2, 0x1)[v in (consts.TYPE_VERSION_LIGHT,
222+
consts.TYPE_VERSION_DARK)] for v in row])) # noqa: E501
218223
expected = read_matrix('v7-version-dark-and-light')
219224
assert expected == res
220225

@@ -250,7 +255,8 @@ def test_format_dark_and_light_qr():
250255
qr = encoder.encode('A', micro=False)
251256
res = []
252257
for row in utils.matrix_iter_verbose(qr.matrix, qr.version, border=0):
253-
res.append(bytearray([(0x2, 0x1)[v in (consts.TYPE_FORMAT_DARK, consts.TYPE_FORMAT_LIGHT)] for v in row]))
258+
res.append(bytearray([(0x2, 0x1)[v in (consts.TYPE_FORMAT_DARK,
259+
consts.TYPE_FORMAT_LIGHT)] for v in row]))
254260
expected = read_matrix('v1-format-dark-and-light')
255261
assert expected == res
256262

0 commit comments

Comments
 (0)