Skip to content

Commit 2631678

Browse files
committed
Use snake case'd function names from pyparsing.
1 parent feef3ba commit 2631678

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

coverage_pyver_pragma/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def evaluate_exclude(expression: str) -> bool:
6969
:param expression:
7070
"""
7171

72-
return all(list(GRAMMAR.parseString(expression.lower(), parseAll=True)))
72+
return all(list(GRAMMAR.parse_string(expression.lower(), parse_all=True)))
7373

7474

7575
class PythonParser(coverage.python.PythonParser):

coverage_pyver_pragma/grammar.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,9 @@
154154
ParserElement,
155155
ParseResults,
156156
Word,
157-
infixNotation,
157+
infix_notation,
158158
nums,
159-
oneOf,
159+
one_of,
160160
opAssoc
161161
)
162162

@@ -375,19 +375,19 @@ def __bool__(self) -> bool:
375375
# Grammar comprises (case insensitive):
376376
# Python versions (<=pyXXX, pyXXX+)
377377

378-
PLUS = Literal('+').setResultsName("plus")
378+
PLUS = Literal('+').set_results_name("plus")
379379

380380
LESS_THAN_EQUAL = "<="
381381
LESS_THAN = '<'
382382
GREATER_THAN_EQUAL = ">="
383383
GREATER_THAN = '>'
384384

385385
OPS = [LESS_THAN, LESS_THAN_EQUAL, GREATER_THAN, GREATER_THAN_EQUAL] # pylint: disable=use-tuple-over-list
386-
COMPARATOR = Optional(oneOf(' '.join(OPS))).setResultsName("comparator")
386+
COMPARATOR = Optional(one_of(' '.join(OPS))).set_results_name("comparator")
387387

388-
VERSION = Combine(CaselessLiteral("py") + Word(nums)).setResultsName("version")
389-
VERSION_TAG = Group(COMPARATOR + VERSION + Optional(PLUS)).setResultsName("version")
390-
VERSION_TAG.setParseAction(VersionTag)
388+
VERSION = Combine(CaselessLiteral("py") + Word(nums)).set_results_name("version")
389+
VERSION_TAG = Group(COMPARATOR + VERSION + Optional(PLUS)).set_results_name("version")
390+
VERSION_TAG.set_parse_action(VersionTag)
391391

392392
# Platforms (Windows, !Linux)
393393
# TODO: other platforms
@@ -397,8 +397,8 @@ def __bool__(self) -> bool:
397397
DARWIN = CaselessLiteral("darwin")
398398
JAVA = CaselessLiteral("java")
399399

400-
PLATFORM_TAG = (WINDOWS | LINUX | DARWIN | JAVA).setResultsName("platform")
401-
PLATFORM_TAG.setParseAction(PlatformTag)
400+
PLATFORM_TAG = (WINDOWS | LINUX | DARWIN | JAVA).set_results_name("platform")
401+
PLATFORM_TAG.set_parse_action(PlatformTag)
402402

403403
# Implementations (CPython, !PyPy)
404404
# TODO: other python implementations
@@ -408,13 +408,13 @@ def __bool__(self) -> bool:
408408
JYTHON = CaselessLiteral("jython")
409409
IRONPYTHON = CaselessLiteral("ironpython")
410410

411-
IMPLEMENTATION_TAG = (CPYTHON | PYPY | JYTHON | IRONPYTHON).setResultsName("implementation")
412-
IMPLEMENTATION_TAG.setParseAction(ImplementationTag)
411+
IMPLEMENTATION_TAG = (CPYTHON | PYPY | JYTHON | IRONPYTHON).set_results_name("implementation")
412+
IMPLEMENTATION_TAG.set_parse_action(ImplementationTag)
413413

414414
ELEMENTS = VERSION_TAG | PLATFORM_TAG | IMPLEMENTATION_TAG
415415

416416
GRAMMAR: ParserElement = OneOrMore(
417-
infixNotation(
417+
infix_notation(
418418
ELEMENTS,
419419
[
420420
(NOT, 1, opAssoc.RIGHT, LogicalNOT),

0 commit comments

Comments
 (0)