|
1 | 1 | from collections import OrderedDict |
2 | 2 | import copy |
3 | | -from itertools import chain |
4 | 3 | import os |
5 | 4 | from unittest import mock |
6 | 5 | import warnings |
@@ -197,12 +196,12 @@ def test_Issue_1713(): |
197 | 196 | def generate_validator_testcases(valid): |
198 | 197 | validation_tests = ( |
199 | 198 | {'validator': validate_bool, |
200 | | - 'success': chain(((_, True) for _ in |
201 | | - ('t', 'y', 'yes', 'on', 'true', '1', 1, True)), |
202 | | - ((_, False) for _ in |
203 | | - ('f', 'n', 'no', 'off', 'false', '0', 0, False))), |
204 | | - 'fail': ((_, ValueError) |
205 | | - for _ in ('aardvark', 2, -1, [], ))}, |
| 199 | + 'success': (*((_, True) for _ in |
| 200 | + ('t', 'y', 'yes', 'on', 'true', '1', 1, True)), |
| 201 | + *((_, False) for _ in |
| 202 | + ('f', 'n', 'no', 'off', 'false', '0', 0, False))), |
| 203 | + 'fail': ((_, ValueError) |
| 204 | + for _ in ('aardvark', 2, -1, [], ))}, |
206 | 205 | {'validator': validate_stringlist, |
207 | 206 | 'success': (('', []), |
208 | 207 | ('a,b', ['a', 'b']), |
@@ -313,7 +312,6 @@ def generate_validator_testcases(valid): |
313 | 312 | ('(0, 1, 0, 1)', [0.0, 1.0, 0.0, 1.0]), # RGBA tuple |
314 | 313 | ((0, 1, 0, 1), (0, 1, 0, 1)), # non-string version |
315 | 314 | ('(0, 1, "0.5")', [0.0, 1.0, 0.5]), # unusual but valid |
316 | | - |
317 | 315 | ), |
318 | 316 | 'fail': (('tab:veryblue', ValueError), # invalid name |
319 | 317 | ('C123', ValueError), # invalid RGB(A) code and cycle index |
|
0 commit comments