Skip to content

Commit 36fba3b

Browse files
manfred-kaisermanfred-kaiser
committed
more code formatting
1 parent 361a3b6 commit 36fba3b

15 files changed

Lines changed: 130 additions & 94 deletions

‎sifter/t/run_tests.py‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@
33
if __name__ == '__main__':
44

55
suite = unittest.defaultTestLoader.loadTestsFromNames(
6-
(
7-
'sifter.t.test_comparators',
8-
'sifter.t.test_evaluation',
9-
'sifter.t.test_grammar',
10-
'sifter.t.test_parser',
11-
'sifter.t.test_validators',
12-
),
13-
)
6+
(
7+
'sifter.t.test_comparators',
8+
'sifter.t.test_evaluation',
9+
'sifter.t.test_grammar',
10+
'sifter.t.test_parser',
11+
'sifter.t.test_validators',
12+
),
13+
)
1414
unittest.TextTestRunner(verbosity=2).run(suite)
15-

‎sifter/t/test_comparators.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ def setUp(self):
1616

1717
def test_unimplemented_match_type(self):
1818
self.assertRaises(
19-
RuntimeError,
20-
sifter.comparator.get_match_fn,
21-
'i;vnd-mock', 'IS',
22-
)
19+
RuntimeError,
20+
sifter.comparator.get_match_fn,
21+
'i;vnd-mock', 'IS',
22+
)
2323

2424

2525
if __name__ == '__main__':

‎sifter/t/test_evaluation.py‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,17 @@
55

66
import sifter.parser
77

8+
89
class TestEvaluateRules(unittest.TestCase):
910

1011
EVAL_RESULTS = (
11-
("evaluation_1.msg", "evaluation_1.rules",
12-
[('redirect', 'acm@example.com')]),
13-
("evaluation_1.msg", "evaluation_2.rules",
14-
[]),
15-
("evaluation_2.msg", "evaluation_1.rules",
16-
[('redirect', 'postmaster@example.com')]),
17-
("evaluation_2.msg", "evaluation_2.rules",
18-
[]),
19-
("evaluation_3.msg", "evaluation_1.rules",
20-
[('redirect', 'field@example.com')]),
21-
("evaluation_3.msg", "evaluation_2.rules",
22-
[('fileinto', ['INBOX'])]),
23-
("evaluation_3.msg", "evaluation_3.rules",
24-
[('keep', None)]),
12+
("evaluation_1.msg", "evaluation_1.rules", [('redirect', 'acm@example.com')]),
13+
("evaluation_1.msg", "evaluation_2.rules", []),
14+
("evaluation_2.msg", "evaluation_1.rules", [('redirect', 'postmaster@example.com')]),
15+
("evaluation_2.msg", "evaluation_2.rules", []),
16+
("evaluation_3.msg", "evaluation_1.rules", [('redirect', 'field@example.com')]),
17+
("evaluation_3.msg", "evaluation_2.rules", [('fileinto', ['INBOX'])]),
18+
("evaluation_3.msg", "evaluation_3.rules", [('keep', None)]),
2519
)
2620

2721
def setUp(self):
@@ -40,7 +34,8 @@ def test_msg_rule_cross_product(self):
4034
self.assertEqual(
4135
self.rules[result[1]].evaluate(self.messages[result[0]]),
4236
result[2]
43-
)
37+
)
38+
4439

4540
if __name__ == '__main__':
4641
unittest.main()

‎sifter/t/test_grammar.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@ def test_require_extension(self):
1515
self.state.require_extension('ext1')
1616
self.assertTrue(self.state.check_required_extension('ext1', 'ext1'))
1717
self.assertRaises(
18-
RuntimeError,
19-
self.state.check_required_extension,
20-
'ext2', 'ext2',
21-
)
18+
RuntimeError,
19+
self.state.check_required_extension,
20+
'ext2',
21+
'ext2',
22+
)
2223

2324

2425
if __name__ == '__main__':

‎sifter/t/test_parser.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,18 @@
44

55
import sifter.parser
66

7+
78
class TestParseFile(unittest.TestCase):
89

910
def test_files(self):
1011
for in_filename, golden_filename in (("parser_1.in", "parser_1.out"),):
11-
with codecs.open(os.path.join(os.path.dirname(__file__), in_filename),
12-
encoding='utf-8') as in_fh:
12+
with codecs.open(os.path.join(os.path.dirname(__file__), in_filename), encoding='utf-8') as in_fh:
1313
test_output = str(sifter.parser.parse_file(in_fh))
1414
with codecs.open(os.path.join(os.path.dirname(__file__), golden_filename),
1515
encoding='utf-8') as golden_fh:
1616
golden_output = golden_fh.read()
1717
self.assertEqual(test_output, golden_output)
1818

19+
1920
if __name__ == '__main__':
2021
unittest.main()

‎sifter/t/test_validators.py‎

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import sifter.grammar
44
import sifter.validators
55

6+
67
class MockRule(sifter.grammar.Rule):
78

89
RULE_TYPE = 'mock'
@@ -11,54 +12,60 @@ class MockRule(sifter.grammar.Rule):
1112
def __init__(self, arguments=None, tests=None):
1213
super(MockRule, self).__init__(arguments, tests)
1314

15+
1416
class TestValidationFn(unittest.TestCase):
1517

1618
def test_too_many_args(self):
17-
mock_rule = MockRule([ sifter.grammar.Tag('IS'), 13, ])
19+
mock_rule = MockRule([sifter.grammar.Tag('IS'), 13, ])
1820
self.assertRaises(
19-
sifter.grammar.RuleSyntaxError,
20-
mock_rule.validate_arguments,
21-
)
21+
sifter.grammar.RuleSyntaxError,
22+
mock_rule.validate_arguments,
23+
)
2224

2325
def test_not_enough_args(self):
24-
mock_rule = MockRule([ 13, ])
26+
mock_rule = MockRule([13, ])
2527
self.assertRaises(
26-
sifter.grammar.RuleSyntaxError,
27-
mock_rule.validate_arguments,
28-
[
29-
sifter.validators.Number(),
30-
sifter.validators.StringList(),
31-
],
32-
)
28+
sifter.grammar.RuleSyntaxError,
29+
mock_rule.validate_arguments,
30+
[
31+
sifter.validators.Number(),
32+
sifter.validators.StringList(),
33+
],
34+
)
35+
3336

3437
class TestTagValidator(unittest.TestCase):
3538

3639
def test_allowed_tag(self):
37-
mock_validator = sifter.validators.Tag(['MOCK', 'IS',])
40+
mock_validator = sifter.validators.Tag(['MOCK', 'IS', ])
3841
self.assertEqual(
39-
mock_validator.validate([sifter.grammar.Tag('IS')], 0),
40-
1)
42+
mock_validator.validate([sifter.grammar.Tag('IS')], 0),
43+
1
44+
)
4145

4246
def test_allowed_single_tag(self):
4347
# test the case for a non-list single tag name
4448
mock_validator = sifter.validators.Tag('IS')
4549
self.assertEqual(
46-
mock_validator.validate([sifter.grammar.Tag('IS')], 0),
47-
1)
50+
mock_validator.validate([sifter.grammar.Tag('IS')], 0),
51+
1
52+
)
4853

4954
def test_not_allowed_tag(self):
50-
mock_validator = sifter.validators.Tag(['MOCK', 'FOO',])
55+
mock_validator = sifter.validators.Tag(['MOCK', 'FOO', ])
5156
self.assertEqual(
52-
mock_validator.validate([sifter.grammar.Tag('IS')], 0),
53-
0)
57+
mock_validator.validate([sifter.grammar.Tag('IS')], 0),
58+
0
59+
)
5460

5561
def test_not_allowed_single_tag(self):
5662
# test the case for a non-list single tag name. test when the tag is a
5763
# substring of the allowed tag.
5864
mock_validator = sifter.validators.Tag('ISFOO')
5965
self.assertEqual(
60-
mock_validator.validate([sifter.grammar.Tag('IS')], 0),
61-
0)
66+
mock_validator.validate([sifter.grammar.Tag('IS')], 0),
67+
0
68+
)
6269

6370

6471
if __name__ == '__main__':

‎sifter/tests/address.py‎

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
__all__ = ('TestAddress',)
88

9+
910
# section 5.1
1011
class TestAddress(sifter.grammar.Test):
1112

@@ -14,17 +15,16 @@ class TestAddress(sifter.grammar.Test):
1415
def __init__(self, arguments=None, tests=None):
1516
super(TestAddress, self).__init__(arguments, tests)
1617
tagged_args, positional_args = self.validate_arguments(
17-
{
18-
'comparator' : sifter.validators.Comparator(),
19-
'match_type' : sifter.validators.MatchType(),
20-
'address_part' : sifter.validators.Tag(
21-
('LOCALPART', 'DOMAIN', 'ALL')),
22-
},
23-
[
24-
sifter.validators.StringList(),
25-
sifter.validators.StringList(),
26-
]
27-
)
18+
{
19+
'comparator': sifter.validators.Comparator(),
20+
'match_type': sifter.validators.MatchType(),
21+
'address_part': sifter.validators.Tag(('LOCALPART', 'DOMAIN', 'ALL')),
22+
},
23+
[
24+
sifter.validators.StringList(),
25+
sifter.validators.StringList(),
26+
]
27+
)
2828
self.validate_tests_size(0)
2929

3030
self.headers, self.keylist = positional_args
@@ -46,13 +46,23 @@ def evaluate(self, message, state):
4646
addresses = []
4747
for address in email.utils.getaddresses(header_values):
4848
if address[1] != '':
49-
addresses.append(sifter.grammar.string.address_part(address[1],
50-
self.address_part))
49+
addresses.append(
50+
sifter.grammar.string.address_part(
51+
address[1],
52+
self.address_part
53+
)
54+
)
5155
for address in addresses:
5256
for key in self.keylist:
53-
if sifter.grammar.string.compare(address, key, state,
54-
self.comparator, self.match_type):
57+
if sifter.grammar.string.compare(
58+
address,
59+
key,
60+
state,
61+
self.comparator,
62+
self.match_type
63+
):
5564
return True
5665
return False
5766

67+
5868
TestAddress.register()

‎sifter/tests/allof.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
__all__ = ('TestAllOf',)
44

5+
56
# section 5.2
67
class TestAllOf(sifter.grammar.Test):
78

@@ -21,4 +22,5 @@ def evaluate(self, message, state):
2122
return False
2223
return True
2324

25+
2426
TestAllOf.register()

‎sifter/tests/anyof.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
__all__ = ('TestAnyOf',)
44

5+
56
# section 5.3
67
class TestAnyOf(sifter.grammar.Test):
78

@@ -21,4 +22,5 @@ def evaluate(self, message, state):
2122
return True
2223
return False
2324

25+
2426
TestAnyOf.register()

‎sifter/tests/exists.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
__all__ = ('TestExists',)
55

6+
67
# section 5.9
78
class TestExists(sifter.grammar.Test):
89

@@ -11,7 +12,9 @@ class TestExists(sifter.grammar.Test):
1112
def __init__(self, arguments=None, tests=None):
1213
super(TestExists, self).__init__(arguments, tests)
1314
tagged_args, positional_args = self.validate_arguments(
14-
{}, [ sifter.validators.StringList(), ])
15+
{},
16+
[sifter.validators.StringList(), ]
17+
)
1518
self.validate_tests_size(0)
1619
self.headers = positional_args[0]
1720

@@ -21,4 +24,5 @@ def evaluate(self, message, state):
2124
return False
2225
return True
2326

27+
2428
TestExists.register()

0 commit comments

Comments
 (0)