|
24 | 24 | from .test_ppm import ppm_bw_as_matrix
|
25 | 25 | from .test_tex import tex_as_matrix
|
26 | 26 | from .test_xpm import xpm_as_matrix
|
27 |
| -except (ValueError, SystemError, ImportError): # Attempted relative import in non-package |
| 27 | +# Attempted relative import in non-package |
| 28 | +except (ValueError, SystemError, ImportError): |
28 | 29 | from test_eps import eps_as_matrix
|
29 | 30 | from test_png import png_as_matrix
|
30 | 31 | from test_svg import svg_as_matrix
|
|
50 | 51 |
|
51 | 52 |
|
52 | 53 | def _make_test_data_input():
|
53 |
| - for kind, buffer_factory, to_matrix_func, kw in (('eps', io.StringIO, eps_as_matrix, {}), |
54 |
| - ('png', io.BytesIO, png_as_matrix, {}), |
55 |
| - ('svg', io.BytesIO, svg_as_matrix, {}), |
56 |
| - ('txt', io.StringIO, txt_as_matrix, {}), |
57 |
| - ('pdf', io.BytesIO, pdf_as_matrix, {}), |
58 |
| - ('ans', io.StringIO, terminal_as_matrix, {}), |
59 |
| - ('tex', io.StringIO, tex_as_matrix, {}), |
60 |
| - ('xpm', io.StringIO, xpm_as_matrix, {}), |
61 |
| - ('pam', io.BytesIO, pam_bw_as_matrix, {}), |
62 |
| - ('pbm', io.BytesIO, pbm_p1_as_matrix, dict(plain=True)), |
63 |
| - ('ppm', io.BytesIO, ppm_bw_as_matrix, {}),): |
| 54 | + for kind, buffer_factory, to_matrix_func, kw in ( |
| 55 | + ('eps', io.StringIO, eps_as_matrix, {}), |
| 56 | + ('png', io.BytesIO, png_as_matrix, {}), |
| 57 | + ('svg', io.BytesIO, svg_as_matrix, {}), |
| 58 | + ('txt', io.StringIO, txt_as_matrix, {}), |
| 59 | + ('pdf', io.BytesIO, pdf_as_matrix, {}), |
| 60 | + ('ans', io.StringIO, terminal_as_matrix, {}), |
| 61 | + ('tex', io.StringIO, tex_as_matrix, {}), |
| 62 | + ('xpm', io.StringIO, xpm_as_matrix, {}), |
| 63 | + ('pam', io.BytesIO, pam_bw_as_matrix, {}), |
| 64 | + ('pbm', io.BytesIO, pbm_p1_as_matrix, dict(plain=True)), |
| 65 | + ('ppm', io.BytesIO, ppm_bw_as_matrix, {}), |
| 66 | + ): |
64 | 67 | for data, error, border in _DATA:
|
65 | 68 | yield kind, buffer_factory, to_matrix_func, data, error, border, kw
|
66 | 69 |
|
67 | 70 |
|
68 |
| -@pytest.mark.parametrize('kind, buffer_factory, to_matrix_func, data, error, border, kw', |
| 71 | +@pytest.mark.parametrize('kind, buffer_factory, to_matrix_func, data, error, ' |
| 72 | + 'border, kw', |
69 | 73 | _make_test_data_input())
|
70 | 74 | def test_data(kind, buffer_factory, to_matrix_func, data, error, border, kw):
|
71 | 75 | # Creates a QR Code, serializes it and checks if the serialization
|
|
0 commit comments