Skip to content

Commit f427645

Browse files
Merge branch 'develop'
2 parents ec3daff + 27d8319 commit f427645

24 files changed

Lines changed: 148 additions & 201 deletions

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/.tox/
12
/build/
23
/dist/
34
/MANIFEST

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
include LICENSE.txt
22
include MANIFEST.in
33
include README.rst
4+
include requirements.txt

sifter/parser.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from typing import (
22
cast,
3+
Text,
34
TextIO
45
)
56

@@ -13,4 +14,9 @@
1314

1415

1516
def parse_file(filehandle: TextIO) -> CommandList:
16-
return cast(CommandList, grammar.parser().parse(filehandle.read(), lexer=lexer.lexer()))
17+
return parse_string(filehandle.read())
18+
19+
20+
def parse_string(rules: Text) -> CommandList:
21+
r_value = grammar.parser().parse(rules, lexer=lexer.lexer())
22+
return cast(CommandList, r_value)

sifter/t/test_comparators.py

Lines changed: 0 additions & 28 deletions
This file was deleted.

sifter/t/test_evaluation.py

Lines changed: 0 additions & 43 deletions
This file was deleted.

sifter/t/test_grammar.py

Lines changed: 0 additions & 28 deletions
This file was deleted.

sifter/t/test_parser.py

Lines changed: 0 additions & 23 deletions
This file was deleted.

sifter/t/test_validators.py

Lines changed: 0 additions & 77 deletions
This file was deleted.

sifter/tests/size.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def __init__(
4949
}
5050
)
5151
self.validate_tests_size(0)
52-
self.comparison_fn = TestSize.COMPARISON_FNS[tagged_args['size'][0]] # type: ignore
52+
self.comparison_fn = self.COMPARISON_FNS[tagged_args['size'][0]] # type: ignore
5353
self.comparison_size = tagged_args['size'][1]
5454

5555
def evaluate(self, message: Message, state: EvaluationState) -> Optional[bool]:
File renamed without changes.

0 commit comments

Comments
 (0)